[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/libs/kotext/opendocument
From:       Thomas Zander <zander () kde ! org>
Date:       2010-12-29 10:32:32
Message-ID: 20101229103232.381683E1F7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1210065 by zander:

Remove confusing warnings

 M  +1 -7      KoTextLoader.cpp  


--- trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp #1210064:1210065
@@ -427,12 +427,9 @@
         if (!styleName.isEmpty())
             kWarning(32500) << "paragraph style " << styleName << "not found - using default style";
         paragraphStyle = d->styleManager->defaultParagraphStyle();
-        if (paragraphStyle == 0)
-            kWarning(32500) << "defaultParagraphStyle not found - using default style";
     }
 
     QTextCharFormat cf = cursor.charFormat(); // store the current cursor char format
-
     if (paragraphStyle && (cursor.position() == cursor.block().position())) {
         QTextBlock block = cursor.block();
         // Apply list style when loading a list but we don't have a list style
@@ -440,8 +437,6 @@
         // Clear the outline level property. If a default-outline-level was set, it should not
         // be applied when loading a document, only on user action.
         block.blockFormat().clearProperty(KoParagraphStyle::OutlineLevel);
-    } else {
-        kWarning(32500) << "paragraph style " << styleName << " not found";
     }
 
     // Some paragraph have id's defined which we need to store so that we can eg
@@ -487,13 +482,12 @@
     // Set the paragraph-style on the block
     KoParagraphStyle *paragraphStyle = d->textSharedData->paragraphStyle(styleName, d->stylesDotXml);
     if (!paragraphStyle) {
+        kWarning(32500) << "paragraph style " << styleName << " not found";
         paragraphStyle = d->styleManager->defaultParagraphStyle();
     }
     if (paragraphStyle) {
         // Apply list style when loading a list but we don't have a list style
         paragraphStyle->applyStyle(block, d->currentList && !d->currentListStyle);
-    } else {
-        kWarning(32500) << "paragraph style " << styleName << " not found";
     }
 
     if ((block.blockFormat().hasProperty(KoParagraphStyle::OutlineLevel)) && (level == -1)) {
[prev in list] [next in list] [prev in thread] [next in thread]