convert CUI module from String to OUString

Change-Id: I79bdab414d448a0d619b80857d7b31633c116f81

39 files changed, 241 insertions, 241 deletions

diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 10ce9b28b3fa..079f9f5c18a6 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -84,9 +84,9 @@ public:
     void            SetText( const OUString& rStr );
 
     bool            MarkNextError( bool bIgnoreCurrentError );
-    void            ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage);
+    void            ChangeMarkedWord(const OUString& rNewWord, LanguageType eLanguage);
     void            MoveErrorMarkTo(sal_uInt16 nErrorStart, sal_uInt16 nErrorEnd, bool bGrammar);
-    String          GetErrorText() const;
+    OUString        GetErrorText() const;
     void            RestoreCurrentError();
 
     void            SetAlternatives(
@@ -157,8 +157,8 @@ private:
     OUString        m_sIgnoreOnceST;
     OUString        m_sNoSuggestionsST;
 
-    String          m_sTitleSpelling;
-    String          m_sTitleSpellingGrammar;
+    OUString        m_sTitleSpelling;
+    OUString        m_sTitleSpellingGrammar;
 
     Link            aDialogUndoLink;
 
@@ -212,7 +212,7 @@ private:
 protected:
     virtual long    Notify( NotifyEvent& rNEvt );
 
-    String getReplacementString() const;
+    OUString getReplacementString() const;
 
 public:
     SpellDialog(
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index a23c50fcb48d..edd72453cd94 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -70,7 +70,7 @@ public:
                                     m_pAccelConfigPage( pAccelConfigPage )
                                 {}
 
-    void                        ReplaceEntry( sal_uInt16 nPos, const String &rStr );
+    void                        ReplaceEntry( sal_uInt16 nPos, const OUString &rStr );
 };
 
 // class SfxAcceleratorConfigPage ----------------------------------------
@@ -131,10 +131,10 @@ private:
     PushButton                      aLoadButton;
     PushButton                      aSaveButton;
     PushButton                      aResetButton;
-    String              aLoadAccelConfigStr;
-    String              aSaveAccelConfigStr;
-    String              aFilterAllStr;
-    String              aFilterCfgStr;
+    OUString                        aLoadAccelConfigStr;
+    OUString                        aSaveAccelConfigStr;
+    OUString                        aFilterAllStr;
+    OUString                        aFilterCfgStr;
     SfxStylesInfo_Impl              m_aStylesInfo;
     sal_Bool                        m_bStylesInfoInitialized;
 
@@ -163,13 +163,13 @@ private:
     OUString                    GetLabel4Command(const OUString& rCommand);
     void                        InitAccCfg();
     sal_uInt16                  MapKeyCodeToPos( const KeyCode &rCode ) const;
-    css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName);
-    void                        StartFileDialog( WinBits nBits, const String& rTitle );
+    css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const OUString& sName);
+    void                        StartFileDialog( WinBits nBits, const OUString& rTitle );
 
     void                        Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
     void                        ResetConfig();
 
-    void                        CreateCustomItems( SvTreeListEntry* pEntry, const String& aCol1, const String& aCol2 );
+    void                        CreateCustomItems( SvTreeListEntry* pEntry, const OUString& aCol1, const OUString& aCol2 );
 
 public:
                                 SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
@@ -192,8 +192,8 @@ public:
     SfxAcceleratorConfigListBox( Window *pParent, ResId &rResId ) :
         ListBox( pParent, rResId ) {}
 
-    void ReplaceEntry( sal_uInt16 nPos, const String &rStr );
-    void ExpandEntry ( sal_uInt16 nPos, const String &rStr );
+    void ReplaceEntry( sal_uInt16 nPos, const OUString &rStr );
+    void ExpandEntry ( sal_uInt16 nPos, const OUString &rStr );
 };
 
 class SvxShortcutAssignDlg : public SfxNoLayoutSingleTabDialog
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 6e4454bcbd21..e30eaa086f43 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -128,31 +128,31 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
     OfaACorrCheckListBox*   m_pCheckLB;
     PushButton*     m_pEditPB;
 
-    String          sDeleteEmptyPara;
-    String          sUseReplaceTbl;
-    String          sCptlSttWord;
-    String          sCptlSttSent;
-    String          sUserStyle;
-    String          sBullet;
-    String          sByInputBullet;
-    String          sBoldUnder;
-    String          sNoDblSpaces;
-    String          sCorrectCapsLock;
-    String          sDetectURL;
-    String          sDash;
-    String          sNonBrkSpace;
-    String          sOrdinal;
-    String          sRightMargin;
-    String          sNum;
-    String          sBorder;
-    String          sTable;
-    String          sReplaceTemplates;
-    String          sDelSpaceAtSttEnd;
-    String          sDelSpaceBetweenLines;
-
-    String          sMargin;
-    String          sBulletChar;
-    String          sByInputBulletChar;
+    OUString        sDeleteEmptyPara;
+    OUString        sUseReplaceTbl;
+    OUString        sCptlSttWord;
+    OUString        sCptlSttSent;
+    OUString        sUserStyle;
+    OUString        sBullet;
+    OUString        sByInputBullet;
+    OUString        sBoldUnder;
+    OUString        sNoDblSpaces;
+    OUString        sCorrectCapsLock;
+    OUString        sDetectURL;
+    OUString        sDash;
+    OUString        sNonBrkSpace;
+    OUString        sOrdinal;
+    OUString        sRightMargin;
+    OUString        sNum;
+    OUString        sBorder;
+    OUString        sTable;
+    OUString        sReplaceTemplates;
+    OUString        sDelSpaceAtSttEnd;
+    OUString        sDelSpaceBetweenLines;
+
+    OUString        sMargin;
+    OUString        sBulletChar;
+    OUString        sByInputBulletChar;
 
     Font            aBulletFont;
     Font            aByInputBulletFont;
@@ -162,7 +162,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 
         DECL_LINK(SelectHdl, OfaACorrCheckListBox*);
         DECL_LINK(EditHdl, void *);
-        SvTreeListEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
+        SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
 
 
         OfaSwAutoFmtOptionsPage( Window* pParent,
@@ -204,8 +204,8 @@ class AutoCorrEdit : public Edit
 
 struct DoubleString
 {
-    String  sShort;
-    String  sLong;
+    OUString  sShort;
+    OUString  sLong;
     void*   pUserData; ///< CheckBox -> form. Text Bool -> selection text
 };
 
@@ -271,8 +271,8 @@ public:
     virtual void        Resize();
 
     void    SetLanguage(LanguageType eSet);
-    void    DeleteEntry(String sShort, String sLong);
-    void    NewEntry(String sShort, String sLong, bool bKeepSourceFormatting);
+    void    DeleteEntry(OUString sShort, OUString sLong);
+    void    NewEntry(OUString sShort, OUString sLong, bool bKeepSourceFormatting);
 };
 
 // class OfaAutocorrExceptPage ---------------------------------------------
@@ -343,8 +343,8 @@ private:
     /// Just for writer
     OfaACorrCheckListBox*   m_pSwCheckLB;
 
-    String          sNonBrkSpace;
-    String          sOrdinal;
+    OUString        sNonBrkSpace;
+    OUString        sOrdinal;
 
     SvLBoxButtonData*   pCheckButtonData;
 
@@ -377,9 +377,9 @@ private:
     DECL_LINK( QuoteHdl, PushButton* );
     DECL_LINK( StdQuoteHdl, PushButton* );
 
-    String              ChangeStringExt_Impl( sal_UCS4 );
+    OUString            ChangeStringExt_Impl( sal_UCS4 );
 
-    SvTreeListEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
+    SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
 
                         OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet );
 public:
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index cece693bf2bb..be0e8d3451b5 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -129,8 +129,8 @@ private:
     sal_Bool        bColTransparency    : 1;
     sal_Bool        bGraphTransparency  : 1;
     Graphic     aBgdGraphic;
-    String      aBgdGraphicPath;
-    String      aBgdGraphicFilter;
+    OUString    aBgdGraphicPath;
+    OUString    aBgdGraphicFilter;
 
     SvxBackgroundPage_Impl* pPageImpl;
     SvxOpenGraphicDialog* pImportDlg;
@@ -150,7 +150,7 @@ private:
     void                SetGraphicPosition_Impl( SvxGraphicPosition ePos );
     SvxGraphicPosition  GetGraphicPosition_Impl();
     void                FillControls_Impl(const SvxBrushItem& rBgdAttr,
-                                            const String& rUserData);
+                                            const OUString& rUserData);
     sal_Bool                FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot);
     void                ResetFromWallpaperItem( const SfxItemSet& rSet );
 
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 62686df592d4..9b317e651c76 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -256,17 +256,17 @@ public:
     ~SvxConfigEntry();
 
     const OUString&      GetCommand() const { return aCommand; }
-    void    SetCommand( const String& rCmd ) { aCommand = rCmd; }
+    void    SetCommand( const OUString& rCmd ) { aCommand = rCmd; }
 
     const OUString&      GetName() const { return aLabel; }
-    void    SetName( const String& rStr ) { aLabel = rStr; bStrEdited = sal_True; }
+    void    SetName( const OUString& rStr ) { aLabel = rStr; bStrEdited = sal_True; }
     bool    HasChangedName() const { return bStrEdited; }
 
     const OUString&      GetHelpText() ;
-    void    SetHelpText( const String& rStr ) { aHelpText = rStr; }
+    void    SetHelpText( const OUString& rStr ) { aHelpText = rStr; }
 
     const OUString&      GetHelpURL() const { return aHelpURL; }
-    void    SetHelpURL( const String& rStr ) { aHelpURL = rStr; }
+    void    SetHelpURL( const OUString& rStr ) { aHelpURL = rStr; }
 
     void    SetPopup( bool bOn = sal_True ) { bPopUp = bOn; }
     bool    IsPopup() const { return bPopUp; }
@@ -349,8 +349,8 @@ public:
     SvxDescriptionEdit( Window* pParent, const ResId& _rId );
     inline ~SvxDescriptionEdit() {}
 
-    void                SetNewText( const String& _rText );
-    inline void         Clear() { SetNewText( String() ); }
+    void                SetNewText( const OUString& _rText );
+    inline void         Clear() { SetNewText( OUString() ); }
 };
 
 class SvxConfigPage : public SfxTabPage
@@ -361,7 +361,7 @@ private:
     SaveInData*                         pCurrentSaveInData;
 
     DECL_LINK(  SelectSaveInLocation, ListBox * );
-    DECL_LINK(  AsyncInfoMsg, String* );
+    DECL_LINK(  AsyncInfoMsg, OUString* );
 
     bool        SwapEntryData( SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry );
     void        AlignControls();
@@ -425,7 +425,7 @@ protected:
                                         SvTreeListEntry* pTarget = NULL,
                                         bool bFront = sal_False );
 
-    void            AddSubMenusToUI(    const String& rBaseTitle,
+    void            AddSubMenusToUI(    const OUString& rBaseTitle,
                                         SvxConfigEntry* pParentData );
 
     SvTreeListEntry*    InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData,
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index c7a29c38ee23..2821bf84bd58 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -85,9 +85,9 @@ struct SfxGroupInfo_Impl
     sal_uInt16  nKind;
     sal_uInt16  nUniqueID;
     void*       pObject;
-    sal_Bool        bWasOpened;
-    String      sCommand;
-    String      sLabel;
+    sal_Bool    bWasOpened;
+    OUString    sCommand;
+    OUString    sLabel;
 
                 SfxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, void* pObj = 0 ) :
                     nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(sal_False) {}
@@ -116,10 +116,10 @@ public:
 
     void          ClearAll();
     using Window::GetHelpText;
-    String        GetHelpText( SvTreeListEntry *pEntry );
-    String        GetCurCommand();
-    String        GetCurLabel();
-    String        GetSelectedScriptURI();
+    OUString      GetHelpText( SvTreeListEntry *pEntry );
+    OUString      GetCurCommand();
+    OUString      GetCurLabel();
+    OUString      GetSelectedScriptURI();
     void          FunctionSelected();
     void          SetStylesInfo(SfxStylesInfo_Impl* pStyles);
 };
@@ -179,7 +179,7 @@ public:
     void                Open( SvTreeListEntry*, sal_Bool );
     void                GroupSelected();
     void                SelectMacro( const SfxMacroInfoItem* );
-    void                SelectMacro( const String&, const String& );
+    void                SelectMacro( const OUString&, const OUString& );
     void                SetStylesInfo(SfxStylesInfo_Impl* pStyles);
 };
 
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 422ffdff4dfd..7897aaf0dac2 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -206,9 +206,9 @@ private:
     FixedText*          m_pPositionFT;
     ListBox*            m_pPositionLB;
 
-    sal_uInt16              m_nHtmlMode;
+    sal_uInt16          m_nHtmlMode;
 
-    String              m_aTransparentColorName;
+    OUString            m_aTransparentColorName;
 
                         SvxCharEffectsPage( Window* pParent, const SfxItemSet& rSet );
                         ~SvxCharEffectsPage();
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 410e6aa582ff..041640742559 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -108,7 +108,7 @@ public:
     void            SetChar( sal_UCS4 );
     sal_UCS4        GetChar() const;
 
-    String          GetCharacters() const;
+    OUString        GetCharacters() const;
 
     virtual short   Execute();
 };
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index a04f5ed860d8..c663309d45e6 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -80,8 +80,8 @@ class FmSearchDialog : public ModalDialog
     PushButton      m_pbSearchAgain;
     CancelButton    m_pbClose;
     HelpButton      m_pbHelp;
-    String          m_sSearch;
-    String          m_sCancel;
+    OUString        m_sSearch;
+    OUString        m_sCancel;
 
     Window*         m_pPreSearchFocus;
 
@@ -91,7 +91,7 @@ class FmSearchDialog : public ModalDialog
     Link    m_lnkContextSupplier;       ///< for search in contexts
 
     /// memorize the currently selected field for every context
-    ::std::vector<String> m_arrContextFields;
+    ::std::vector<OUString> m_arrContextFields;
 
     FmSearchEngine* m_pSearchEngine;
 
@@ -135,7 +135,7 @@ public:
     */
     void SetCanceledNotFoundHdl(const Link& lnk) { m_lnkCanceledNotFoundHdl = lnk; }
 
-    inline void SetActiveField(const String& strField);
+    inline void SetActiveField(const OUString& strField);
 
 protected:
     virtual sal_Bool Close();
@@ -186,7 +186,7 @@ private:
     void initCommon( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _rxCursor );
 };
 
-inline void FmSearchDialog::SetActiveField(const String& strField)
+inline void FmSearchDialog::SetActiveField(const OUString& strField)
 {
     sal_uInt16 nInitialField = m_lbField.GetEntryPos(strField);
     if (nInitialField == COMBOBOX_ENTRY_NOTFOUND)
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 1591dab5eec7..b10034d3c1e9 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -64,7 +64,7 @@ private:
     INetURLObject               maStartURL;
 
     void                        ImplSearch( const INetURLObject& rStartURL,
-                                            const ::std::vector< String >& rFormats,
+                                            const ::std::vector< OUString >& rFormats,
                                             sal_Bool bRecursive );
 
     virtual                     ~SearchThread();
@@ -101,7 +101,7 @@ public:
 
     virtual short       Execute();
     virtual void        StartExecuteModal( const Link& rEndDialogHdl );
-    void                SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); }
+    void                SetFileType( const OUString& rType ) { aFtSearchType.SetText( rType ); }
     void                SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); }
 };
 
@@ -185,8 +185,8 @@ private:
 
 public:
 
-                        TitleDialog( Window* pParent, const String& rOldText );
-    String              GetTitle() const { return maEdit.GetText(); }
+                        TitleDialog( Window* pParent, const OUString& rOldText );
+    OUString            GetTitle() const { return maEdit.GetText(); }
 };
 
 class GalleryIdDialog : public ModalDialog
@@ -276,8 +276,8 @@ class TPGalleryThemeProperties : public SfxTabPage
     StringList              aFoundList;
     FilterEntryList_impl    aFilterEntryList;
     Timer                   aPreviewTimer;
-    String                  aLastFilterName;
-    String                  aPreviewString;
+    OUString                aLastFilterName;
+    OUString                aPreviewString;
     INetURLObject           aURL;
     sal_uInt16              nCurFilterPos;
     sal_uInt16              nFirstExtFilterPos;
@@ -318,7 +318,7 @@ public:
     void                SetXChgData( ExchangeData* pData );
     const ExchangeData* GetXChgData() const { return pData; }
 
-    void                StartSearchFiles( const String& _rFolderURL, short _nDlgResult );
+    void                StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult );
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
 };
diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx
index cf8ec1946ead..bfd961edead5 100644
--- a/cui/source/inc/cuiimapwnd.hxx
+++ b/cui/source/inc/cuiimapwnd.hxx
@@ -42,15 +42,15 @@ class URLDlg : public ModalDialog
 public:
 
                         URLDlg( Window* pWindow,
-                                const String& rURL, const String& rAlternativeText, const String& rDescription,
-                                const String& rTarget, const String& rName,
+                                const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription,
+                                const OUString& rTarget, const OUString& rName,
                                 TargetList& rTargetList );
 
-    String              GetURL() const { return m_pEdtURL->GetText(); }
-    String              GetAltText() const { return m_pEdtAlternativeText->GetText(); }
-    String              GetDesc() const { return m_pEdtDescription->GetText(); }
-    String              GetTarget() const { return m_pCbbTargets->GetText(); }
-    String              GetName() const { return m_pEdtName->GetText(); }
+    OUString            GetURL() const { return m_pEdtURL->GetText(); }
+    OUString            GetAltText() const { return m_pEdtAlternativeText->GetText(); }
+    OUString            GetDesc() const { return m_pEdtDescription->GetText(); }
+    OUString            GetTarget() const { return m_pCbbTargets->GetText(); }
+    OUString            GetName() const { return m_pEdtName->GetText(); }
 };
 
 #endif
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index d89560dfaef3..4a52ba07b957 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -66,7 +66,7 @@ namespace svx
 
         DECL_LINK( HeaderSelect_Impl, HeaderBar * );
         DECL_LINK( HeaderEndDrag_Impl, HeaderBar * );
-        DECL_LINK( NameValidator, String*);
+        DECL_LINK( NameValidator, OUString*);
 
 
         /** inserts a new entry in the tablistbox
@@ -85,7 +85,7 @@ namespace svx
             @param  _pEntry
                 The entry to remove if the entry will be changed
         */
-        void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvTreeListEntry* _pEntry = NULL);
+        void openLinkDialog(const OUString& _sOldName,const OUString& _sOldLocation,SvTreeListEntry* _pEntry = NULL);
 
 #endif
 
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 21233707e261..caf6e6605c24 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -39,7 +39,7 @@ private:
     DECL_LINK(ModifyHdl, void *);
 
 public:
-    SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc );
+    SvxNameDialog( Window* pWindow, const OUString& rName, const OUString& rDesc );
 
     void    GetName( OUString& rName ){rName = pEdtName->GetText();}
 
@@ -87,7 +87,7 @@ private:
 
 public:
     // constructor
-    SvxObjectNameDialog(Window* pWindow, const String& rName);
+    SvxObjectNameDialog(Window* pWindow, const OUString& rName);
 
     // data access
     void GetName(OUString& rName) {rName = pEdtName->GetText(); }
@@ -117,7 +117,7 @@ private:
 
 public:
     // constructor
-    SvxObjectTitleDescDialog(Window* pWindow, const String& rTitle, const String& rDesc);
+    SvxObjectTitleDescDialog(Window* pWindow, const OUString& rTitle, const OUString& rDesc);
 
     // data access
     void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); }
@@ -138,10 +138,10 @@ private:
     DECL_LINK(Button2Hdl, void *);
 
 public:
-    SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg = NULL );
+    SvxMessDialog( Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL );
     ~SvxMessDialog();
 
-    void    SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt );
+    void    SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt );
 };
 
 
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index b1e9578c1aa5..625bcb342d69 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -86,7 +86,7 @@ class SvxGrfCropPage : public SfxTabPage
 
 
     Timer           aTimer;
-    String          aGraphicName;
+    OUString        aGraphicName;
     Size            aOrigSize;
     Size            aOrigPixelSize;
     Size            aPageSize;
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index e7c3913c2566..9c1382b35d59 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -153,9 +153,9 @@ namespace svx
         void    SetConversionFormatChangedHdl( const Link& _rHdl );
         void    SetFindHdl( const Link& _rHdl );
 
-        String  GetCurrentString( ) const;
+        OUString  GetCurrentString( ) const;
         void    SetCurrentString(
-                    const String& _rNewString,
+                    const OUString& _rNewString,
                     const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions,
                     bool _bOriginatesFromDocument = true
                 );
@@ -163,7 +163,7 @@ namespace svx
         void    FocusSuggestion( );
 
         /// retrieves the current suggestion
-        String  GetCurrentSuggestion( ) const;
+        OUString  GetCurrentSuggestion( ) const;
 
         void        SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType );
         editeng::HangulHanjaConversion::ConversionFormat    GetConversionFormat( ) const;
@@ -231,7 +231,7 @@ namespace svx
                             HangulHanjaOptionsDialog( Window* _pParent );
         virtual             ~HangulHanjaOptionsDialog();
 
-        void                AddDict( const String& _rName, bool _bChecked );
+        void                AddDict( const OUString& _rName, bool _bChecked );
     };
 
 
@@ -281,11 +281,11 @@ namespace svx
     class HangulHanjaEditDictDialog : public ModalDialog
     {
     private:
-        const String    m_aEditHintText;
+        const OUString  m_aEditHintText;
         HHDictList&     m_rDictList;
         sal_uInt32      m_nCurrentDict;
 
-        String          m_aOriginal;
+        OUString        m_aOriginal;
         SuggestionList* m_pSuggestions;
 
         FixedText       m_aBookFT;
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index 67ad2c1f48e4..c5392c798a78 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -39,7 +39,7 @@ private:
     FixedText           maFtDocTypes;
     ListBox             maLbDocTypes;
 
-    sal_Bool            ImplGetURLObject( const String& rPath, const String& rBase, INetURLObject& aURLObject ) const;
+    sal_Bool            ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const;
     void                FillDocumentList ();
 
     DECL_LINK (ClickNewHdl_Impl          , void * );
@@ -48,8 +48,8 @@ private:
 
 protected:
     void FillDlgFields(const OUString& rStrURL);
-    void GetCurentItemData ( OUString& rStrURL, String& aStrName,
-                             String& aStrIntName, String& aStrFrame,
+    void GetCurentItemData ( OUString& rStrURL, OUString& aStrName,
+                             OUString& aStrIntName, OUString& aStrFrame,
                              SvxLinkInsertMode& eMode );
 
 public:
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index b263bc5a3068..572f6ebabd69 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -63,12 +63,12 @@ private:
 
 protected:
     void FillDlgFields(const OUString& rStrURL);
-    void GetCurentItemData ( OUString& rStrURL, String& aStrName,
-                             String& aStrIntName, String& aStrFrame,
+    void GetCurentItemData ( OUString& rStrURL, OUString& aStrName,
+                             OUString& aStrIntName, OUString& aStrFrame,
                              SvxLinkInsertMode& eMode );
     virtual sal_Bool   ShouldOpenMarkWnd () {return mbMarkWndOpen;}
     virtual void   SetMarkWndShouldOpen (sal_Bool bOpen) {mbMarkWndOpen=bOpen;}
-    String GetCurrentURL    ();
+    OUString GetCurrentURL    ();
 
 public:
     SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet);
@@ -76,7 +76,7 @@ public:
 
     static  IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
 
-    virtual void        SetMarkStr ( const String& aStrMark );
+    virtual void        SetMarkStr ( const OUString& aStrMark );
 
     virtual void        SetInitFocus();
 };
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index ee3c8aa1ce0d..4e6b8673f702 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -45,8 +45,8 @@ private:
     Edit                maEdPassword;
     CheckBox            maCbAnonymous;
 
-    String              maStrOldUser;
-    String              maStrOldPassword;
+    OUString            maStrOldUser;
+    OUString            maStrOldPassword;
 
     sal_Bool                mbMarkWndOpen;
 
@@ -63,19 +63,19 @@ private:
 
     void    SetScheme(const OUString& rScheme);
     void    RemoveImproperProtocol(const OUString& rProperScheme);
-    String  GetSchemeFromButtons() const;
+    OUString  GetSchemeFromButtons() const;
     INetProtocol GetSmartProtocolFromButtons() const;
 
     OUString CreateAbsoluteURL() const;
 
     void   setAnonymousFTPUser();
-    void   setFTPUser(const String& rUser, const String& rPassword);
+    void   setFTPUser(const OUString& rUser, const OUString& rPassword);
     void   RefreshMarkWindow();
 
 protected:
     virtual void FillDlgFields(const OUString& rStrURL);
-    virtual void GetCurentItemData ( OUString& rStrURL, String& aStrName,
-                                     String& aStrIntName, String& aStrFrame,
+    virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName,
+                                     OUString& aStrIntName, OUString& aStrFrame,
                                      SvxLinkInsertMode& eMode );
     virtual sal_Bool ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );}
     virtual void SetMarkWndShouldOpen (sal_Bool bOpen) {mbMarkWndOpen=bOpen;}
@@ -86,7 +86,7 @@ public:
 
     static  IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
 
-    virtual void        SetMarkStr ( const String& aStrMark );
+    virtual void        SetMarkStr ( const OUString& aStrMark );
     virtual void        SetOnlineMode( sal_Bool bEnable );
 
     virtual void        SetInitFocus();
diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx
index d76799ecc3ad..da69d56aa5cf 100644
--- a/cui/source/inc/hlmailtp.hxx
+++ b/cui/source/inc/hlmailtp.hxx
@@ -44,16 +44,16 @@ private:
     DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified
 
     void    SetScheme(const OUString& rScheme);
-    void    RemoveImproperProtocol(const String& aProperScheme);
-    String  GetSchemeFromButtons() const;
+    void    RemoveImproperProtocol(const OUString& aProperScheme);
+    OUString  GetSchemeFromButtons() const;
     INetProtocol GetSmartProtocolFromButtons() const;
 
-    String  CreateAbsoluteURL() const;
+    OUString  CreateAbsoluteURL() const;
 
 protected:
     virtual void FillDlgFields(const OUString& rStrURL);
-    virtual void GetCurentItemData ( OUString& rStrURL, String& aStrName,
-                                     String& aStrIntName, String& aStrFrame,
+    virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName,
+                                     OUString& aStrIntName, OUString& aStrFrame,
                                      SvxLinkInsertMode& eMode );
 
 public:
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index a4b37c9a13ac..26eb00b844d8 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -96,7 +96,7 @@ protected:
 
     sal_Bool                mbStdControlsInit;
 
-    String              maStrInitURL;
+    OUString            maStrInitURL;
 
     Timer               maTimer;
 
@@ -105,18 +105,18 @@ protected:
     void InitStdControls ();
     virtual void FillStandardDlgFields ( SvxHyperlinkItem* pHyperlinkItem );
     virtual void FillDlgFields(const OUString& rStrURL) = 0;
-    virtual void GetCurentItemData     ( OUString& rStrURL, String& aStrName,
-                                         String& aStrIntName, String& aStrFrame,
+    virtual void GetCurentItemData     ( OUString& rStrURL, OUString& aStrName,
+                                         OUString& aStrIntName, OUString& aStrFrame,
                                          SvxLinkInsertMode& eMode ) = 0;
-    virtual String CreateUiNameFromURL( const String& aStrURL );
+    virtual OUString CreateUiNameFromURL( const OUString& aStrURL );
 
-    void         GetDataFromCommonFields( String& aStrName,
-                                          String& aStrIntName, String& aStrFrame,
+    void         GetDataFromCommonFields( OUString& aStrName,
+                                          OUString& aStrIntName, OUString& aStrFrame,
                                           SvxLinkInsertMode& eMode );
 
     DECL_LINK (ClickScriptHdl_Impl, void * ); ///< Button : Script
 
-    String              aEmptyStr;
+    OUString            aEmptyStr;
 
     static OUString GetSchemeFromURL( const OUString& rStrURL );
 
@@ -140,7 +140,7 @@ public:
     virtual void DoApply ();
     virtual void SetOnlineMode( sal_Bool bEnable );
     virtual void SetInitFocus();
-    virtual void SetMarkStr ( const String& aStrMark );
+    virtual void SetMarkStr ( const OUString& aStrMark );
     virtual void Reset( const SfxItemSet& );
     virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void ActivatePage( const SfxItemSet& rItemSet );
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index c1924d7c0b77..744fa73c0a63 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -50,12 +50,12 @@ class SvxHyphenWordDialog : public SfxModalDialog
     PushButton*         m_pDelBtn;
     PushButton*         m_pHyphAll;
     CloseButton*        m_pCloseBtn;
-    String              aLabel;
+    OUString            aLabel;
     SvxSpellWrapper*    pHyphWrapper;
     css::uno::Reference< css::linguistic2::XHyphenator >        xHyphenator;
     css::uno::Reference< css::linguistic2::XPossibleHyphens >   xPossHyph;
-    String              aEditWord;      // aEditWord and aWordEdit.GetText() differ only by the character for the current selected hyphenation position
-    String              aActWord;           // actual word to be hyphenated
+    OUString            aEditWord;      // aEditWord and aWordEdit.GetText() differ only by the character for the current selected hyphenation position
+    OUString            aActWord;           // actual word to be hyphenated
     LanguageType        nActLanguage;       // and its language
     sal_uInt16          nMaxHyphenationPos; // right most valid hyphenation pos
     sal_uInt16          nHyphPos;
@@ -65,7 +65,7 @@ class SvxHyphenWordDialog : public SfxModalDialog
 
 
     void            EnableLRBtn_Impl();
-    String          EraseUnusableHyphens_Impl( css::uno::Reference< css::linguistic2::XPossibleHyphens >  &rxPossHyph, sal_uInt16 nMaxHyphenationPos );
+    OUString        EraseUnusableHyphens_Impl( css::uno::Reference< css::linguistic2::XPossibleHyphens >  &rxPossHyph, sal_uInt16 nMaxHyphenationPos );
 
     void            InitControls_Impl();
     void            ContinueHyph_Impl( sal_uInt16 nInsPos = 0 );
@@ -81,7 +81,7 @@ class SvxHyphenWordDialog : public SfxModalDialog
     DECL_LINK(GetFocusHdl_Impl, void *);
 
 public:
-    SvxHyphenWordDialog( const String &rWord, LanguageType nLang,
+    SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang,
                          Window* pParent,
                          css::uno::Reference< css::linguistic2::XHyphenator >  &xHyphen,
                          SvxSpellWrapper* pWrapper );
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 84dee6977a6a..ffe2b85ca3f6 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -74,7 +74,7 @@ class IconChoicePage : public TabPage
 
 private :
     const SfxItemSet*   pSet;
-    String              aUserString;
+    OUString            aUserString;
     sal_Bool                bHasExchangeSupport;
     IconChoiceDialog*   pDialog;
 
@@ -113,8 +113,8 @@ public :
 
     virtual void        ActivatePage( const SfxItemSet& );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
-    void                SetUserData(const String& rString)  { aUserString = rString; }
-    String              GetUserData() { return aUserString; }
+    void                SetUserData(const OUString& rString)  { aUserString = rString; }
+    OUString            GetUserData() { return aUserString; }
     virtual void        FillUserData();
     virtual sal_Bool        IsReadOnly() const;
     virtual sal_Bool    QueryClose();
@@ -197,7 +197,7 @@ public :
 
     // interface
     SvxIconChoiceCtrlEntry* AddTabPage(
-        sal_uInt16 nId, const String& rIconText, const Image& rChoiceIcon,
+        sal_uInt16 nId, const OUString& rIconText, const Image& rChoiceIcon,
         CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
         sal_Bool bItemsOnDemand = sal_False, sal_uLong nPos = LIST_APPEND );
 
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 8b35b8ef416e..d87a303acce8 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -50,8 +50,8 @@ private:
 
     Image*          mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT];
 
-    String          aStrHorzList;
-    String          aStrVertList;
+    OUString        aStrHorzList;
+    OUString        aStrVertList;
 
     short           nCaptionType;
     sal_Bool            bFixedAngle;
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index e5d928d7c253..78bdeb09e69d 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -61,14 +61,14 @@ class SvBaseLinksDlg : public ModalDialog
     PushButton aPbOpenSource;
     PushButton aPbChangeSource;
     PushButton aPbBreakLink;
-    String aStrAutolink;
-    String aStrManuallink;
-    String aStrBrokenlink;
-    String aStrGraphiclink;
-    String aStrButtonclose;
-    String aStrCloselinkmsg;
-    String aStrCloselinkmsgMulti;
-    String aStrWaitinglink;
+    OUString aStrAutolink;
+    OUString aStrManuallink;
+    OUString aStrBrokenlink;
+    OUString aStrGraphiclink;
+    OUString aStrButtonclose;
+    OUString aStrCloselinkmsg;
+    OUString aStrCloselinkmsgMulti;
+    OUString aStrWaitinglink;
     sfx2::LinkManager*  pLinkMgr;
     sal_Bool            bHtmlMode;
     Timer aUpdateTimer;
@@ -84,7 +84,7 @@ class SvBaseLinksDlg : public ModalDialog
     DECL_LINK( UpdateWaitingHdl, Timer * );
     DECL_LINK( EndEditHdl, sfx2::SvBaseLink* );
     sfx2::SvBaseLink* GetSelEntry( sal_uInt16* pPos );
-    String ImplGetStateStr( const sfx2::SvBaseLink& );
+    OUString ImplGetStateStr( const sfx2::SvBaseLink& );
     void SetType( sfx2::SvBaseLink& rLink, sal_uInt16 nPos, sal_uInt16 nType );
     void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uInt16 nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False);
 
@@ -101,14 +101,14 @@ class SvBaseLinksDlg : public ModalDialog
     PushButton&     ChangeSource()  { return aPbChangeSource; }
     PushButton&     BreakLink()     { return aPbBreakLink; }
 
-    String&         Autolink()      { return aStrAutolink; }
-    String&         Manuallink()    { return aStrManuallink; }
-    String&         Brokenlink()    { return aStrBrokenlink; }
-    String&         Graphiclink()   { return aStrGraphiclink; }
-    String&         Buttonclose()   { return aStrButtonclose; }
-    String&         Closelinkmsg()  { return aStrCloselinkmsg; }
-    String&         CloselinkmsgMulti() { return aStrCloselinkmsgMulti; }
-    String&         Waitinglink()   { return aStrWaitinglink; }
+    OUString&       Autolink()      { return aStrAutolink; }
+    OUString&       Manuallink()    { return aStrManuallink; }
+    OUString&       Brokenlink()    { return aStrBrokenlink; }
+    OUString&       Graphiclink()   { return aStrGraphiclink; }
+    OUString&       Buttonclose()   { return aStrButtonclose; }
+    OUString&       Closelinkmsg()  { return aStrCloselinkmsg; }
+    OUString&       CloselinkmsgMulti() { return aStrCloselinkmsgMulti; }
+    OUString&       Waitinglink()   { return aStrWaitinglink; }
     void SetManager( sfx2::LinkManager* );
 
 public:
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index a5a311276892..31ce0aa5c19c 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -58,7 +58,7 @@ public:
 
     virtual                     ~_SfxMacroTabPage();
 
-    void                        AddEvent( const String & rEventName, sal_uInt16 nEventId );
+    void                        AddEvent( const OUString & rEventName, sal_uInt16 nEventId );
 
     const SvxMacroTableDtor&    GetMacroTbl() const;
     void                        SetMacroTbl( const SvxMacroTableDtor& rTbl );
diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx
index 4e65a918801c..f67852158e31 100644
--- a/cui/source/inc/multifil.hxx
+++ b/cui/source/inc/multifil.hxx
@@ -31,7 +31,7 @@ class SvxMultiFileDialog : public SvxMultiPathDialog
 {
 private:
     // #97807# -------------------------------------
-    std::map< String, ::ucbhelper::Content >   aFileContentMap;
+    std::map< OUString, ::ucbhelper::Content >   aFileContentMap;
 
     DECL_LINK( AddHdl_Impl, PushButton * );
     DECL_LINK(DelHdl_Impl, void *);
@@ -40,8 +40,8 @@ public:
     SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
     ~SvxMultiFileDialog();
 
-    String  GetFiles() const { return SvxMultiPathDialog::GetPath(); }
-    void    SetFiles( const String& rPath ) { SvxMultiPathDialog::SetPath(rPath); aDelBtn.Enable(); }
+    OUString  GetFiles() const { return SvxMultiPathDialog::GetPath(); }
+    void      SetFiles( const OUString& rPath ) { SvxMultiPathDialog::SetPath(rPath); aDelBtn.Enable(); }
 };
 
 
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index d5dead1e26b7..31cc4479f309 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -67,8 +67,8 @@ public:
     SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
     ~SvxMultiPathDialog();
 
-    String          GetPath() const;
-    void            SetPath( const String& rPath );
+    OUString        GetPath() const;
+    void            SetPath( const OUString& rPath );
     void            SetClassPathMode();
     sal_Bool        IsClassPathMode() const;
     void            EnableRadioButtonMode();
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 57dd1d72f150..3795fedd65ef 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -44,7 +44,7 @@ class vector;
 class SvxNumberPreview : public Window
 {
 private:
-    String          aPrevStr;
+    OUString        aPrevStr;
     Color           aPrevCol;
     sal_Int32       mnPos;
     sal_Unicode     mnChar;
@@ -58,7 +58,7 @@ protected:
 public:
     SvxNumberPreview(Window* pParent, WinBits nStyle = WB_BORDER);
 
-    void            NotifyChange( const String& rPrevStr, const Color* pColor = NULL );
+    void            NotifyChange( const OUString& rPrevStr, const Color* pColor = NULL );
 };
 
 // -----------------------------------------------------------------------
@@ -126,7 +126,7 @@ private:
     sal_Bool                bOneAreaFlag;
     short                   nFixedCategory;
 
-    String sAutomaticEntry;
+    OUString sAutomaticEntry;
 
     Window*                 pLastActivWindow;
 
@@ -138,8 +138,8 @@ private:
     void    Obstructing();
     void    EnableBySourceFormat_Impl();
     void    SetCategory( sal_uInt16 nPos );
-    String  GetExpColorString( Color*& rpPreviewColor, const String& aFormatStr, short nTmpCatPos );
-    void    MakePreviewText( const String& rFormat );
+    OUString  GetExpColorString( Color*& rpPreviewColor, const OUString& aFormatStr, short nTmpCatPos );
+    void    MakePreviewText( const OUString& rFormat );
     void    ChangePreviewText( sal_uInt16 nPos );
     void    AddAutomaticLanguage_Impl(LanguageType eAutoLang, sal_Bool bSelect);
     // Handler
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index b9cbbbf27922..5ceb746411f1 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -43,7 +43,7 @@ class SvxNumberingPreview : public Window
     const SvxNumRule*   pActNum;
     Font                aStdFont;
     long                nPageWidth;
-    const String*       pOutlineNames;
+    const OUString*     pOutlineNames;
     sal_Bool                bPosition;
     sal_uInt16              nActLevel;
 
@@ -57,7 +57,7 @@ class SvxNumberingPreview : public Window
                     {pActNum = pNum; Invalidate();};
         void    SetPageWidth(long nPgWidth)
                                 {nPageWidth = nPgWidth;}
-        void    SetOutlineNames(const String* pNames)
+        void    SetOutlineNames(const OUString* pNames)
                         {pOutlineNames = pNames;}
         void    SetPositionMode()
                         { bPosition = sal_True;}
@@ -98,7 +98,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
     sal_Bool                    bModified   : 1;
     sal_Bool                    bPreset     : 1;
 
-    String              sNumCharFmtName;
+    OUString              sNumCharFmtName;
     sal_uInt16              nNumItemId;
 
     protected:
@@ -118,7 +118,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
     virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
-    void                SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
+    void                SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;}
 };
 
 
@@ -137,7 +137,7 @@ class SvxBulletPickTabPage : public SfxTabPage
     sal_Bool                bPreset     : 1;
     sal_uInt16              nNumItemId;
 
-    String              sBulletCharFmtName;
+    OUString            sBulletCharFmtName;
     protected:
         DECL_LINK(NumSelectHdl_Impl, void *);
         DECL_LINK(DoubleClickHdl_Impl, void *);
@@ -154,7 +154,7 @@ class SvxBulletPickTabPage : public SfxTabPage
     virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
-    void                SetCharFmtName(const String& rName){sBulletCharFmtName = rName;}
+    void                SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;}
     virtual void        PageCreated(SfxAllItemSet aSet);
 };
 
@@ -167,8 +167,8 @@ class SvxNumPickTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
     SvxNumValueSet*     m_pExamplesVS;
-    String              sNumCharFmtName;
-    String              sBulletCharFmtName;
+    OUString            sNumCharFmtName;
+    OUString            sBulletCharFmtName;
 
     SvxNumSettingsArr_Impl  aNumSettingsArrays[NUM_VALUSET_COUNT];  // is initialized with the five formats
 
@@ -197,7 +197,7 @@ class SvxNumPickTabPage : public SfxTabPage
     virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
-    void                SetCharFmtNames(const String& rCharName, const String& rBulName)
+    void                SetCharFmtNames(const OUString& rCharName, const OUString& rBulName)
                             {   sNumCharFmtName = rCharName;
                                 sBulletCharFmtName = rBulName;}
     virtual void        PageCreated(SfxAllItemSet aSet);
@@ -214,7 +214,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
     SvxBmpNumValueSet*  m_pExamplesVS;
 
     std::vector<OUString> aGrfNames;
-    String              sNumCharFmtName;
+    OUString            sNumCharFmtName;
 
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
@@ -242,7 +242,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
     virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
-    void                SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
+    void                SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;}
 };
 
 //------------------------------------------------
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 51682ee4302b..63a6de447c99 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -111,8 +111,8 @@ private:
     PushButton*              pNewReplacePB;
     PushButton*              pDeletePB;
 
-    String                  sModify;
-    String                  sNew;
+    OUString                sModify;
+    OUString                sNew;
     DecorationView          aDecoView;
 
     ::com::sun::star::uno::Sequence<
@@ -141,7 +141,7 @@ private:
                             ::com::sun::star::linguistic2::XDictionary >  &xDic );
 
     void            RemoveDictEntry(SvTreeListEntry* pEntry);
-    sal_uInt16          GetLBInsertPos(const String &rDicWord);
+    sal_uInt16          GetLBInsertPos(const OUString &rDicWord);
 
 protected:
 
@@ -149,7 +149,7 @@ protected:
 
 public:
     SvxEditDictionaryDialog( Window* pParent,
-            const String& rName,
+            const OUString& rName,
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::linguistic2::XSpellChecker1> &xSpl );
     ~SvxEditDictionaryDialog();
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 387b276d6db3..3e2e4e536c92 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -66,17 +66,17 @@ class SvxEditModulesDlg : public ModalDialog
     HelpButton          aHelpPB;
     OKButton            aClosePB;
 
-    String              sSpell;
-    String              sHyph;
-    String              sThes;
-    String              sGrammar;
+    OUString            sSpell;
+    OUString            sHyph;
+    OUString            sThes;
+    OUString            sGrammar;
 
     SvxLinguData_Impl*  pDefaultLinguData;
     SvxLinguData_Impl&  rLinguData;
 
     SvLBoxButtonData*   pCheckButtonData;
 
-    SvTreeListEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
+    SvTreeListEntry*    CreateEntry(OUString& rTxt, sal_uInt16 nCol);
 
     DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
     DECL_LINK( UpDownHdl_Impl, PushButton * );
@@ -109,17 +109,17 @@ private:
     PushButton*         m_pLinguOptionsEditPB;
     FixedHyperlink*     m_pMoreDictsLink;
 
-    String              sCapitalWords;
-    String              sWordsWithDigits;
-    String              sCapitalization;
-    String              sSpellSpecial;
-    String              sSpellAuto;
-    String              sGrammarAuto;
-    String              sNumMinWordlen;
-    String              sNumPreBreak;
-    String              sNumPostBreak;
-    String              sHyphAuto;
-    String              sHyphSpecial;
+    OUString            sCapitalWords;
+    OUString            sWordsWithDigits;
+    OUString            sCapitalization;
+    OUString            sSpellSpecial;
+    OUString            sSpellAuto;
+    OUString            sGrammarAuto;
+    OUString            sNumMinWordlen;
+    OUString            sNumPreBreak;
+    OUString            sNumPostBreak;
+    OUString            sHyphAuto;
+    OUString            sHyphSpecial;
 
     com::sun::star::uno::Reference<
         com::sun::star::linguistic2::XLinguProperties >     xProp;
@@ -135,7 +135,7 @@ private:
     SvxLinguData_Impl*  pLinguData;
 
     SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet );
-    SvTreeListEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
+    SvTreeListEntry*    CreateEntry(OUString& rTxt, sal_uInt16 nCol);
 
     void    AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
     sal_uLong   GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 3b5d2ea618c4..835517bd088f 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -52,7 +52,7 @@ private:
     ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker;
 
-    void        ChangeCurrentEntry( const String& _rFolder );
+    void        ChangeCurrentEntry( const OUString& _rFolder );
 
     DECL_LINK(PathHdl_Impl, void *);
     DECL_LINK(StandardHdl_Impl, void *);
@@ -63,10 +63,10 @@ private:
 
     DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
 
-    void        GetPathList( sal_uInt16 _nPathHandle, String& _rInternalPath,
-                             String& _rUserPath, String& _rWritablePath, sal_Bool& _rReadOnly );
+    void        GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath,
+                             OUString& _rUserPath, OUString& _rWritablePath, sal_Bool& _rReadOnly );
     void        SetPathList( sal_uInt16 _nPathHandle,
-                             const String& _rUserPath, const String& _rWritablePath );
+                             const OUString& _rUserPath, const OUString& _rWritablePath );
 
 public:
     SvxPathTabPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index daa6dea81d04..98161e950b39 100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -43,8 +43,8 @@ public:
     virtual ~PasswordToOpenModifyDialog();
 
     // AbstractPasswordToOpenModifyDialog
-    virtual String  GetPasswordToOpen() const;
-    virtual String  GetPasswordToModify() const;
+    virtual OUString  GetPasswordToOpen() const;
+    virtual OUString  GetPasswordToModify() const;
     virtual bool    IsRecommendToOpenReadonly() const;
 };
 
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index 7cd13f620eab..3de81da85a09 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -44,7 +44,7 @@ class SvPasteObjectDialog : public ModalDialog
     OKButton* m_pOKButton;
     ::std::map< SotFormatStringId, OUString > aSupplementMap;
     SvGlobalName    aObjClassName;
-    String          aObjName;
+    OUString        aObjName;
 
     ListBox&        ObjectLB()      { return *m_pLbInsertList; }
     FixedText&      ObjectSource()  { return *m_pFtObjectSource; }
@@ -57,8 +57,8 @@ public:
                 SvPasteObjectDialog( Window* pParent );
                 ~SvPasteObjectDialog();
 
-    void        Insert( SotFormatStringId nFormat, const String & rFormatName );
-    void        SetObjName( const SvGlobalName & rClass, const String & rObjName );
+    void        Insert( SotFormatStringId nFormat, const OUString & rFormatName );
+    void        SetObjName( const SvGlobalName & rClass, const OUString & rObjName );
     sal_uLong       GetFormat( const TransferableDataHelper& aHelper,
                         const DataFlavorExVector* pFormats=0,
                         const TransferableObjectDescriptor* pDesc=0 );
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 4ae9b7d3f666..49184687ca95 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -58,7 +58,7 @@ public:
                             { aNextHdlLink = rLink; }
 
     void EnableTravel(sal_Bool bNext, sal_Bool bPrev);
-    String GetNote()
+    OUString GetNote()
     {
         return m_pEditED->GetText();
     }
@@ -66,7 +66,7 @@ public:
     {
         m_pEditED->SetText(rTxt);
     }
-    void ShowLastAuthor(const String& rAuthor, const String& rDate);
+    void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate);
     void DontChangeAuthor()
     {
         m_pAuthorBtn->Enable(false);
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index d9ff490f55ab..7fe757d4953b 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -85,12 +85,12 @@ public:
 
 
 
-    SvTreeListEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
+    SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap,
                               SvTreeListEntry * pParent,
                               bool bChildrenOnDemand,
                               std::auto_ptr< SFEntry > aUserData,
                               OUString factoryURL );
-    SvTreeListEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
+    SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap,
                               SvTreeListEntry * pParent,
                               bool bChildrenOnDemand,
                               std::auto_ptr< SFEntry > aUserData );
@@ -110,8 +110,8 @@ public:
     CuiInputDialog( Window * pParent, sal_uInt16 nMode );
     ~CuiInputDialog();
 
-    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 SFEntry
@@ -150,16 +150,16 @@ protected:
 
     OUString         m_sLanguage;
     static Selection_hash   m_lastSelection;
-    const String m_delErrStr;
-    const String m_delErrTitleStr;
-    const String m_delQueryStr;
-    const String m_delQueryTitleStr;
-    const String m_createErrStr;
-    const String m_createDupStr;
-    const String m_createErrTitleStr;
-    const String m_renameErrStr;
-    const String m_renameDupStr;
-    const String m_renameErrTitleStr;
+    const OUString m_delErrStr;
+    const OUString m_delErrTitleStr;
+    const OUString m_delQueryStr;
+    const OUString m_delQueryTitleStr;
+    const OUString m_createErrStr;
+    const OUString m_createDupStr;
+    const OUString m_createErrTitleStr;
+    const OUString m_renameErrStr;
+    const OUString m_renameDupStr;
+    const OUString m_renameErrTitleStr;
 
     DECL_LINK( MacroSelectHdl, SvTreeListBox * );
     DECL_LINK( ScriptSelectHdl, SvTreeListBox * );
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 40c8a64d0a7f..aedca2a81801 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -103,7 +103,7 @@ public:
                                     SvxConfigFunctionListBox(Window* pParent);
                                     ~SvxConfigFunctionListBox();
     void                            ClearAll();
-    String                          GetHelpText( SvTreeListEntry *pEntry );
+    OUString                        GetHelpText( SvTreeListEntry *pEntry );
     using Window::GetHelpText;
     SvTreeListEntry*                GetLastSelectedEntry();
     void                            FunctionSelected();
@@ -215,10 +215,10 @@ public:
         m_pCategories->SetImageProvider(provider);
     }
 
-    String      GetScriptURL() const;
-    String      GetSelectedDisplayName();
+    OUString    GetScriptURL() const;
+    OUString    GetSelectedDisplayName();
     void        SetRunLabel();
-    void        SetDialogDescription(const String& rDescription);
+    void        SetDialogDescription(const OUString& rDescription);
 };
 
 #endif
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index a3b36dcb0fcf..e72568ad1177 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -60,7 +60,7 @@ class AlternativesExtraData
 
 public:
     AlternativesExtraData() : bHeader( false ) {}
-    AlternativesExtraData( const String &rText, bool bIsHeader ) :
+    AlternativesExtraData( const OUString &rText, bool bIsHeader ) :
         sText(rText),
         bHeader(bIsHeader)
         {
@@ -89,7 +89,7 @@ public:
     virtual ~ThesaurusAlternativesCtrl();
 
 
-    SvTreeListEntry *   AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader );
+    SvTreeListEntry *   AddEntry( sal_Int32 nVal, const OUString &rText, bool bIsHeader );
 
     void            ClearExtraData();
     void            SetExtraData( const SvTreeListEntry *pEntry, const AlternativesExtraData &rData );
@@ -154,18 +154,18 @@ public:
             queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
     bool    UpdateAlternativesBox_Impl();
-    void    LookUp( const String &rText );
+    void    LookUp( const OUString &rText );
     void    LookUp_Impl();
     virtual void     Apply();
 
 public:
     SvxThesaurusDialog( Window* pParent,
                         css::uno::Reference< css::linguistic2::XThesaurus >  xThesaurus,
-                        const String &rWord, LanguageType nLanguage );
+                        const OUString &rWord, LanguageType nLanguage );
     ~SvxThesaurusDialog();
 
     void            SetWindowTitle( LanguageType nLanguage );
-    String          GetWord();
+    OUString        GetWord();
     sal_uInt16      GetLanguage() const;
 };
 
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index adf6563a630e..9709cac5bb58 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -154,8 +154,8 @@ private:
 
     SvTreeListBox   aTreeLB;
 
-    String          sTitle;
-    String          sNotLoadedError;
+    OUString        sTitle;
+    OUString        sNotLoadedError;
 
     // for the ColorTabPage
     SfxItemSet*     pColorPageItemSet;
@@ -207,13 +207,13 @@ public:
     OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId );
     ~OfaTreeOptionsDialog();
 
-    OptionsPageInfo*    AddTabPage( sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup );
-    sal_uInt16              AddGroup(   const String& rGroupName,  SfxShell* pCreateShell,
+    OptionsPageInfo*    AddTabPage( sal_uInt16 nId, const OUString& rPageName, sal_uInt16 nGroup );
+    sal_uInt16              AddGroup(   const OUString& rGroupName,  SfxShell* pCreateShell,
                                     SfxModule* pCreateModule, sal_uInt16 nDialogId );
 
     void                ActivateLastSelection();
     void                ActivatePage( sal_uInt16 nResId );
-    void                ActivatePage( const String& rPageURL );
+    void                ActivatePage( const OUString& rPageURL );
     void                ApplyItemSets();
 
     // helper functions to call the language settings TabPage from the SpellDialog