convert basctl module from String to OUString

Change-Id: Iac38d4fd5d1d8b5c305bbb20eb1b40a7c7dec9bf

14 files changed, 146 insertions, 146 deletions

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index e2e5e72e0e6a..c154afb04556 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -142,34 +142,34 @@ void lcl_DrawIDEWindowFrame( DockingWindow* pWin )
     pWin->SetLineColor( aOldLineColor );
 }
 
-void lcl_SeparateNameAndIndex( const String& rVName, String& rVar, String& rIndex )
+void lcl_SeparateNameAndIndex( const OUString& rVName, OUString& rVar, OUString& rIndex )
 {
     rVar = rVName;
-    rIndex.Erase();
-    sal_uInt16 nIndexStart = rVar.Search( '(' );
-    if ( nIndexStart != STRING_NOTFOUND )
+    rIndex = "";
+    sal_Int32 nIndexStart = rVar.indexOf( '(' );
+    if ( nIndexStart != -1 )
     {
-        sal_uInt16 nIndexEnd = rVar.Search( ')', nIndexStart );
-        if ( nIndexStart != STRING_NOTFOUND )
+        sal_Int32 nIndexEnd = rVar.indexOf( ')', nIndexStart );
+        if ( nIndexStart != -1 )
         {
-            rIndex = rVar.Copy( nIndexStart+1, nIndexEnd-nIndexStart-1 );
-            rVar.Erase( nIndexStart );
+            rIndex = rVar.copy( nIndexStart+1, nIndexEnd-nIndexStart-1 );
+            rVar = rVar.copy( 0, nIndexStart );
             rVar = comphelper::string::stripEnd(rVar, ' ');
             rIndex = comphelper::string::strip(rIndex, ' ');
         }
     }
 
-    if ( rVar.Len() )
+    if ( !rVar.isEmpty() )
     {
-        sal_uInt16 nLastChar = rVar.Len()-1;
-        if ( strchr( cSuffixes, rVar.GetChar( nLastChar ) ) )
-            rVar.Erase( nLastChar, 1 );
+        sal_uInt16 nLastChar = rVar.getLength()-1;
+        if ( strchr( cSuffixes, rVar[ nLastChar ] ) )
+            rVar = rVar.replaceAt( nLastChar, 1, "" );
     }
-    if ( rIndex.Len() )
+    if ( !rIndex.isEmpty() )
     {
-        sal_uInt16 nLastChar = rIndex.Len()-1;
-        if ( strchr( cSuffixes, rIndex.GetChar( nLastChar ) ) )
-            rIndex.Erase( nLastChar, 1 );
+        sal_uInt16 nLastChar = rIndex.getLength()-1;
+        if ( strchr( cSuffixes, rIndex[ nLastChar ] ) )
+            rIndex = rIndex.replaceAt( nLastChar, 1, "" );
     }
 }
 
@@ -209,7 +209,7 @@ private:
 class EditorWindow::ProgressInfo : public SfxProgress
 {
 public:
-    ProgressInfo (SfxObjectShell* pObjSh, String const& rText, sal_uLong nRange) :
+    ProgressInfo (SfxObjectShell* pObjSh, OUString const& rText, sal_uLong nRange) :
         SfxProgress(pObjSh, rText, nRange),
         nCurState(0)
     { }
@@ -275,7 +275,7 @@ EditorWindow::~EditorWindow()
 
 OUString EditorWindow::GetWordAtCursor()
 {
-    String aWord;
+    OUString aWord;
 
     if ( pEditView )
     {
@@ -309,11 +309,11 @@ OUString EditorWindow::GetWordAtCursor()
 
             // Not the selected range, but at the CursorPosition,
             // if a word is partially selected.
-            if ( !aWord.Len() )
+            if ( aWord.isEmpty() )
                 aWord = pTextEngine->GetWord( rSelEnd );
 
             // Can be empty when full word selected, as Cursor behing it
-            if ( !aWord.Len() && pEditView->HasSelection() )
+            if ( aWord.isEmpty() && pEditView->HasSelection() )
                 aWord = pTextEngine->GetWord( rSelStart );
         }
     }
@@ -330,13 +330,13 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
     {
         if ( rHEvt.GetMode() & HELPMODE_CONTEXT )
         {
-            String aKeyword = GetWordAtCursor();
+            OUString aKeyword = GetWordAtCursor();
             Application::GetHelp()->SearchKeyword( aKeyword );
             bDone = true;
         }
         else if ( rHEvt.GetMode() & HELPMODE_QUICK )
         {
-            String aHelpText;
+            OUString aHelpText;
             Point aTopLeft;
             if ( StarBASIC::IsRunning() )
             {
@@ -345,12 +345,12 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
                 Point aDocPos = GetEditView()->GetDocPos( aWindowPos );
                 TextPaM aCursor = GetEditView()->GetTextEngine()->GetPaM(aDocPos, false);
                 TextPaM aStartOfWord;
-                String aWord = GetEditView()->GetTextEngine()->GetWord( aCursor, &aStartOfWord );
-                if ( aWord.Len() && !comphelper::string::isdigitAsciiString(aWord) )
+                OUString aWord = GetEditView()->GetTextEngine()->GetWord( aCursor, &aStartOfWord );
+                if ( !aWord.isEmpty() && !comphelper::string::isdigitAsciiString(aWord) )
                 {
-                    sal_uInt16 nLastChar =aWord.Len()-1;
-                    if ( strchr( cSuffixes, aWord.GetChar( nLastChar ) ) )
-                        aWord.Erase( nLastChar, 1 );
+                    sal_uInt16 nLastChar = aWord.getLength() - 1;
+                    if ( strchr( cSuffixes, aWord[ nLastChar ] ) )
+                        aWord = aWord.replaceAt( nLastChar, 1, "" );
                     SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
                     if (SbxVariable const* pVar = IsSbxVariable(pSBX))
                     {
@@ -364,13 +364,13 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
                         else if ( (sal_uInt8)eType != (sal_uInt8)SbxEMPTY )
                         {
                             aHelpText = pVar->GetName();
-                            if ( !aHelpText.Len() )     // name is not copied with the passed parameters
+                            if ( aHelpText.isEmpty() )     // name is not copied with the passed parameters
                                 aHelpText = aWord;
-                            aHelpText += '=';
+                            aHelpText += "=";
                             aHelpText += pVar->GetOUString();
                         }
                     }
-                    if ( aHelpText.Len() )
+                    if ( !aHelpText.isEmpty() )
                     {
                         aTopLeft = GetEditView()->GetTextEngine()->PaMtoEditCursor( aStartOfWord ).BottomLeft();
                         aTopLeft = GetEditView()->GetWindowPos( aTopLeft );
@@ -1695,10 +1695,10 @@ void WatchWindow::Resize()
 
 struct WatchItem
 {
-    String          maName;
-    String          maDisplayName;
+    OUString        maName;
+    OUString        maDisplayName;
     SbxObjectRef    mpObject;
-    std::vector<String> maMemberList;
+    std::vector<OUString> maMemberList;
 
     SbxDimArrayRef  mpArray;
     int             nDimLevel;  // 0 = Root
@@ -1707,7 +1707,7 @@ struct WatchItem
 
     WatchItem*      mpArrayParentItem;
 
-    WatchItem (String const& rName):
+    WatchItem (OUString const& rName):
         maName(rName),
         nDimLevel(0),
         nDimCount(0),
@@ -1746,7 +1746,7 @@ SbxDimArray* WatchItem::GetRootArray( void )
 
 void WatchWindow::AddWatch( const OUString& rVName )
 {
-    String aVar, aIndex;
+    OUString aVar, aIndex;
     lcl_SeparateNameAndIndex( rVName, aVar, aIndex );
     WatchItem* pWatchItem = new WatchItem(aVar);
 
@@ -1772,7 +1772,7 @@ bool WatchWindow::RemoveSelectedWatch()
         if ( pEntry )
             aXEdit.SetText( ((WatchItem*)pEntry->GetUserData())->maName );
         else
-            aXEdit.SetText( String() );
+            aXEdit.SetText( OUString() );
         if ( !aTreeListBox.GetEntryCount() )
             aRemoveWatchButton.Disable();
         return true;
@@ -1845,8 +1845,8 @@ IMPL_LINK( WatchWindow, EditAccHdl, Accelerator *, pAcc )
     {
         case KEY_RETURN:
         {
-            String aCurText( aXEdit.GetText() );
-            if ( aCurText.Len() )
+            OUString aCurText( aXEdit.GetText() );
+            if ( !aCurText.isEmpty() )
             {
                 AddWatch( aCurText );
                 aXEdit.SetSelection( Selection( 0, 0xFFFF ) );
@@ -1855,7 +1855,7 @@ IMPL_LINK( WatchWindow, EditAccHdl, Accelerator *, pAcc )
         break;
         case KEY_ESCAPE:
         {
-            aXEdit.SetText( String() );
+            aXEdit.SetText( OUString() );
         }
         break;
     }
@@ -1884,7 +1884,7 @@ StackWindow::StackWindow (Layout* pParent) :
     aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) );
     aTreeListBox.SetHighlightRange();
     aTreeListBox.SetSelectionMode( NO_SELECTION );
-    aTreeListBox.InsertEntry( String(), 0, false, LIST_APPEND );
+    aTreeListBox.InsertEntry( OUString(), 0, false, LIST_APPEND );
     aTreeListBox.Show();
 
     SetText(IDEResId(RID_STR_STACKNAME).toString());
@@ -1996,7 +1996,7 @@ void StackWindow::UpdateCalls()
     else
     {
         aTreeListBox.SetSelectionMode( NO_SELECTION );
-        aTreeListBox.InsertEntry( String(), 0, false, LIST_APPEND );
+        aTreeListBox.InsertEntry( OUString(), 0, false, LIST_APPEND );
     }
 
     aTreeListBox.SetUpdateMode(true);
@@ -2176,8 +2176,8 @@ void WatchTreeListBox::RequestingChildren( SvTreeListEntry * pParent )
         {
             SbxVariable* pVar = pProps->Get( i );
 
-            pItem->maMemberList.push_back(String(pVar->GetName()));
-            String const& rName = pItem->maMemberList.back();
+            pItem->maMemberList.push_back(pVar->GetName());
+            OUString const& rName = pItem->maMemberList.back();
             SvTreeListEntry* pChildEntry = SvTreeListBox::InsertEntry( rName, pEntry );
             pChildEntry->SetUserData(new WatchItem(rName));
         }
@@ -2241,7 +2241,7 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rb
     rbArrayElement = false;
 
     WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
-    String aVName( pItem->maName );
+    OUString aVName( pItem->maName );
 
     SvTreeListEntry* pParentEntry = GetParent( pEntry );
     WatchItem* pParentItem = pParentEntry ? (WatchItem*)pParentEntry->GetUserData() : NULL;
@@ -2302,13 +2302,13 @@ sal_Bool WatchTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
 
 sal_Bool WatchTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
 {
-    String aResult = comphelper::string::strip(rNewText, ' ');
+    OUString aResult = comphelper::string::strip(rNewText, ' ');
 
-    sal_uInt16 nResultLen = aResult.Len();
-    sal_Unicode cFirst = aResult.GetChar( 0 );
-    sal_Unicode cLast  = aResult.GetChar( nResultLen - 1 );
+    sal_uInt16 nResultLen = aResult.getLength();
+    sal_Unicode cFirst = aResult[0];
+    sal_Unicode cLast  = aResult[ nResultLen - 1 ];
     if( cFirst == '\"' && cLast == '\"' )
-        aResult = aResult.Copy( 1, nResultLen - 2 );
+        aResult = aResult.copy( 1, nResultLen - 2 );
 
     return aResult != aEditingRes && ImplBasicEntryEdited(pEntry, aResult);
 }
@@ -2361,7 +2361,7 @@ void implCollapseModifiedObjectEntry( SvTreeListEntry* pParent, WatchTreeListBox
     }
 }
 
-String implCreateTypeStringForDimArray( WatchItem* pItem, SbxDataType eType )
+OUString implCreateTypeStringForDimArray( WatchItem* pItem, SbxDataType eType )
 {
     OUString aRetStr = getBasicTypeName( eType );
 
@@ -2418,10 +2418,10 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
     while ( pEntry )
     {
         WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
-        String aVName( pItem->maName );
-        DBG_ASSERT( aVName.Len(), "Var? - Must not be empty!" );
-        String aWatchStr;
-        String aTypeStr;
+        OUString aVName( pItem->maName );
+        DBG_ASSERT( !aVName.isEmpty(), "Var? - Must not be empty!" );
+        OUString aWatchStr;
+        OUString aTypeStr;
         if ( pCurMethod )
         {
             bool bArrayElement;
@@ -2522,7 +2522,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
                             for( sal_uInt16 i = 0 ; i < nPropCount - 3 ; i++ )
                             {
                                 SbxVariable* pVar_ = pProps->Get( i );
-                                String aName( pVar_->GetName() );
+                                OUString aName( pVar_->GetName() );
                                 if( pItem->maMemberList[i] != aName )
                                 {
                                     bObjChanged = true;
@@ -2573,11 +2573,11 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
                         aWatchStr += aStrStr;
                     }
                 }
-                if( !aTypeStr.Len() )
+                if( aTypeStr.isEmpty() )
                 {
                     if( !pVar->IsFixed() )
                     {
-                        aTypeStr = OUString( "Variant/" );
+                        aTypeStr = "Variant/";
                     }
                     aTypeStr += getBasicTypeName( pVar->GetType() );
                 }
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 0f4c9b7463ab..a6c73d1f488c 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -718,8 +718,8 @@ bool DialogWindow::SaveDialog()
     xFP->setDefaultName( OUString( GetName() ) );
 
     OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME));
-    xFP->appendFilter( aDialogStr, String( "*.xdl" ) );
-    xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( FilterMask_All ) );
+    xFP->appendFilter( aDialogStr, OUString( "*.xdl" ) );
+    xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) );
     xFP->setCurrentFilter( aDialogStr );
 
     if( xFP->execute() == RET_OK )
@@ -966,8 +966,8 @@ bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocum
         xFP->setDisplayDirectory ( aCurPath );
 
     OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME));
-    xFP->appendFilter( aDialogStr, String( "*.xdl" ) );
-    xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( FilterMask_All ) );
+    xFP->appendFilter( aDialogStr, OUString( "*.xdl" ) );
+    xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) );
     xFP->setCurrentFilter( aDialogStr );
 
     if( xFP->execute() == RET_OK )
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 1810bea6bde4..6fcf7a99979f 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -475,7 +475,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
                     if ( aDocument == m_aCurDocument && aLibName == m_aCurLibName )
                     {
                         m_aCurDocument = ScriptDocument::getApplicationScriptDocument();
-                        m_aCurLibName = String();
+                        m_aCurLibName = "";
                         // no UpdateWindows!
                         if (SfxBindings* pBindings = GetBindingsPtr())
                             pBindings->Invalidate( SID_BASICIDE_LIBSELECTOR );
@@ -488,14 +488,14 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
         break;
         case SID_BASICIDE_NEWMODULE:
         {
-            ModulWindow* pWin = CreateBasWin( m_aCurDocument, m_aCurLibName, String() );
+            ModulWindow* pWin = CreateBasWin( m_aCurDocument, m_aCurLibName, OUString() );
             DBG_ASSERT( pWin, "New Module: Konnte Fenster nicht erzeugen!" );
             SetCurWindow( pWin, true );
         }
         break;
         case SID_BASICIDE_NEWDIALOG:
         {
-            DialogWindow* pWin = CreateDlgWin( m_aCurDocument, m_aCurLibName, String() );
+            DialogWindow* pWin = CreateDlgWin( m_aCurDocument, m_aCurLibName, OUString() );
             DBG_ASSERT( pWin, "New Module: Konnte Fenster nicht erzeugen!" );
             SetCurWindow( pWin, true );
         }
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 74e7e19ea7e8..272795c1db34 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -107,7 +107,7 @@ bool IsValidSbxName( const OUString& rName )
 
 static bool StringCompareLessThan( const OUString& rStr1, const OUString& rStr2 )
 {
-    return (rStr1.compareToIgnoreAsciiCase( rStr2 ) < 0);
+    return rStr1.compareToIgnoreAsciiCase( rStr2 ) < 0;
 }
 
 //----------------------------------------------------------------------------
@@ -127,7 +127,7 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon
     }
 
     // create a sorted list of dialog library names
-    ::std::vector<String> aDlgLibList;
+    ::std::vector<OUString> aDlgLibList;
     if ( xDlgLibContainer.is() )
     {
         Sequence< OUString > aDlgLibNames = xDlgLibContainer->getElementNames();
@@ -139,9 +139,9 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon
     }
 
     // merge both lists
-    ::std::vector<String> aLibList( aModLibList.size() + aDlgLibList.size() );
+    ::std::vector<OUString> aLibList( aModLibList.size() + aDlgLibList.size() );
     ::std::merge( aModLibList.begin(), aModLibList.end(), aDlgLibList.begin(), aDlgLibList.end(), aLibList.begin(), StringCompareLessThan );
-    ::std::vector<String>::iterator aIterEnd = ::std::unique( aLibList.begin(), aLibList.end() );  // move unique elements to the front
+    ::std::vector<OUString>::iterator aIterEnd = ::std::unique( aLibList.begin(), aLibList.end() );  // move unique elements to the front
     aLibList.erase( aIterEnd, aLibList.end() ); // remove duplicates
 
     // copy to sequence
@@ -267,7 +267,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
 
     GetExtraData()->ChoosingMacro() = true;
 
-    String aScriptURL;
+    OUString aScriptURL;
     bool bError = false;
     SbMethod* pMethod = NULL;
 
@@ -316,11 +316,11 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
             }
 
             // name
-            String aName;
+            OUString aName;
             aName += pBasic->GetName();
-            aName += '.';
+            aName += ".";
             aName += pModule->GetName();
-            aName += '.';
+            aName += ".";
             aName += pMethod->GetName();
 
             // language
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index f6b787797963..9bddbad4ca44 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -140,8 +140,8 @@ SbMethod* CreateMacro( SbModule* pModule, const OUString& rMacroName )
             OSL_ENSURE( aDocument.isValid(), "basctl::CreateMacro: no document for the given BasicManager!" );
             if ( aDocument.isValid() )
             {
-                String aLibName = pBasic->GetName();
-                String aModName = pModule->GetName();
+                OUString aLibName = pBasic->GetName();
+                OUString aModName = pModule->GetName();
                 OSL_VERIFY( aDocument.updateModule( aLibName, aModName, aOUSource ) );
             }
         }
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index 98589c86dfd2..e6991bfe67a4 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -42,8 +42,8 @@ private:
 
     EntryDescriptor m_aLastEntryDesc;
 
-    String          aAddLibPath;
-    String          aAddLibFilter;
+    OUString        aAddLibPath;
+    OUString        aAddLibFilter;
 
     sal_uInt16      nBasicDialogCount;
 
@@ -72,11 +72,11 @@ public:
     SvxSearchItem&    GetSearchItem() const { return *pSearchItem; }
     void              SetSearchItem( const SvxSearchItem& rItem );
 
-    const String&     GetAddLibPath() const   { return aAddLibPath; }
-    void              SetAddLibPath( const String& rPath ) { aAddLibPath = rPath; }
+    const OUString&   GetAddLibPath() const   { return aAddLibPath; }
+    void              SetAddLibPath( const OUString& rPath ) { aAddLibPath = rPath; }
 
-    const String&     GetAddLibFilter() const { return aAddLibFilter; }
-    void              SetAddLibFilter( const String& rFilter )  { aAddLibFilter = rFilter; }
+    const OUString&   GetAddLibFilter() const { return aAddLibFilter; }
+    void              SetAddLibFilter( const OUString& rFilter )  { aAddLibFilter = rFilter; }
 };
 
 } // namespace basctl
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index fe87f4c04883..dfbbfaaa6ef6 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -136,7 +136,7 @@ void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou
     Reference< XStringResourceResolver > xDummyStringResolver;
     for( sal_Int32 i = 0 ; i < nDlgCount ; i++ )
     {
-        String aDlgName = pDlgNames[ i ];
+        OUString aDlgName = pDlgNames[ i ];
         if (DialogWindow* pWin = m_pShell->FindDlgWin(m_aDocument, m_aLibName, aDlgName))
         {
             Reference< container::XNameContainer > xDialog = pWin->GetDialog();
@@ -828,7 +828,7 @@ void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor* pEdito
     DBG_ASSERT( aDocument.isValid(), "LocalizationMgr::setControlResourceIDsForNewEditorObject: invalid document!" );
     if ( !aDocument.isValid() )
         return;
-    const String& rLibName = pDlgWin->GetLibName();
+    const OUString& rLibName = pDlgWin->GetLibName();
     Reference< container::XNameContainer > xDialogLib( aDocument.getLibrary( E_DIALOGS, rLibName, true ) );
     Reference< XStringResourceManager > xStringResourceManager =
         LocalizationMgr::getStringResourceFromDialogLibrary( xDialogLib );
@@ -858,7 +858,7 @@ void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor* pEdito
     DBG_ASSERT( aDocument.isValid(), "LocalizationMgr::renameControlResourceIDsForEditorObject: invalid document!" );
     if ( !aDocument.isValid() )
         return;
-    const String& rLibName = pDlgWin->GetLibName();
+    const OUString& rLibName = pDlgWin->GetLibName();
     Reference< container::XNameContainer > xDialogLib( aDocument.getLibrary( E_DIALOGS, rLibName, true ) );
     Reference< XStringResourceManager > xStringResourceManager =
         LocalizationMgr::getStringResourceFromDialogLibrary( xDialogLib );
@@ -886,7 +886,7 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor*
     DBG_ASSERT( aDocument.isValid(), "LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject: invalid document!" );
     if ( !aDocument.isValid() )
         return;
-    const String& rLibName = pDlgWin->GetLibName();
+    const OUString& rLibName = pDlgWin->GetLibName();
     Reference< container::XNameContainer > xDialogLib( aDocument.getLibrary( E_DIALOGS, rLibName, true ) );
     Reference< XStringResourceManager > xStringResourceManager =
         LocalizationMgr::getStringResourceFromDialogLibrary( xDialogLib );
@@ -1061,7 +1061,7 @@ void LocalizationMgr::copyResourcesForPastedEditorObject( DlgEditor* pEditor,
     DBG_ASSERT( aDocument.isValid(), "LocalizationMgr::copyResourcesForPastedEditorObject: invalid document!" );
     if ( !aDocument.isValid() )
         return;
-    const String& rLibName = pDlgWin->GetLibName();
+    const OUString& rLibName = pDlgWin->GetLibName();
     Reference< container::XNameContainer > xDialogLib( aDocument.getLibrary( E_DIALOGS, rLibName, true ) );
     Reference< XStringResourceManager > xStringResourceManager =
         LocalizationMgr::getStringResourceFromDialogLibrary( xDialogLib );
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 1d6525f9d05f..74c7ea9559b8 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -131,13 +131,13 @@ MacroChooser::~MacroChooser()
 void MacroChooser::StoreMacroDescription()
 {
     EntryDescriptor aDesc = m_pBasicBox->GetEntryDescriptor(m_pBasicBox->FirstSelected());
-    String aMethodName;
+    OUString aMethodName;
     SvTreeListEntry* pEntry = m_pMacroBox->FirstSelected();
     if ( pEntry )
         aMethodName = m_pMacroBox->GetEntryText( pEntry );
     else
         aMethodName = m_pMacroNameEdit->GetText();
-    if ( aMethodName.Len() )
+    if ( !aMethodName.isEmpty() )
     {
         aDesc.SetMethodName( aMethodName );
         aDesc.SetType( OBJ_TYPE_METHOD );
@@ -163,8 +163,8 @@ void MacroChooser::RestoreMacroDescription()
 
     m_pBasicBox->SetCurrentEntry( aDesc );
 
-    String aLastMacro( aDesc.GetMethodName() );
-    if ( aLastMacro.Len() )
+    OUString aLastMacro( aDesc.GetMethodName() );
+    if ( !aLastMacro.isEmpty() )
     {
         // find entry in macro box
         SvTreeListEntry* pEntry = 0;
@@ -267,7 +267,7 @@ SbMethod* MacroChooser::GetMacro()
         SvTreeListEntry* pEntry = m_pMacroBox->FirstSelected();
         if ( pEntry )
         {
-            String aMacroName( m_pMacroBox->GetEntryText( pEntry ) );
+            OUString aMacroName( m_pMacroBox->GetEntryText( pEntry ) );
             pMethod = (SbMethod*)pModule->GetMethods()->Find( aMacroName, SbxCLASS_METHOD );
         }
     }
@@ -308,8 +308,8 @@ void MacroChooser::DeleteMacro()
         pModule->SetSource32( aSource );
 
         // update module in library
-        String aLibName = pBasic->GetName();
-        String aModName = pModule->GetName();
+        OUString aLibName = pBasic->GetName();
+        OUString aModName = pModule->GetName();
         OSL_VERIFY( aDocument.updateModule( aLibName, aModName, aSource ) );
 
         SvTreeListEntry* pEntry = m_pMacroBox->FirstSelected();
@@ -329,9 +329,9 @@ SbMethod* MacroChooser::CreateMacro()
     if ( !aDocument.isAlive() )
         return NULL;
 
-    String aLibName( aDesc.GetLibName() );
+    OUString aLibName( aDesc.GetLibName() );
 
-    if ( !aLibName.Len() )
+    if ( aLibName.isEmpty() )
         aLibName = "Standard" ;
 
     aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
@@ -349,14 +349,14 @@ SbMethod* MacroChooser::CreateMacro()
     if ( pBasic )
     {
         SbModule* pModule = 0;
-        String aModName( aDesc.GetName() );
-        if ( aModName.Len() )
+        OUString aModName( aDesc.GetName() );
+        if ( !aModName.isEmpty() )
         {
             // extract the module name from the string like "Sheet1 (Example1)"
             if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) )
             {
                 sal_Int32 nIndex = 0;
-                aModName = aModName.GetToken( 0, ' ', nIndex );
+                aModName = aModName.getToken( 0, ' ', nIndex );
             }
             pModule = pBasic->FindModule( aModName );
         }
@@ -369,7 +369,7 @@ SbMethod* MacroChooser::CreateMacro()
                 aDocument, *m_pBasicBox, aLibName, aModName );
         }
 
-        String aSubName = m_pMacroNameEdit->GetText();
+        OUString aSubName = m_pMacroNameEdit->GetText();
         DBG_ASSERT( !pModule || !pModule->GetMethods()->Find( aSubName, SbxCLASS_METHOD ), "Macro existiert schon!" );
         pMethod = pModule ? basctl::CreateMacro( pModule, aSubName ) : NULL;
     }
@@ -381,7 +381,7 @@ void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry
 {
     // the edit would be killed by the highlight otherwise:
 
-    String aSaveText( m_pMacroNameEdit->GetText() );
+    OUString aSaveText( m_pMacroNameEdit->GetText() );
     Selection aCurSel( m_pMacroNameEdit->GetSelection() );
 
     rBox.SetCurEntry( pEntry );
@@ -500,7 +500,7 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
     m_pMacroBox->Clear();
     if ( pModule )
     {
-        String aStr = m_aMacrosInTxtBaseStr;
+        OUString aStr = m_aMacrosInTxtBaseStr;
         aStr += " " ;
         aStr += pModule->GetName();
 
@@ -574,7 +574,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
         }
         if ( m_pMacroBox->GetEntryCount() )
         {
-            String aEdtText( m_pMacroNameEdit->GetText() );
+            OUString aEdtText( m_pMacroNameEdit->GetText() );
             bool bFound = false;
             for ( sal_uInt16 n = 0; n < m_pMacroBox->GetEntryCount(); n++ )
             {
@@ -658,16 +658,16 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
         if ( !aDocument.isAlive() )
             return 0;
         BasicManager* pBasMgr = aDocument.getBasicManager();
-        String aLib( aDesc.GetLibName() );
-        String aMod( aDesc.GetName() );
+        OUString aLib( aDesc.GetLibName() );
+        OUString aMod( aDesc.GetName() );
         // extract the module name from the string like "Sheet1 (Example1)"
         if( aDesc.GetLibSubName() == IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) )
         {
             sal_Int32 nIndex = 0;
-            aMod = aMod.GetToken( 0, ' ', nIndex );
+            aMod = aMod.getToken( 0, ' ', nIndex );
         }
-        String aSub( aDesc.GetMethodName() );
-        SfxMacroInfoItem aInfoItem( SID_BASICIDE_ARG_MACROINFO, pBasMgr, aLib, aMod, aSub, String() );
+        OUString aSub( aDesc.GetMethodName() );
+        SfxMacroInfoItem aInfoItem( SID_BASICIDE_ARG_MACROINFO, pBasMgr, aLib, aMod, aSub, OUString() );
         if (pButton == m_pEditButton)
         {
             SvTreeListEntry* pEntry = m_pMacroBox->FirstSelected();
@@ -731,13 +731,13 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
         if ( !aDocument.isAlive() )
             return 0;
         BasicManager* pBasMgr = aDocument.getBasicManager();
-        String aLib( aDesc.GetLibName() );
-        String aMod( aDesc.GetName() );
-        String aSub( m_pMacroNameEdit->GetText() );
+        OUString aLib( aDesc.GetLibName() );
+        OUString aMod( aDesc.GetName() );
+        OUString aSub( m_pMacroNameEdit->GetText() );
         SbMethod* pMethod = GetMacro();
         DBG_ASSERT( pBasMgr, "BasMgr?" );
         DBG_ASSERT( pMethod, "Method?" );
-        String aComment( GetInfo( pMethod ) );
+        OUString aComment( GetInfo( pMethod ) );
         SfxMacroInfoItem aItem( SID_MACROINFO, pBasMgr, aLib, aMod, aSub, aComment );
         SfxAllItemSet Args( SFX_APP()->GetPool() );
         SfxRequest aRequest( SID_CONFIG, SFX_CALLMODE_SYNCHRON, Args );
@@ -756,8 +756,8 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
         SvTreeListEntry* pCurEntry = m_pBasicBox->GetCurEntry();
         EntryDescriptor aDesc = m_pBasicBox->GetEntryDescriptor(pCurEntry);
         ScriptDocument aDocument( aDesc.GetDocument() );
-        String aLibName( aDesc.GetLibName() );
-        String aModName;
+        OUString aLibName( aDesc.GetLibName() );
+        OUString aModName;
         createModImpl( static_cast<Window*>( this ), aDocument,
             *m_pBasicBox, aLibName, aModName, true );
     }
@@ -790,7 +790,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
 void MacroChooser::UpdateFields()
 {
     SvTreeListEntry*    pMacroEntry = m_pMacroBox->GetCurEntry();
-    String          aEmptyStr;
+    OUString            aEmptyStr;
 
     m_pMacroNameEdit->SetText( aEmptyStr );
     if ( pMacroEntry )
@@ -840,9 +840,9 @@ void MacroChooser::SetMode (Mode nM)
     CheckButtons();
 }
 
-String MacroChooser::GetInfo( SbxVariable* pVar )
+OUString MacroChooser::GetInfo( SbxVariable* pVar )
 {
-    String aComment;
+    OUString aComment;
     SbxInfoRef xInfo = pVar->GetInfo();
     if ( xInfo.Is() )
         aComment = xInfo->GetComment();
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 1d1854d4bda4..4735fb414da7 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -54,7 +54,7 @@ private:
     FixedText*              m_pMacrosSaveInTxt;
     TreeListBox*            m_pBasicBox;
     FixedText*              m_pMacrosInTxt;
-    String                  m_aMacrosInTxtBaseStr;
+    OUString                m_aMacrosInTxtBaseStr;
     SvTreeListBox*          m_pMacroBox;
 
     PushButton*             m_pRunButton;
@@ -83,7 +83,7 @@ private:
 
     void                EnableButton( Button& rButton, bool bEnable );
 
-    String              GetInfo( SbxVariable* pVar );
+    OUString            GetInfo( SbxVariable* pVar );
 
     void                StoreMacroDescription();
     void                RestoreMacroDescription();
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 1b9e4d75140f..b75309253168 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -120,7 +120,7 @@ public:
 class LibLBoxString : public SvLBoxString
 {
 public:
-    LibLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) :
+    LibLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rTxt ) :
         SvLBoxString( pEntry, nFlags, rTxt ) {}
 
     virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
@@ -659,7 +659,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
         SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
         SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
         DBG_ASSERT( pCurEntry, "Entry?!" );
-        String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
+        OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
         SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
             pDispatcher->Execute( SID_BASICIDE_LIBSELECTED,
@@ -1145,7 +1145,7 @@ void LibPage::InsertLib()
 void LibPage::Export( void )
 {
     SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
-    String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
+    OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
 
     // Password verification
     OUString aOULibName( aLibName );
@@ -1184,7 +1184,7 @@ void LibPage::Export( void )
     }
 }
 
-void LibPage::implExportLib( const String& aLibName, const String& aTargetURL,
+void LibPage::implExportLib( const OUString& aLibName, const OUString& aTargetURL,
     const Reference< task::XInteractionHandler >& Handler )
 {
     OUString aOULibName( aLibName );
@@ -1236,7 +1236,7 @@ Reference< XProgressHandler > OLibCommandEnvironment::getProgressHandler()
 
 
 
-void LibPage::ExportAsPackage( const String& aLibName )
+void LibPage::ExportAsPackage( const OUString& aLibName )
 {
     // file open dialog
     Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
@@ -1254,8 +1254,8 @@ void LibPage::ExportAsPackage( const String& aLibName )
     xFP->appendFilter( aTitle, aFilter );
 
     // set display directory and filter
-    String aPath = GetExtraData()->GetAddLibPath();
-    if ( aPath.Len() )
+    OUString aPath = GetExtraData()->GetAddLibPath();
+    if ( !aPath.isEmpty() )
     {
         xFP->setDisplayDirectory( aPath );
     }
@@ -1277,7 +1277,7 @@ void LibPage::ExportAsPackage( const String& aLibName )
 
         OUString aPackageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
 
-        String aTmpPath = SvtPathOptions().GetTempPath();
+        OUString aTmpPath = SvtPathOptions().GetTempPath();
         INetURLObject aInetObj( aTmpPath );
         aInetObj.insertName( aLibName, true, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
         OUString aSourcePath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -1358,7 +1358,7 @@ void LibPage::ExportAsPackage( const String& aLibName )
     }
 }
 
-void LibPage::ExportAsBasic( const String& aLibName )
+void LibPage::ExportAsBasic( const OUString& aLibName )
 {
     // Folder picker
     Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
@@ -1368,8 +1368,8 @@ void LibPage::ExportAsBasic( const String& aLibName )
     xFolderPicker->setTitle(IDEResId(RID_STR_EXPORTBASIC).toString());
 
     // set display directory and filter
-    String aPath =GetExtraData()->GetAddLibPath();
-    if( !aPath.Len() )
+    OUString aPath =GetExtraData()->GetAddLibPath();
+    if( aPath.isEmpty() )
         aPath = SvtPathOptions().GetWorkPath();
 
     // INetURLObject aURL(m_sSavePath, INET_PROT_FILE);
@@ -1377,7 +1377,7 @@ void LibPage::ExportAsBasic( const String& aLibName )
     short nRet = xFolderPicker->execute();
     if( nRet == RET_OK )
     {
-        String aTargetURL = xFolderPicker->getDirectory();
+        OUString aTargetURL = xFolderPicker->getDirectory();
         GetExtraData()->SetAddLibPath(aTargetURL);
 
         Reference< task::XInteractionHandler > xDummyHandler( new DummyInteractionHandler( xHandler ) );
@@ -1390,7 +1390,7 @@ void LibPage::ExportAsBasic( const String& aLibName )
 void LibPage::DeleteCurrent()
 {
     SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
-    String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
+    OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
 
     // check, if library is link
     bool bIsLibraryLink = false;
@@ -1453,7 +1453,7 @@ void LibPage::FillListBox()
 
 void LibPage::InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation )
 {
-    String aEntryText( rDocument.getTitle( eLocation ) );
+    OUString aEntryText( rDocument.getTitle( eLocation ) );
     sal_uInt16 nPos = aBasicsBox.InsertEntry( aEntryText, LISTBOX_APPEND );
     aBasicsBox.SetEntryData( nPos, new DocumentEntry(rDocument, eLocation) );
 }
@@ -1485,7 +1485,7 @@ void LibPage::SetCurLib()
 
             for ( sal_Int32 i = 0 ; i < nLibCount ; i++ )
             {
-                String aLibName( pLibNames[ i ] );
+                OUString aLibName( pLibNames[ i ] );
                 if ( eLocation == aDocument.getLibraryLocation( aLibName ) )
                     ImpInsertLibEntry( aLibName, i );
             }
@@ -1500,7 +1500,7 @@ void LibPage::SetCurLib()
 
 //----------------------------------------------------------------------------
 
-SvTreeListEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos )
+SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong nPos )
 {
     // check, if library is password protected
     bool bProtected = false;
@@ -1528,7 +1528,7 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong n
     // check, if library is link
     if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLink( aOULibName ) )
     {
-        String aLinkURL = xModLibContainer->getLibraryLinkURL( aOULibName );
+        OUString aLinkURL = xModLibContainer->getLibraryLinkURL( aOULibName );
         aLibBox.SetEntryText( aLinkURL, pNewEntry, 1 );
     }
 
@@ -1564,7 +1564,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
 
     if (aNewDlg.Execute())
     {
-        if (aNewDlg.GetObjectName().Len())
+        if (!aNewDlg.GetObjectName().isEmpty())
             aLibName = aNewDlg.GetObjectName();
 
         if ( aLibName.getLength() > 30 )
@@ -1597,7 +1597,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
                 }
 
                 // create a module
-                String aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
+                OUString aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
                 OUString sModuleCode;
                 if ( !rDocument.createModule( aLibName, aModName, true, sModuleCode ) )
                     throw Exception();
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 1aabbefd4fe1..9cde52a1a544 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -961,7 +961,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
 
     if (aNewDlg.Execute() != 0)
     {
-        if (aNewDlg.GetObjectName().Len() )
+        if (!aNewDlg.GetObjectName().isEmpty() )
             aModName = aNewDlg.GetObjectName();
 
         try
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 8d1576beacf3..45659bfb1236 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -65,8 +65,8 @@ public:
     NewObjectDialog (Window* pParent, ObjectMode::Mode, bool bCheckName = false);
     virtual ~NewObjectDialog ();
 
-    String      GetObjectName() const { return aEdit.GetText(); }
-    void        SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );}
+    OUString    GetObjectName() const { return aEdit.GetText(); }
+    void        SetObjectName( const OUString& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.getLength() ) );}
 };
 
 class GotoLineDialog : public ModalDialog
@@ -250,16 +250,16 @@ protected:
     void                DeleteCurrent();
     void                NewLib();
     void                InsertLib();
-    void                implExportLib( const String& aLibName, const String& aTargetURL,
+    void                implExportLib( const OUString& aLibName, const OUString& aTargetURL,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler );
     void                Export();
-    void                ExportAsPackage( const String& aLibName );
-    void                ExportAsBasic( const String& aLibName );
+    void                ExportAsPackage( const OUString& aLibName );
+    void                ExportAsBasic( const OUString& aLibName );
     void                EndTabDialog( sal_uInt16 nRet );
     void                FillListBox();
     void                InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
     void                SetCurLib();
-    SvTreeListEntry*        ImpInsertLibEntry( const String& rLibName, sal_uLong nPos );
+    SvTreeListEntry*        ImpInsertLibEntry( const OUString& rLibName, sal_uLong nPos );
     virtual void        ActivatePage();
     virtual void        DeactivatePage();
 
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 8851d14e7fe7..30167194f914 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -129,7 +129,7 @@ namespace basctl
     {
         static bool StringCompareLessThan( const OUString& lhs, const OUString& rhs )
         {
-            return ( lhs.compareToIgnoreAsciiCase( rhs ) < 0 );
+            return lhs.compareToIgnoreAsciiCase( rhs ) < 0;
         }
 
         class FilterDocuments : public docs::IDocumentDescriptorFilter
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index d166e928331f..e29480d25fbe 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -64,7 +64,7 @@ DlgEditor& DlgEdObj::GetDialogEditor ()
 //----------------------------------------------------------------------------
 
 DlgEdObj::DlgEdObj()
-          :SdrUnoObj(String(), false)
+          :SdrUnoObj(OUString(), false)
           ,bIsListening(false)
           ,pDlgEdForm( NULL )
 {
@@ -973,7 +973,7 @@ SdrObject* DlgEdObj::getFullDragClone() const
 {
     // no need to really add the clone for dragging, it's a temporary
     // object
-    SdrObject* pObj = new SdrUnoObj(String());
+    SdrObject* pObj = new SdrUnoObj(OUString());
     *pObj = *((const SdrUnoObj*)this);
 
     return pObj;