diff options
| -rw-r--r-- | svtools/source/svhtml/htmlout.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index cf3f746fc89f..33c276a50516 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 134d0b9b00d4..0de996f72448 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(); } |