convert FRAMEWORK module from String to OUString

Change-Id: Iafa6b5f213d37093e7e46065c9264c7bb7fae377

20 files changed, 58 insertions, 58 deletions

diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 387451e7c414..b645b3b64100 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -849,13 +849,13 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator
     {
         const css::awt::KeyEvent& rAWTKey = *pIt;
         const KeyCode             aVCLKey = ::svt::AcceleratorExecute::st_AWTKey2VCLKey(rAWTKey);
-        const String              sName   = aVCLKey.GetName();
+        const OUString            sName   = aVCLKey.GetName();
 
-        if (sName.Len () > 0)
+        if (!sName.isEmpty())
             return pIt;
     }
 
-    return lKeys.end ();
+    return lKeys.end();
 }
 
 //-----------------------------------------------
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 6818e6a2e6df..4ec18d46d36e 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -584,7 +584,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
                 {
                     // Do handle file URL differently => convert it to a system
                     // path and abbreviate it with a special function:
-                    String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) );
+                    OUString aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) );
 
                     OUString aSystemPath( aFileSystemPath );
                     OUString aCompactedSystemPath;
@@ -592,14 +592,14 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
                     aTipHelpText = aSystemPath;
                     oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL );
                     if ( !nError )
-                        aMenuTitle = String( aCompactedSystemPath );
+                        aMenuTitle = aCompactedSystemPath;
                     else
                         aMenuTitle = aSystemPath;
                 }
                 else
                 {
                     // Use INetURLObject to abbreviate all other URLs
-                    String  aShortURL;
+                    OUString  aShortURL;
                     aShortURL = aURL.getAbbreviated( xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS );
                     aMenuTitle += aShortURL;
                     aTipHelpText = aURLString;
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 9a7af5c23e43..51b96ef1c09f 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -151,10 +151,10 @@ sal_uInt16 AddonMenuManager::GetNextPos( sal_uInt16 nPos )
 }
 
 
-static sal_uInt16 FindMenuId( Menu* pMenu, const String aCommand )
+static sal_uInt16 FindMenuId( Menu* pMenu, const OUString aCommand )
 {
     sal_uInt16 nPos = 0;
-    String aCmd;
+    OUString aCmd;
     for ( nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
     {
         sal_uInt16 nId = pMenu->GetItemId( nPos );
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 2a503b03eed8..d8bfdbbfa4f8 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -1548,7 +1548,7 @@ Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL)
         Graphic aGraphic;
 
         GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
-        rGF.ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW );
+        rGF.ImportGraphic( aGraphic, OUString(), *pStream, GRFILTER_FORMAT_DONTKNOW );
 
         BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
 
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 3eab4850b382..077faf2d68e3 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -98,7 +98,7 @@ void SAL_CALL VCLStatusIndicator::reset()
     if (m_pStatusBar)
     {
         m_pStatusBar->SetProgressValue(0);
-        m_pStatusBar->SetText(String());
+        m_pStatusBar->SetText(OUString());
     }
     // <- SOLAR SAFE ----------------------------
 }
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index cc4569a3c4f6..bd2f04e883df 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -970,11 +970,11 @@ void ToolbarLayoutManager::setDockingAreaOffsets( const ::Rectangle aOffsets )
 
 OUString ToolbarLayoutManager::implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const
 {
-    String aAddonGenericTitle(FWK_RESSTR(STR_TOOLBAR_TITLE_ADDON));
+    OUString aAddonGenericTitle(FWK_RESSTR(STR_TOOLBAR_TITLE_ADDON));
     const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
 
-    String aNumStr = rI18nHelper.GetNum( nNumber, 0, sal_False, sal_False );
-    aAddonGenericTitle.SearchAndReplaceAscii( "%num%", aNumStr );
+    OUString aNumStr = rI18nHelper.GetNum( nNumber, 0, sal_False, sal_False );
+    aAddonGenericTitle = aAddonGenericTitle.replaceFirst( "%num%", aNumStr );
 
     return OUString( aAddonGenericTitle );
 }
@@ -1446,8 +1446,8 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
             pWindow = VCLUnoHelper::GetWindow( xWindow );
             if ( pWindow )
             {
-                String aText = pWindow->GetText();
-                if ( aText.Len() == 0 )
+                OUString aText = pWindow->GetText();
+                if ( aText.isEmpty() )
                     pWindow->SetText( rElement.m_aUIName );
                 if ( rElement.m_bNoClose )
                     pWindow->SetStyle( pWindow->GetStyle() & ~WB_CLOSEABLE );
@@ -1469,8 +1469,8 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
             if ( pWindow )
             {
                 SolarMutexGuard aGuard;
-                String aText = pWindow->GetText();
-                if ( aText.Len() == 0 )
+                OUString aText = pWindow->GetText();
+                if ( aText.isEmpty() )
                     pWindow->SetText( rElement.m_aUIName );
             }
 
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index bcc9864537d6..d39c90eed17d 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -698,7 +698,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co
 
     // Remove uno and cmd protocol part as we want to support both of them. We store only the command part
     // in our hash map. All other protocols are stored with the protocol part.
-    String aCommand( aURL.Main );
+    OUString aCommand( aURL.Main );
     if ( aURL.Protocol.equalsIgnoreAsciiCaseAsciiL( UNO_PROTOCOL, sizeof( UNO_PROTOCOL )-1 ))
         aCommand = aURL.Path;
 
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 0a4eefcb25d6..e0d138881f1d 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2064,7 +2064,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons
 
     // Remove uno and cmd protocol part as we want to support both of them. We store only the command part
     // in our hash map. All other protocols are stored with the protocol part.
-    String aCommand( aURL.Main );
+    OUString aCommand( aURL.Main );
     if ( aURL.Protocol.equalsIgnoreAsciiCaseAsciiL( UNO_PROTOCOL, sizeof( UNO_PROTOCOL )-1 ))
         aCommand = aURL.Path;
 
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 3b9cdb6f5704..b0ee90814b43 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -352,8 +352,8 @@ LicenseDialog::LicenseDialog(const OUString & aLicensePath, ResMgr *pResMgr) :
     aStyle |= WB_REPEAT;
     aPBPageDown.SetStyle( aStyle );
 
-    String aText = aInfo2FT.GetText();
-    aText.SearchAndReplaceAll( OUString("%PAGEDOWN"), aPBPageDown.GetText() );
+    OUString aText = aInfo2FT.GetText();
+    aText = aText.replaceAll( "%PAGEDOWN", aPBPageDown.GetText() );
     aInfo2FT.SetText( aText );
 
     aPBDecline.SetText( aStrNotAccept );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index ffb97375e3a3..e04ba8adc8b4 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -207,7 +207,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
         }
 
         // We have to map commands which uses special characters like '/',':','?','\','<'.'>','|'
-        String aExt = OUString(".png");
+        OUString aExt = OUString(".png");
         m_aImageCommandNameVector.resize(aCmdImageSeq.getLength() );
         m_aImageNameVector.resize( aCmdImageSeq.getLength() );
 
@@ -218,7 +218,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
         // Create a image name vector that must be provided to the vcl imagelist. We also need
         // a command to image name map to speed up access time for image retrieval.
         OUString aUNOString( ".uno:" );
-        String   aEmptyString;
+        OUString aEmptyString;
         const sal_uInt32 nCount = m_aImageCommandNameVector.size();
         for ( sal_uInt32 i = 0; i < nCount; i++ )
         {
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index cbf868e92e38..bbdab8158f80 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -182,8 +182,8 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
                 sal_uLong nCount = aFontSizeNames.Count();
                 for( sal_uLong i = 0; i < nCount; i++ )
                 {
-                    String  aSizeName = aFontSizeNames.GetIndexName( i );
-                    long    nSize = aFontSizeNames.GetIndexSize( i );
+                    OUString  aSizeName = aFontSizeNames.GetIndexName( i );
+                    long      nSize = aFontSizeNames.GetIndexSize( i );
                     m_pHeightArray[nPos] = nSize;
                     nPos++; // Id is nPos+1
                     pVCLPopupMenu->InsertItem( nPos, aSizeName, MIB_RADIOCHECK | MIB_AUTOCHECK );
@@ -200,8 +200,8 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
                 pTempAry = pAry;
                 while ( *pTempAry )
                 {
-                    String aSizeName = aFontSizeNames.Size2Name( *pTempAry );
-                    if ( aSizeName.Len() )
+                    OUString aSizeName = aFontSizeNames.Size2Name( *pTempAry );
+                    if ( !aSizeName.isEmpty() )
                     {
                         m_pHeightArray[nPos] = *pTempAry;
                         nPos++; // Id is nPos+1
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 340fd28386f1..5b9af9d44c52 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -68,10 +68,10 @@ static OUString getEnumCommand( const OUString& rCommand )
     INetURLObject aURL( rCommand );
 
     OUString   aEnumCommand;
-    String          aURLPath = aURL.GetURLPath();
-    xub_StrLen      nIndex   = aURLPath.Search( '.' );
-    if (( nIndex > 0 ) && ( nIndex < aURLPath.Len() ))
-        aEnumCommand = aURLPath.Copy( nIndex+1 );
+    OUString   aURLPath = aURL.GetURLPath();
+    sal_Int32  nIndex   = aURLPath.indexOf( '.' );
+    if (( nIndex > 0 ) && ( nIndex < aURLPath.getLength() ))
+        aEnumCommand = aURLPath.copy( nIndex+1 );
 
     return aEnumCommand;
 }
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 0e97c0fcd3fe..08485e35431e 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -162,7 +162,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
                 if ( bAllOneState && ( nCount > 1 ))
                 {
                     // Insert special item for all command
-                    pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, String( FwlResId( STR_MENU_HEADFOOTALL )), 0, OString(), 0 );
+                    pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, OUString( FwlResId( STR_MENU_HEADFOOTALL )), 0, OString(), 0 );
 
                     OUStringBuffer aStrBuf( aCmd );
                     aStrBuf.appendAscii( "?On:bool=" );
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index f7e7f575ec19..533d96f2d529 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -177,7 +177,7 @@ sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, con
         Graphic aGraphic;
 
         GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
-        rGF.ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW );
+        rGF.ImportGraphic( aGraphic, OUString(), *pStream, GRFILTER_FORMAT_DONTKNOW );
 
         BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
 
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 38a4def0d0bb..5fd07ce5eb39 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -248,7 +248,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
         {
             pPopupMenu->InsertItem( nItemId, rStr );
             aCmd = aCmd_Language;
-            aCmd += String( rStr );
+            aCmd += rStr;
             pPopupMenu->SetItemCommand( nItemId, aCmd );
             if (rStr == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu )
             {
@@ -261,19 +261,19 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
 
     // entry for LANGUAGE_NONE
     ++nItemId;
-    pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_NONE )) );
+    pPopupMenu->InsertItem( nItemId, OUString(FwlResId( STR_LANGSTATUS_NONE )) );
     aCmd = aCmd_Language + "LANGUAGE_NONE";
     pPopupMenu->SetItemCommand( nItemId, aCmd );
 
     // entry for 'Reset to default language'
     ++nItemId;
-    pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_RESET_TO_DEFAULT_LANGUAGE )) );
+    pPopupMenu->InsertItem( nItemId, OUString(FwlResId( STR_RESET_TO_DEFAULT_LANGUAGE )) );
     aCmd = aCmd_Language + "RESET_LANGUAGES";
     pPopupMenu->SetItemCommand( nItemId, aCmd );
 
     // entry for opening the Format/Character dialog
     ++nItemId;
-    pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_MORE )));
+    pPopupMenu->InsertItem( nItemId, OUString(FwlResId( STR_LANGSTATUS_MORE )));
     pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog );
 }
 
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index f7feca02d4bc..9db444cf8048 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -87,7 +87,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo
 
     // insert basic
     OUString aCommand(".uno:MacroDialog");
-    String aDisplayName = RetrieveLabelFromCommand( aCommand );
+    OUString aDisplayName = RetrieveLabelFromCommand( aCommand );
     pPopupMenu->InsertItem( 2, aDisplayName );
     pPopupMenu->SetItemCommand( 2, aCommand );
 
@@ -189,15 +189,15 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta
                 if ( serviceNames[ index ].indexOf( providerKey ) == 0 )
                 {
                     OUString serviceName = serviceNames[ index ];
-                    String aCommand =  aCmdBase;
-                    String aDisplayName = String( serviceName.copy( providerKey.getLength() ) );
-                    if( aDisplayName.Equals( OUString("Java") ) || aDisplayName.Equals( OUString("Basic") ) )
+                    OUString aCommand = aCmdBase;
+                    OUString aDisplayName = serviceName.copy( providerKey.getLength() );
+                    if( aDisplayName == "Java" || aDisplayName == "Basic" )
                     {
                         // no entries for Java & Basic added elsewhere
                         break;
                     }
-                    aCommand.Append( aDisplayName );
-                    aDisplayName.Append( ellipsis );
+                    aCommand += aDisplayName;
+                    aDisplayName += ellipsis;
                     pPopupMenu->InsertItem( itemId, aDisplayName );
                     pPopupMenu->SetItemCommand( itemId, aCommand );
                     itemId++;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index ff46fb4e44ac..e0bac020cd41 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -737,7 +737,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
         sal_uInt16 nNewItemId( 0 );
         sal_uInt16 nInsertPos( MENU_APPEND );
         sal_uInt16 nBeforePos( MENU_APPEND );
-        String aCommandBefore( OUString(".uno:About"));
+        OUString aCommandBefore( ".uno:About" );
         for ( sal_uInt16 n = 0; n < pMenu->GetItemCount(); n++ )
         {
             sal_uInt16 nItemId = pMenu->GetItemId( n );
@@ -847,8 +847,8 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
             if (( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR ) &&
                 ( pMenu->GetItemText( nItemId ).isEmpty() ))
             {
-                String aCommand = pMenu->GetItemCommand( nItemId );
-                if ( aCommand.Len() > 0 ) {
+                OUString aCommand = pMenu->GetItemCommand( nItemId );
+                if ( !aCommand.isEmpty() ) {
                     pMenu->SetItemText( nItemId, RetrieveLabelFromCommand( aCommand ));
                 }
             }
@@ -1235,7 +1235,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
         framework::AddonMenuManager::MergeAddonHelpMenu( rFrame, (MenuBar *)pMenu );
     }
 
-    String      aEmpty;
+    OUString    aEmpty;
     sal_Bool    bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() );
     sal_uInt16 nItemCount = pMenu->GetItemCount();
     OUString aItemCommand;
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 156979ccf2ce..8b5837721207 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -102,8 +102,8 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
 
                 if ( !bImageSet )
                 {
-                    String aCmd( pPopupMenu->GetItemCommand( nItemId ) );
-                    if ( aCmd.Len() )
+                    OUString aCmd( pPopupMenu->GetItemCommand( nItemId ) );
+                    if ( !aCmd.isEmpty() )
                         aImage = GetImageFromURL( xFrame, aCmd, false );
 
                     if ( !!aImage )
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index aa2a2703aee2..423028d966f2 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -519,7 +519,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
             }
         }
 
-        String aLabelStr = String( FwkResId( STR_RESTORE_TOOLBARS ));
+        OUString aLabelStr( FwkResId( STR_RESTORE_TOOLBARS ));
         OUString aRestoreCmd( CMD_RESTOREVISIBILITY );
         addCommand( m_xPopupMenu, aRestoreCmd, aLabelStr );
     }
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index aae448ff8e31..2280126b22ee 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -283,7 +283,7 @@ throw(  SAXException, RuntimeException )
                     }
                 } // for
 
-                if ( m_pImages->aURL.Len() == 0 )
+                if ( m_pImages->aURL.isEmpty() )
                 {
                     delete m_pImages;
                     m_pImages = NULL;
@@ -356,7 +356,7 @@ throw(  SAXException, RuntimeException )
                 }
 
                 // Check required attribute "command"
-                if ( pItem->aCommandURL.Len() == 0 )
+                if ( pItem->aCommandURL.isEmpty() )
                 {
                     delete pItem;
                     delete m_pImages;
@@ -459,7 +459,7 @@ throw(  SAXException, RuntimeException )
                 }
 
                 // Check required attribute "command"
-                if ( pItem->aCommandURL.Len() == 0 )
+                if ( pItem->aCommandURL.isEmpty() )
                 {
                     delete pItem;
                     delete m_pImages;
@@ -473,7 +473,7 @@ throw(  SAXException, RuntimeException )
                 }
 
                 // Check required attribute "href"
-                if ( pItem->aURL.Len() == 0 )
+                if ( pItem->aURL.isEmpty() )
                 {
                     delete pItem;
                     delete m_pImages;
@@ -704,7 +704,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor*
                              m_aAttributeType,
                              pImageList->aMaskURL );
 
-        if ( pImageList->aHighContrastMaskURL.Len() > 0 )
+        if ( !pImageList->aHighContrastMaskURL.isEmpty() )
         {
             pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_HIGHCONTRASTMASKURL ),
                                  m_aAttributeType,
@@ -728,7 +728,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor*
                              OUString( ATTRIBUTE_MASKMODE_COLOR ) );
     }
 
-    if ( pImageList->aHighContrastURL.Len() > 0 )
+    if ( !pImageList->aHighContrastURL.isEmpty() )
     {
         pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_HIGHCONTRASTURL ),
                              m_aAttributeType,
@@ -798,14 +798,14 @@ void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDes
                          m_aAttributeType,
                          m_aAttributeValueSimple );
 
-    if ( pExternalImage->aURL.Len() > 0 )
+    if ( !pExternalImage->aURL.isEmpty() )
     {
         pList->AddAttribute( m_aXMLXlinkNS + OUString( ATTRIBUTE_HREF ),
                              m_aAttributeType,
                              pExternalImage->aURL );
     }
 
-    if ( pExternalImage->aCommandURL.Len() > 0 )
+    if ( !pExternalImage->aCommandURL.isEmpty() )
     {
         pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_COMMAND ),
                              m_aAttributeType,