Fix for fdo43460 Part XL getLength() to isEmpty()

Part XL
Modules
sw

8 files changed, 46 insertions, 46 deletions

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index c16febe8a9b5..46598df63ed1 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -854,7 +854,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
 
             // Wenn eine PoolId gesetzt ist, entspricht der Name der
             // Vorlage dem szugehoerigen Token
-            OSL_ENSURE( (rRefPoolId != 0) == (rToken.getLength() > 0),
+            OSL_ENSURE( (rRefPoolId != 0) == (!rToken.isEmpty()),
                     "Token missing" );
         }
         else
@@ -1000,11 +1000,11 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
 
             // Wenn ein Token gesetzt ist, enthaelt nPoolId die dazugehoerige
             // Vorlage
-            if( rToken.getLength() && !rRefPoolId )
+            if( !rToken.isEmpty() && !rRefPoolId )
                 rRefPoolId = nPoolId;
         }
 
-        if( rToken.getLength() || bStop )
+        if( !rToken.isEmpty() || bStop )
         {
             // Anhalten wenn eine HTML-Tag-Vorlage gefunden wurde
             break;
@@ -1017,7 +1017,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
         }
     }
 
-    if( rToken.getLength() )
+    if( !rToken.isEmpty() )
     {
         // Es ist eine HTML-Tag-Vorlage
         if( !nDeep )
@@ -1064,7 +1064,7 @@ static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, String& rSelector,
                                                   rRefPoolId, &aPseudo );
     if( nDeep )
     {
-        if( aToken.getLength() )
+        if( !aToken.isEmpty() )
             rSelector = String( aToken, RTL_TEXTENCODING_ASCII_US );
         else
             rSelector.Erase();
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 8cc76ac6ed6c..73de8423589c 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -341,7 +341,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
     // Den Selektor des Formats holen
     sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFmt, aToken, aClass,
                                                   nRefPoolId );
-    OSL_ENSURE( nDeep ? aToken.getLength()>0 : aToken.getLength()==0,
+    OSL_ENSURE( nDeep ? !aToken.isEmpty() : aToken.isEmpty(),
             "Hier stimmt doch was mit dem Token nicht!" );
     OSL_ENSURE( nDeep ? nRefPoolId : !nRefPoolId,
             "Hier stimmt doch was mit der Vergleichs-Vorlage nicht!" );
@@ -642,7 +642,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     // Jetzt wird festgelegt, was aufgrund des Tokens so moeglich ist
     sal_uInt16 nToken = 0;          // Token fuer Tag-Wechsel
     sal_Bool bOutNewLine = sal_False;   // nur ein LF ausgeben?
-    if( pFmtInfo->aToken.getLength() )
+    if( !pFmtInfo->aToken.isEmpty() )
     {
         // Es ist eine HTML-Tag-Vorlage oder die Vorlage ist von einer
         // solchen abgeleitet
@@ -1117,7 +1117,7 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
     SwHTMLWriter & rHWrt = (SwHTMLWriter&)rWrt;
 
     // wenn es kein Token gibt haben wir auch nichts auszugeben
-    if( !rInfo.aToken.getLength() )
+    if( rInfo.aToken.isEmpty() )
     {
         rHWrt.FillNextNumInfo();
         const SwHTMLNumRuleInfo& rNextInfo = *rHWrt.GetNextNumInfo();
@@ -1837,7 +1837,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
                 const SwCharFmt* pFmt = rChrFmt.GetCharFmt();
 
                 const SwHTMLFmtInfo *pFmtInfo = GetFmtInfo( *pFmt, rFmtInfos );
-                if( pFmtInfo->aToken.getLength() )
+                if( !pFmtInfo->aToken.isEmpty() )
                 {
                     // das Zeichenvorlagen-Tag muss vor den harten
                     // Attributen ausgegeben werden
@@ -3230,7 +3230,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
     {
         rtl::OStringBuffer sOut;
         sOut.append('<');
-        if( pFmtInfo->aToken.getLength() > 0 )
+        if( !pFmtInfo->aToken.isEmpty() )
             sOut.append(pFmtInfo->aToken);
         else
             sOut.append(OOO_STRING_SVTOOLS_HTML_span);
@@ -3268,7 +3268,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
     else
     {
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
-                pFmtInfo->aToken.getLength() ? pFmtInfo->aToken.getStr()
+                !pFmtInfo->aToken.isEmpty() ? pFmtInfo->aToken.getStr()
                                        : OOO_STRING_SVTOOLS_HTML_span,
                 sal_False );
     }
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index c99433a28f55..14d81d4c2b71 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -856,7 +856,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
 
     HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_marquee, sal_False );
 
-    if( aEndTags.getLength() )
+    if( !aEndTags.isEmpty() )
         rWrt.Strm() << aEndTags.getStr();
 
     return rWrt;
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 7742f20a0f2f..45dfe8e683c3 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1195,7 +1195,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
 
     rHTMLWrt.Strm() << '>';
 
-    if( aEndTags.getLength() )
+    if( !aEndTags.isEmpty() )
         rWrt.Strm() << aEndTags.getStr();
 
     if( rHTMLWrt.aINetFmts.Count() )
@@ -1488,7 +1488,7 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
     rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, HTML_FRMOPTS_SPACER );
 
     rWrt.Strm() << '>';
-    if( aEndTags.getLength() )
+    if( !aEndTags.isEmpty() )
         rWrt.Strm() << aEndTags.getStr();
 
     return rWrt;
@@ -1553,7 +1553,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
         rHTMLWrt.OutNewLine();
     HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, sal_False );
 
-    if( aEndTags.getLength() )
+    if( !aEndTags.isEmpty() )
         rWrt.Strm() << aEndTags.getStr();
 
     return rWrt;
@@ -1733,7 +1733,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
     OSL_ENSURE( pSttNd, "Wo ist der Start-Node" );
 
-    if( !bHeader && aSpacer.getLength() )
+    if( !bHeader && !aSpacer.isEmpty() )
     {
         rHTMLWrt.OutNewLine();
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), aSpacer.getStr() );
@@ -1754,7 +1754,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
     }
 
-    if( bHeader && aSpacer.getLength() )
+    if( bHeader && !aSpacer.isEmpty() )
     {
         rHTMLWrt.OutNewLine();
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), aSpacer.getStr() );
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index a71c2d3450ba..f2638dc09ba2 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -204,7 +204,7 @@ void lcl_html_outEvents( SvStream& rStrm,
         rtl::OStringBuffer sOut;
         sOut.append(' ');
         if( pOpt && (EXTENDED_STYPE != eScriptType ||
-                     !pDescs[i].AddListenerParam.getLength()) )
+                     pDescs[i].AddListenerParam.isEmpty()) )
             sOut.append(pOpt);
         else
         {
@@ -220,7 +220,7 @@ void lcl_html_outEvents( SvStream& rStrm,
         HTMLOutFuncs::Out_String( rStrm, pDescs[i].ScriptCode, eDestEnc, pNonConvertableChars );
         rStrm << '\"';
         if( EXTENDED_STYPE == eScriptType &&
-            pDescs[i].AddListenerParam.getLength() )
+            !pDescs[i].AddListenerParam.isEmpty() )
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdaddparam)
                 .append(rtl::OUStringToOString(sListener,
@@ -514,7 +514,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
     uno::Any aTmp = xFormPropSet->getPropertyValue(
                                     OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
     if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
-        ((OUString*)aTmp.getValue())->getLength() )
+        !((OUString*)aTmp.getValue())->isEmpty() )
     {
         sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
         Strm() << sOut.makeStringAndClear().getStr();
@@ -526,7 +526,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
     aTmp = xFormPropSet->getPropertyValue(
                     OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) );
     if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
-        ((OUString*)aTmp.getValue())->getLength() )
+        !((OUString*)aTmp.getValue())->isEmpty() )
     {
         sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_action).append("=\"");
         Strm() << sOut.makeStringAndClear().getStr();
@@ -578,7 +578,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
     aTmp = xFormPropSet->getPropertyValue(
                         OUString(RTL_CONSTASCII_USTRINGPARAM("TargetFrame")) );
     if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&&
-        ((OUString*)aTmp.getValue())->getLength() )
+        !((OUString*)aTmp.getValue())->isEmpty() )
     {
         sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_target).append("=\"");
         Strm() << sOut.makeStringAndClear().getStr();
@@ -653,7 +653,7 @@ void SwHTMLWriter::OutHiddenControls(
             aTmp = xPropSet->getPropertyValue(
                             OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
             if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
-                ((OUString*)aTmp.getValue())->getLength() )
+                !((OUString*)aTmp.getValue())->isEmpty() )
             {
                 sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
                     .append("=\"");
@@ -665,7 +665,7 @@ void SwHTMLWriter::OutHiddenControls(
             aTmp = xPropSet->getPropertyValue(
                             OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenValue")) );
             if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
-                ((OUString*)aTmp.getValue())->getLength() )
+                !((OUString*)aTmp.getValue())->isEmpty() )
             {
                 sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value)
                     .append("=\"");
@@ -812,7 +812,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
 
         {
             const OUString& rVal = *(OUString*)aTmp.getValue();
-            if( !rVal.getLength() )
+            if( rVal.isEmpty() )
                 bEmptyValue = sal_True;
             else if( rVal.compareToAscii( OOO_STRING_SVTOOLS_HTML_on ) != 0 )
                 sValue = rVal;
@@ -844,7 +844,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
             aTmp = xPropSet->getPropertyValue(
                             OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) );
             if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
-                ((OUString*)aTmp.getValue())->getLength() )
+                !((OUString*)aTmp.getValue())->isEmpty() )
             {
                 sValue = *(OUString*)aTmp.getValue();
             }
@@ -964,7 +964,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
                 {
                     aTmp = xPropSet->getPropertyValue( sDefaultText );
                     if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
-                        ((OUString*)aTmp.getValue())->getLength() )
+                        !((OUString*)aTmp.getValue())->isEmpty() )
                     {
                         sValue = *(OUString*)aTmp.getValue();
                     }
@@ -1013,7 +1013,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
 
     aTmp = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
     if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
-        ((OUString*)aTmp.getValue())->getLength() )
+        !((OUString*)aTmp.getValue())->isEmpty() )
     {
         sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name).
             append(RTL_CONSTASCII_STRINGPARAM("=\""));
@@ -1030,7 +1030,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_disabled);
     }
 
-    if( sValue.getLength() || bEmptyValue )
+    if( !sValue.isEmpty() || bEmptyValue )
     {
         sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value).append(
             RTL_CONSTASCII_STRINGPARAM("=\""));
@@ -1046,7 +1046,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         aTmp = xPropSet->getPropertyValue(
                     OUString(RTL_CONSTASCII_USTRINGPARAM("ImageURL")) );
         if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
-            ((OUString*)aTmp.getValue())->getLength() )
+            !((OUString*)aTmp.getValue())->isEmpty() )
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src).
                 append(RTL_CONSTASCII_STRINGPARAM("=\""));
@@ -1160,7 +1160,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         {
             aTmp = xPropSet->getPropertyValue( sPropName );
             if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
-                ((OUString*)aTmp.getValue())->getLength() )
+                !((OUString*)aTmp.getValue())->isEmpty() )
             {
                 Font aFixedFont( OutputDevice::GetDefaultFont(
                                     DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US,
@@ -1297,7 +1297,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
 
                 rHTMLWrt.OutNewLine(); // jede Option bekommt eine eigene Zeile
                 sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_option);
-                if( sVal.getLength() || bEmptyVal )
+                if( !sVal.isEmpty() || bEmptyVal )
                 {
                     sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value).
                         append(RTL_CONSTASCII_STRINGPARAM("=\""));
@@ -1330,7 +1330,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         aTmp = xPropSet->getPropertyValue(
         OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultText")) );
         if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&&
-            ((OUString*)aTmp.getValue())->getLength() )
+            !((OUString*)aTmp.getValue())->isEmpty() )
         {
             sVal = String( *(OUString*)aTmp.getValue() );
         }
@@ -1353,7 +1353,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
     {
         aTmp = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Label")));
         if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
-            ((OUString*)aTmp.getValue())->getLength() )
+            !((OUString*)aTmp.getValue())->isEmpty() )
         {
             sValue = *(OUString*)aTmp.getValue();
             HTMLOutFuncs::Out_String( rWrt.Strm(), sValue,
@@ -1361,7 +1361,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         }
     }
 
-    if( aEndTags.getLength() )
+    if( !aEndTags.isEmpty() )
         rWrt.Strm() << aEndTags.getStr();
 
     // Controls sind nicht absatz-gebunden, deshalb kein LF mehr ausgeben!
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index cb3692bd6b28..31f00de2d0c3 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1033,7 +1033,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         ::rtl::OUString aStr;
         String aURL;
         aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")) );
-        if( (aAny >>= aStr) && aStr.getLength() )
+        if( (aAny >>= aStr) && !aStr.isEmpty() )
         {
             aURL = URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(),
                       aStr);
@@ -1050,7 +1050,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 
         ::rtl::OUString aType;
         aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMimeType")) );
-        if( (aAny >>= aType) && aType.getLength() )
+        if( (aAny >>= aType) && !aType.isEmpty() )
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type)
                 .append("=\"");
@@ -1082,7 +1082,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         // CODEBASE
         ::rtl::OUString aCd;
         aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")) );
-        if( (aAny >>= aCd) && aCd.getLength() )
+        if( (aAny >>= aCd) && !aCd.isEmpty() )
         {
             String sCodeBase( URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(), aCd) );
             if( sCodeBase.Len() )
@@ -1109,7 +1109,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         ::rtl::OUString aAppletName;
         aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletName")) );
         aAny >>= aAppletName;
-        if( aAppletName.getLength() )
+        if( !aAppletName.isEmpty() )
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
                 .append("=\"");
@@ -1248,7 +1248,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_iframe, sal_False );
     }
 
-    if( aEndTags.getLength() )
+    if( !aEndTags.isEmpty() )
         rWrt.Strm() << aEndTags.getStr();
 
     return rWrt;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index b4f7f16baec3..b559b74be3a7 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -855,7 +855,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() )
                     xDPS->getDocumentProperties());
                 OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
                 if ( xDocProps.is() && (xDocProps->getAutoloadSecs() > 0) &&
-                     (xDocProps->getAutoloadURL().getLength() == 0) )
+                     (xDocProps->getAutoloadURL().isEmpty()) )
                 {
                     xDocProps->setAutoloadURL(aPathToFile);
                 }
@@ -5480,10 +5480,10 @@ void SwHTMLParser::AddMetaUserDefined( ::rtl::OUString const & i_rMetaName )
 {
     // unless we already have 4 names, append the argument to m_InfoNames
     ::rtl::OUString* pName // the first empty string in m_InfoNames
-         (!m_InfoNames[0].getLength() ? &m_InfoNames[0] :
-         (!m_InfoNames[1].getLength() ? &m_InfoNames[1] :
-         (!m_InfoNames[2].getLength() ? &m_InfoNames[2] :
-         (!m_InfoNames[3].getLength() ? &m_InfoNames[3] : 0 ))));
+         (m_InfoNames[0].isEmpty() ? &m_InfoNames[0] :
+         (m_InfoNames[1].isEmpty() ? &m_InfoNames[1] :
+         (m_InfoNames[2].isEmpty() ? &m_InfoNames[2] :
+         (m_InfoNames[3].isEmpty() ? &m_InfoNames[3] : 0 ))));
     if (pName)
     {
         (*pName) = i_rMetaName;
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 32c26112214e..346247f05949 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1045,7 +1045,7 @@ void SwHTMLWriter::OutBookmarks()
         // auch nicht eingelesen wird.
 
         // erst die SWG spezifischen Daten:
-        if(dynamic_cast< const ::sw::mark::IBookmark* >(pBookmark) && pBookmark->GetName().getLength() )
+        if(dynamic_cast< const ::sw::mark::IBookmark* >(pBookmark) && !pBookmark->GetName().isEmpty() )
             OutAnchor( pBookmark->GetName() );
 
         if( ++nBkmkTabPos >= pMarkAccess->getMarksCount() )