[Libreoffice-commits] .: svtools/source svx/source

[Julien Nabet]

 svtools/source/svhtml/htmlout.cxx |    2 +-
 svx/source/svdraw/svdfmtf.cxx     |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 456df3133a0dd9664ddb8022b3279180900eff46
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Dec 11 13:31:39 2011 +0100

    Remove ByteString

diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index cf3f746..33c276a 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -885,7 +885,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
         {
             // Wir schreiben das Modul mm ANSI-Zeichensatz, aber mit
             // System-Zeilenumbruechen raus.
-            rtl::OString sSource(rtl::OUStringToOString(rSource, eDestEnc));
+            const rtl::OString sSource(rtl::OUStringToOString(rSource, eDestEnc));
             rStrm << sSource.getStr() << sNewLine;
         }
         rStrm << sNewLine;
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 134d0b9..0de996f 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -951,7 +951,7 @@ void ImpSdrGDIMetaFileImport::MapScaling()
 
 void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pMtf )
 {
-    ByteString aSkipComment;
+    bool aSkipComment = false;
 
     if (rAct.GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
     {
@@ -1006,17 +1006,17 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM
                 }
             }
 
-            aSkipComment = "XGRAD_SEQ_END";
+            aSkipComment = true;
         }
     }
 
-    if(aSkipComment.Len())
+    if(aSkipComment)
     {
         MetaAction* pSkipAct = pMtf->NextAction();
 
         while( pSkipAct
             && ((pSkipAct->GetType() != META_COMMENT_ACTION )
-                || !(((MetaCommentAction*)pSkipAct)->GetComment().equalsIgnoreAsciiCase(aSkipComment))))
+                || !(((MetaCommentAction*)pSkipAct)->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END"))))
         {
             pSkipAct = pMtf->NextAction();
         }