remove extra string casts

23 files changed, 48 insertions, 53 deletions

diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 5dbc4be5dec6..2267914c33f8 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -217,7 +217,7 @@ class WatchTreeListBox : public SvHeaderTabListBox
 
 protected:
     virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& rSel  );
-    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
+    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
 
     sal_Bool            ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult );
     SbxBase*        ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement );
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 67c2a75e9fda..efe352ff4c14 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1966,7 +1966,7 @@ sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
     return bEdit;
 }
 
-sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText )
+sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText )
 {
     WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
     String aVName( pItem->maName );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 96545f649d51..913de2d326e5 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -326,24 +326,21 @@ sal_Bool BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
 
 //----------------------------------------------------------------------------
 
-sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText )
+sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewName )
 {
-    sal_Bool bValid = ( rNewText.Len() <= 30 ) && BasicIDE::IsValidSbxName( rNewText );
-    String aCurText( GetEntryText( pEntry, 0 ) );
-    if ( bValid && ( aCurText != rNewText ) )
+    sal_Bool bValid = ( rNewName.getLength() <= 30 ) && BasicIDE::IsValidSbxName( rNewName );
+    rtl::OUString aOldName( GetEntryText( pEntry, 0 ) );
+    if ( bValid && ( aOldName != rNewName ) )
     {
         try
         {
-            ::rtl::OUString aOldName( aCurText );
-            ::rtl::OUString aNewName( rNewText );
-
             Reference< script::XLibraryContainer2 > xModLibContainer( m_aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
             if ( xModLibContainer.is() )
-                xModLibContainer->renameLibrary( aOldName, aNewName );
+                xModLibContainer->renameLibrary( aOldName, rNewName );
 
             Reference< script::XLibraryContainer2 > xDlgLibContainer( m_aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
             if ( xDlgLibContainer.is() )
-                xDlgLibContainer->renameLibrary( aOldName, aNewName );
+                xDlgLibContainer->renameLibrary( aOldName, rNewName );
 
             BasicIDE::MarkDocumentModified( m_aDocument );
             SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
@@ -367,7 +364,7 @@ sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText
 
     if ( !bValid )
     {
-        if ( rNewText.Len() > 30 )
+        if ( rNewName.getLength() > 30 )
             ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_LIBNAMETOLONG ) ) ).Execute();
         else
             ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute();
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 657c3c8cff6c..c86089ef8ff1 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -89,7 +89,7 @@ sal_Bool ExtBasicTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
     return bRet;
 }
 
-sal_Bool ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText )
+sal_Bool ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText )
 {
     sal_Bool bValid = BasicIDE::IsValidSbxName( rNewText );
     if ( !bValid )
@@ -98,7 +98,7 @@ sal_Bool ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const String& rN
         return sal_False;
     }
 
-    String aCurText( GetEntryText( pEntry ) );
+    rtl::OUString aCurText( GetEntryText( pEntry ) );
     if ( aCurText == rNewText )
         // nothing to do
         return sal_True;
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 0626bab789ff..c83b2941c5fe 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -108,7 +108,7 @@ class ExtBasicTreeListBox : public BasicTreeListBox
 {
 protected:
     virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& rSel  );
-    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
+    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
 
     virtual DragDropMode    NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* pEntry );
     virtual sal_Bool            NotifyAcceptDrop( SvLBoxEntry* pEntry );
@@ -148,7 +148,7 @@ public:
 
     virtual void    InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
     virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& rSel );
-    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
+    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
 
     void            SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
 
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index cfbd311b528c..d4a2579b32f7 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -414,11 +414,11 @@ sal_Bool DBTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& /*_aSelect
     return m_aEditingHandler.Call(pEntry) != 0;
 }
 // -----------------------------------------------------------------------------
-sal_Bool DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText )
+sal_Bool DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText )
 {
     DBTreeEditedEntry aEntry;
     aEntry.pEntry = pEntry;
-    aEntry.aNewText  =rNewText;
+    aEntry.aNewText = rNewText;
     if(m_aEditedHandler.Call(&aEntry) != 0)
     {
         implStopSelectionTimer();
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 10d5c42c7b7f..a4080cde40d1 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -104,7 +104,7 @@ namespace dbaui
 
     extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars);
     //------------------------------------------------------------------
-    sal_Bool DbaIndexList::EditedEntry( SvLBoxEntry* _pEntry, const String& _rNewText )
+    sal_Bool DbaIndexList::EditedEntry( SvLBoxEntry* _pEntry, const rtl::OUString& _rNewText )
     {
         // first check if this is valid SQL92 name
         if ( isSQL92CheckEnabled(m_xConnection) )
@@ -112,13 +112,12 @@ namespace dbaui
             Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
             if ( xMeta.is() )
             {
-                ::rtl::OUString sNewName(_rNewText);
-                ::rtl::OUString sAlias = ::dbtools::convertName2SQLName(sNewName,xMeta->getExtraNameCharacters());
+                ::rtl::OUString sAlias = ::dbtools::convertName2SQLName(_rNewText, xMeta->getExtraNameCharacters());
                 if ( ( xMeta->supportsMixedCaseQuotedIdentifiers() )
                         ?
-                        sAlias != sNewName
+                        sAlias != _rNewText
                         :
-                !sNewName.equalsIgnoreAsciiCase(sAlias))
+                !_rNewText.equalsIgnoreAsciiCase(sAlias))
                     return sal_False;
             }
         }
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 558c66130893..b216e0828e0f 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -136,7 +136,7 @@ namespace dbaui
 
         // enable editing for tables/views and queries
         virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& );
-        virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+        virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
 
         virtual sal_Bool    DoubleClickHdl();
 
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 10839459626b..41527b727cb7 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -81,7 +81,7 @@ namespace dbaui
         }
 
     protected:
-        virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+        virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
 
     private:
         using SvTreeListBox::Select;
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index f518c296149f..a0f02b3c473a 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -66,7 +66,7 @@ friend class SfxOrganizeDlg_Impl;
 
 protected:
     virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection & );
-    virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
+    virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
     virtual sal_Bool NotifyMoving(SvLBoxEntry *pSource,
                             SvLBoxEntry* pTarget,
                             SvLBoxEntry *&pNewParent, sal_uIntPtr &);
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 91ea159fb286..70fbf7c4e488 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -884,7 +884,7 @@ sal_Bool SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection&
     (SV-Handler)
 
     [Cross-references]
-    <SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rText)>
+    <SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const rtl::OUString& rText)>
 */
 
 {
@@ -899,7 +899,7 @@ sal_Bool SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection&
 
 //-------------------------------------------------------------------------
 
-sal_Bool SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rText)
+sal_Bool SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const rtl::OUString& rText)
 
 /*  [Description]
 
@@ -921,7 +921,7 @@ sal_Bool SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String&
     delete pDlg->pSuspend;
     pDlg->pSuspend = NULL;
     SvLBoxEntry* pParent = GetParent(pEntry);
-    if( !rText.Len() )
+    if( rText.isEmpty() )
     {
         ErrorBox aBox( this, SfxResId( MSG_ERROR_EMPTY_NAME ) );
         aBox.GrabFocus();
diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx
index 9dae703e3bff..46e8cc7e122e 100644
--- a/svtools/inc/svtools/ivctrl.hxx
+++ b/svtools/inc/svtools/ivctrl.hxx
@@ -241,7 +241,7 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control
 protected:
 
     virtual void        KeyInput( const KeyEvent& rKEvt );
-    virtual sal_Bool        EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, sal_Bool bCancelled );
+    virtual sal_Bool    EditedEntry( SvxIconChoiceCtrlEntry*, const rtl::OUString& rNewText, sal_Bool bCancelled );
     virtual void        DocumentRectChanged();
     virtual void        VisibleRectChanged();
     virtual sal_Bool        EditingEntry( SvxIconChoiceCtrlEntry* pEntry );
diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index 0b45b0556305..8f883c62451a 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.hxx
@@ -250,7 +250,7 @@ public:
     // Editiert das erste StringItem des Entries, 0==Cursor
     void            EditEntry( SvLBoxEntry* pEntry = NULL );
     virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& );
-    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
     sal_Bool            IsEditingActive() const { return SvLBox::IsEditingActive(); }
     void            EndEditing( sal_Bool bCancel = sal_False ) { SvLBox::EndEditing( bCancel ); }
     sal_Bool            EditingCanceled() const { return SvLBox::EditingCanceled(); }
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index de0c2afdb45e..384dd5dd01c8 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -203,7 +203,7 @@ public:
 
     virtual void    Resize();
     virtual void    KeyInput( const KeyEvent& rKEvt );
-    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+    virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
 
     void            ClearAll();
     HeaderBar*      GetHeaderBar() const { return mpHeaderBar; }
@@ -1047,7 +1047,7 @@ void ViewTabListBox_Impl::DeleteEntries()
 
 // -----------------------------------------------------------------------
 sal_Bool ViewTabListBox_Impl::EditedEntry( SvLBoxEntry* pEntry,
-                                 const XubString& rNewText )
+                                 const rtl::OUString& rNewText )
 {
     sal_Bool bRet = sal_False;
 
@@ -1087,7 +1087,7 @@ sal_Bool ViewTabListBox_Impl::EditedEntry( SvLBoxEntry* pEntry,
         if ( canRename )
         {
             Any aValue;
-            aValue <<= OUString( rNewText );
+            aValue <<= rNewText;
             aContent.setPropertyValue( aPropName, aValue );
             mpParent->EntryRenamed( aURL, rNewText );
 
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 62628d7ccff5..31cbe4e4d9f3 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -104,7 +104,7 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, con
     return pEntry;
 }
 
-sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const XubString&, sal_Bool )
+sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const rtl::OUString&, sal_Bool )
 {
     return sal_True;
 }
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index ae7f599b75c1..074ce945d08c 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -698,7 +698,7 @@ sal_Bool SvTreeListBox::EditingEntry( SvLBoxEntry*, Selection& )
     return sal_True;
 }
 
-sal_Bool SvTreeListBox::EditedEntry( SvLBoxEntry* /*pEntry*/,const XubString& /*rNewText*/)
+sal_Bool SvTreeListBox::EditedEntry( SvLBoxEntry* /*pEntry*/,const rtl::OUString& /*rNewText*/)
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     return sal_True;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index f656a249cdb4..67dab976e10b 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -101,7 +101,7 @@ public:
     virtual void    RequestingChildren( SvLBoxEntry* pParent );
 
     virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& );
-    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
 
     DECL_LINK(OnSelectionChangeHdl, void *);
     DECL_LINK(OnExpandingHdl, void *);
@@ -997,22 +997,21 @@ bool TreeControlPeer::onEditingEntry( UnoTreeListEntry* pEntry )
     return true;
 }
 
-bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const XubString& rNewText )
+bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const rtl::OUString& rNewText )
 {
     if( mpTreeImpl && pEntry && pEntry->mxNode.is() ) try
     {
         LockGuard aLockGuard( mnEditLock );
-        const OUString aNewText( rNewText );
         if( maTreeEditListeners.getLength() > 0 )
         {
-            maTreeEditListeners.nodeEdited( pEntry->mxNode, aNewText );
+            maTreeEditListeners.nodeEdited( pEntry->mxNode, rNewText );
             return false;
         }
         else
         {
             Reference< XMutableTreeNode > xMutableNode( pEntry->mxNode, UNO_QUERY );
             if( xMutableNode.is() )
-                xMutableNode->setDisplayValue( Any( aNewText ) );
+                xMutableNode->setDisplayValue( Any( rNewText ) );
             else
                 return false;
         }
@@ -1597,7 +1596,7 @@ sal_Bool UnoTreeListBoxImpl::EditingEntry( SvLBoxEntry* pEntry, Selection& )
 
 // --------------------------------------------------------------------
 
-sal_Bool UnoTreeListBoxImpl::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText )
+sal_Bool UnoTreeListBoxImpl::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText )
 {
     return mxPeer.is() ? mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ) : false;
 }
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index c1987aa33db0..5d8b89b723fe 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -124,7 +124,7 @@ private:
     void disposeControl();
 
     bool onEditingEntry( UnoTreeListEntry* pEntry );
-    bool onEditedEntry( UnoTreeListEntry* pEntry, const XubString& rNewText );
+    bool onEditedEntry( UnoTreeListEntry* pEntry, const rtl::OUString& rNewText );
 
     void eraseTree( UnoTreeListBoxImpl& rTree );
     void fillTree( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >& xDataModel );
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 9734fac2e90c..8a54bd4149ed 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1224,7 +1224,7 @@ sal_Bool FmFilterNavigator::EditingEntry( SvLBoxEntry* pEntry, Selection& rSelec
 }
 
 //------------------------------------------------------------------------
-sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText )
+sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText )
 {
     DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!");
     m_pEditingCurrently = NULL;
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 53947c390000..9dd61e9ee169 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1508,7 +1508,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    sal_Bool NavigatorTree::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText )
+    sal_Bool NavigatorTree::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText )
     {
         RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::EditedEntry" );
         if (EditingCanceled())
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index e7af44f532c2..1cda0527ea0b 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -289,7 +289,7 @@ protected:
     virtual void InitEntry(SvLBoxEntry* pEntry, const XubString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind);
     virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
     virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& rSelection );
-    virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+    virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
 
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
     virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index fb2c0991d37b..7bbee532a59a 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -538,7 +538,7 @@ namespace svxform
         NavigatorTreeModel*    GetNavModel() const { return m_pNavModel; }
         SvLBoxEntry*        FindEntry( FmEntryData* pEntryData );
 
-        virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+        virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
         virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
         virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& );
         virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 1d5be794536c..b2af44fcc6fc 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -140,10 +140,10 @@ class SwViewOption
 protected:
     static sal_uInt16   nPixelTwips;// 1 Pixel == ? Twips
 
-    String          sSymbolFont;        // Symbolfont.
-    sal_uInt32          nCoreOptions;       // Bits for ViewShell.
-    sal_uInt32          nCore2Options;      // Bits for ViewShell.
-    sal_uInt32          nUIOptions;         // UI-Bits
+    rtl::OUString   sSymbolFont;        // Symbolfont.
+    sal_uInt32      nCoreOptions;       // Bits for ViewShell.
+    sal_uInt32      nCore2Options;      // Bits for ViewShell.
+    sal_uInt32      nUIOptions;         // UI-Bits
     Color           aRetoucheColor;     // DefaultBackground for BrowseView
     Size            aSnapSize;          // Describes horizontal and vertical snap.
     sal_uInt16          mnViewLayoutColumns;// # columns for edit view
@@ -481,8 +481,8 @@ public:
     void            SetZoomType     (SvxZoomType eZoom_){ eZoom = eZoom_;  }
     void            SetTblDest( sal_uInt8 nNew )    { nTblDest = nNew;  }
 
-    const String&   GetSymbolFont() const {return sSymbolFont;}
-    void            SetSymbolFont(const String& sSet) {sSymbolFont = sSet;}
+    const rtl::OUString& GetSymbolFont() const {return sSymbolFont;}
+    void            SetSymbolFont(const rtl::OUString& sSet) {sSymbolFont = sSet;}
 
     const Color&    GetRetoucheColor() const        { return aRetoucheColor;}
     void            SetRetoucheColor(const Color&r) { aRetoucheColor = r;   }