[Libreoffice-commits] core.git: chart2/source cui/source editeng/source framework/source include/editeng include/sfx2 include/svl include/svx reportdesign/source sc/inc sc/source sd/inc sd/source sfx2/source starmath/source svl/source svl/unx svtools/source svx/source sw/inc sw/source uui/source vcl/source

Norbert Thiebaud nthiebaud at gmail.com
Sun Jul 7 13:00:40 PDT 2013


 chart2/source/tools/NumberFormatterWrapper.cxx         |   12 
 cui/source/options/optupdt.cxx                         |    7 
 editeng/source/editeng/editundo.cxx                    |   28 -
 editeng/source/editeng/editundo.hxx                    |    2 
 editeng/source/editeng/impedit4.cxx                    |    4 
 framework/source/fwe/helper/undomanagerhelper.cxx      |   26 -
 include/editeng/editund2.hxx                           |    6 
 include/sfx2/app.hxx                                   |    2 
 include/sfx2/objsh.hxx                                 |   16 
 include/sfx2/viewfrm.hxx                               |   14 
 include/svl/inethist.hxx                               |    5 
 include/svl/itemprop.hxx                               |   59 +-
 include/svl/ondemand.hxx                               |    2 
 include/svl/srchitem.hxx                               |   17 
 include/svl/style.hxx                                  |   61 +-
 include/svl/svdde.hxx                                  |   80 +--
 include/svl/undo.hxx                                   |   64 +-
 include/svl/zforlist.hxx                               |   16 
 include/svx/e3dundo.hxx                                |    4 
 include/svx/sdrundomanager.hxx                         |    4 
 include/svx/svdundo.hxx                                |    2 
 reportdesign/source/ui/report/ReportController.cxx     |    2 
 sc/inc/patattr.hxx                                     |    6 
 sc/inc/stlpool.hxx                                     |   14 
 sc/inc/stlsheet.hxx                                    |   14 
 sc/inc/undorangename.hxx                               |    4 
 sc/inc/zforauto.hxx                                    |    2 
 sc/source/core/data/docpool.cxx                        |    2 
 sc/source/core/data/dpcache.cxx                        |    2 
 sc/source/core/data/dputil.cxx                         |    2 
 sc/source/core/data/patattr.cxx                        |   20 
 sc/source/core/data/stlpool.cxx                        |   21 
 sc/source/core/data/stlsheet.cxx                       |   38 -
 sc/source/core/data/table4.cxx                         |   10 
 sc/source/core/data/table6.cxx                         |    4 
 sc/source/core/data/validat.cxx                        |   10 
 sc/source/core/tool/rangeseq.cxx                       |    4 
 sc/source/core/tool/zforauto.cxx                       |   10 
 sc/source/filter/excel/xestyle.cxx                     |    2 
 sc/source/filter/rtf/eeimpars.cxx                      |    4 
 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx |    2 
 sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx |    2 
 sc/source/filter/xml/xmlcelli.cxx                      |    2 
 sc/source/ui/docshell/docsh4.cxx                       |   18 
 sc/source/ui/formdlg/formula.cxx                       |    5 
 sc/source/ui/inc/docsh.hxx                             |    6 
 sc/source/ui/inc/undobase.hxx                          |    6 
 sc/source/ui/inc/undoblk.hxx                           |  171 +++----
 sc/source/ui/inc/undocell.hxx                          |   22 -
 sc/source/ui/inc/undodat.hxx                           |   34 -
 sc/source/ui/inc/undodraw.hxx                          |    4 
 sc/source/ui/inc/undostyl.hxx                          |    4 
 sc/source/ui/inc/undotab.hxx                           |   34 -
 sc/source/ui/miscdlgs/autofmt.cxx                      |   10 
 sc/source/ui/miscdlgs/filldlg.cxx                      |    4 
 sc/source/ui/undo/undobase.cxx                         |    6 
 sc/source/ui/undo/undoblk.cxx                          |   62 +-
 sc/source/ui/undo/undoblk2.cxx                         |    4 
 sc/source/ui/undo/undoblk3.cxx                         |   44 +-
 sc/source/ui/undo/undocell.cxx                         |   32 -
 sc/source/ui/undo/undodat.cxx                          |   48 +-
 sc/source/ui/undo/undodraw.cxx                         |    4 
 sc/source/ui/undo/undorangename.cxx                    |    8 
 sc/source/ui/undo/undostyl.cxx                         |    4 
 sc/source/ui/undo/undotab.cxx                          |   48 +-
 sc/source/ui/unoobj/chart2uno.cxx                      |    2 
 sc/source/ui/unoobj/pageuno.cxx                        |    1 
 sc/source/ui/view/cellsh1.cxx                          |   34 -
 sc/source/ui/view/tabvwsha.cxx                         |    2 
 sc/source/ui/view/viewfun2.cxx                         |    8 
 sd/inc/stlpool.hxx                                     |    2 
 sd/inc/stlsheet.hxx                                    |    4 
 sd/inc/undo/undomanager.hxx                            |    2 
 sd/source/core/stlfamily.cxx                           |   10 
 sd/source/core/stlpool.cxx                             |   10 
 sd/source/core/stlsheet.cxx                            |   43 +
 sd/source/core/undo/undomanager.cxx                    |    6 
 sd/source/ui/func/fuhhconv.cxx                         |    2 
 sd/source/ui/func/sdundogr.cxx                         |    6 
 sd/source/ui/inc/sdundogr.hxx                          |    4 
 sfx2/source/appl/appdde.cxx                            |  178 ++------
 sfx2/source/appl/lnkbase2.cxx                          |   10 
 sfx2/source/dialog/dinfdlg.cxx                         |    2 
 sfx2/source/dialog/mgetempl.cxx                        |    2 
 sfx2/source/dialog/styledlg.cxx                        |    2 
 starmath/source/document.cxx                           |    2 
 svl/source/fsstor/fsstorage.cxx                        |    3 
 svl/source/items/itemprop.cxx                          |   82 +--
 svl/source/items/macitem.cxx                           |    2 
 svl/source/items/style.cxx                             |  112 ++---
 svl/source/misc/inethist.cxx                           |   12 
 svl/source/numbers/zforlist.cxx                        |   91 +---
 svl/source/numbers/zformat.cxx                         |    6 
 svl/source/numbers/zforscan.cxx                        |    6 
 svl/source/svdde/ddecli.cxx                            |  116 ++---
 svl/source/svdde/ddedata.cxx                           |   12 
 svl/source/svdde/ddesvr.cxx                            |  326 +++++++--------
 svl/source/undo/undo.cxx                               |   60 +-
 svl/unx/source/svdde/ddedummy.cxx                      |  139 +++---
 svtools/source/control/fmtfield.cxx                    |    9 
 svtools/source/svhtml/htmlout.cxx                      |    2 
 svtools/source/uno/unoiface.cxx                        |    4 
 svx/source/dialog/srchdlg.cxx                          |    2 
 svx/source/engine3d/e3dundo.cxx                        |   22 -
 svx/source/fmcomp/gridcell.cxx                         |    2 
 svx/source/items/numfmtsh.cxx                          |   58 +-
 svx/source/svdraw/sdrundomanager.cxx                   |   16 
 svx/source/svdraw/svdundo.cxx                          |  366 ++++++++---------
 svx/source/table/tableundo.cxx                         |   66 +--
 svx/source/table/tableundo.hxx                         |    6 
 sw/inc/IDocumentUndoRedo.hxx                           |    4 
 sw/inc/docsh.hxx                                       |    8 
 sw/inc/docstyle.hxx                                    |   36 -
 sw/inc/tblafmt.hxx                                     |    2 
 sw/inc/undobj.hxx                                      |    2 
 sw/source/core/doc/tblafmt.cxx                         |    9 
 sw/source/core/fields/fldbas.cxx                       |   20 
 sw/source/core/fields/usrfld.cxx                       |    2 
 sw/source/core/inc/SwUndoFmt.hxx                       |   24 -
 sw/source/core/inc/UndoManager.hxx                     |   16 
 sw/source/core/table/swtable.cxx                       |   30 -
 sw/source/core/text/EnhancedPDFExportHelper.cxx        |    2 
 sw/source/core/undo/SwUndoFmt.cxx                      |   18 
 sw/source/core/undo/docundo.cxx                        |   11 
 sw/source/core/undo/undobj.cxx                         |    2 
 sw/source/ui/app/docsh2.cxx                            |   10 
 sw/source/ui/app/docstyle.cxx                          |  100 ++--
 sw/source/ui/dbui/dbinsdlg.cxx                         |   36 -
 sw/source/ui/table/tautofmt.cxx                        |  109 ++---
 sw/source/ui/uiview/viewsrch.cxx                       |    4 
 sw/source/ui/utlui/numfmtlb.cxx                        |    6 
 uui/source/iahndl-ssl.cxx                              |    5 
 vcl/source/edit/textund2.hxx                           |    2 
 vcl/source/edit/textundo.cxx                           |   22 -
 vcl/source/edit/textundo.hxx                           |    4 
 135 files changed, 1731 insertions(+), 1791 deletions(-)

New commits:
commit 009851223b5ced4ed2662af2e2ae81c0f9200e45
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Jul 5 16:25:03 2013 -0500

    module svl: all String and some bool and related clean-up
    
    Change-Id: I36eb559fa58dbe75384b7119c788af0048813aed
    Reviewed-on: https://gerrit.libreoffice.org/4733
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index a1080b3..9a7db06 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -99,10 +99,10 @@ Date NumberFormatterWrapper::getNullDate() const
     return aRet;
 }
 
-OUString NumberFormatterWrapper::getFormattedString(
-    sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
+OUString NumberFormatterWrapper::getFormattedString( sal_Int32 nNumberFormatKey, double fValue,
+                                                     sal_Int32& rLabelColor, bool& rbColorChanged ) const
 {
-    String aText;
+    OUString aText;
     Color* pTextColor = NULL;
     if( !m_pNumberFormatter )
     {
@@ -124,13 +124,11 @@ OUString NumberFormatterWrapper::getFormattedString(
         m_aNullDate >>= aNewNullDate;
         m_pNumberFormatter->ChangeNullDate(aNewNullDate.Day,aNewNullDate.Month,aNewNullDate.Year);
     }
-    m_pNumberFormatter->GetOutputString(
-        fValue, nNumberFormatKey, aText, &pTextColor);
+    m_pNumberFormatter->GetOutputString(fValue, nNumberFormatKey, aText, &pTextColor);
     if ( m_aNullDate.hasValue() )
     {
         m_pNumberFormatter->ChangeNullDate(nDay,nMonth,nYear);
     }
-    OUString aRet( aText );
 
     if(pTextColor)
     {
@@ -140,7 +138,7 @@ OUString NumberFormatterWrapper::getFormattedString(
     else
         rbColorChanged = false;
 
-    return aRet;
+    return aText;
 }
 
 //.............................................................................
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 70df012..f23f94b 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -120,17 +120,14 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
 
         LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType();
         SvNumberFormatter *pNumberFormatter = new SvNumberFormatter( ::comphelper::getProcessComponentContext(), eUILang );
-        String      aTmpStr;
         Color*      pColor = NULL;
         Date*       pNullDate = pNumberFormatter->GetNullDate();
         sal_uInt32  nFormat = pNumberFormatter->GetStandardFormat( NUMBERFORMAT_DATE, eUILang );
 
-        pNumberFormatter->GetOutputString( aDate - *pNullDate, nFormat, aTmpStr, &pColor );
-        aDateStr = aTmpStr;
+        pNumberFormatter->GetOutputString( aDate - *pNullDate, nFormat, aDateStr, &pColor );
 
         nFormat = pNumberFormatter->GetStandardFormat( NUMBERFORMAT_TIME, eUILang );
-        pNumberFormatter->GetOutputString( aTime.GetTimeInDays(), nFormat, aTmpStr, &pColor );
-        aTimeStr = aTmpStr;
+        pNumberFormatter->GetOutputString( aTime.GetTimeInDays(), nFormat, aTimeStr, &pColor );
 
         delete pColor;
         delete pNumberFormatter;
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index dfc8df1..1ce7274 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -48,10 +48,10 @@ void EditUndoManager::SetEditEngine(EditEngine* pNew)
     mpEditEngine = pNew;
 }
 
-sal_Bool EditUndoManager::Undo()
+bool EditUndoManager::Undo()
 {
     if ( !mpEditEngine || GetUndoActionCount() == 0 )
-        return sal_False;
+        return false;
 
     DBG_ASSERT( mpEditEngine->GetActiveView(), "Active View?" );
 
@@ -62,14 +62,14 @@ sal_Bool EditUndoManager::Undo()
         else
         {
             OSL_FAIL("Undo in engine is not possible without a View! ");
-            return sal_False;
+            return false;
         }
     }
 
     mpEditEngine->GetActiveView()->GetImpEditView()->DrawSelection(); // Remove the old selection
 
     mpEditEngine->SetUndoMode( sal_True );
-    sal_Bool bDone = SfxUndoManager::Undo();
+    bool bDone = SfxUndoManager::Undo();
     mpEditEngine->SetUndoMode( sal_False );
 
     EditSelection aNewSel( mpEditEngine->GetActiveView()->GetImpEditView()->GetEditSelection() );
@@ -83,10 +83,10 @@ sal_Bool EditUndoManager::Undo()
     return bDone;
 }
 
-sal_Bool EditUndoManager::Redo()
+bool EditUndoManager::Redo()
 {
     if ( !mpEditEngine || GetRedoActionCount() == 0 )
-        return sal_False;
+        return false;
 
     DBG_ASSERT( mpEditEngine->GetActiveView(), "Active View?" );
 
@@ -97,14 +97,14 @@ sal_Bool EditUndoManager::Redo()
         else
         {
             OSL_FAIL( "Redo in Engine ohne View nicht moeglich!" );
-            return sal_False;
+            return false;
         }
     }
 
     mpEditEngine->GetActiveView()->GetImpEditView()->DrawSelection(); // Remove the old selection
 
     mpEditEngine->SetUndoMode( sal_True );
-    sal_Bool bDone = SfxUndoManager::Redo();
+    bool bDone = SfxUndoManager::Redo();
     mpEditEngine->SetUndoMode( sal_False );
 
     EditSelection aNewSel( mpEditEngine->GetActiveView()->GetImpEditView()->GetEditSelection() );
@@ -138,9 +138,9 @@ sal_uInt16 EditUndo::GetId() const
     return nId;
 }
 
-sal_Bool EditUndo::CanRepeat(SfxRepeatTarget&) const
+bool EditUndo::CanRepeat(SfxRepeatTarget&) const
 {
-    return sal_False;
+    return false;
 }
 
 OUString EditUndo::GetComment() const
@@ -320,21 +320,21 @@ void EditUndoInsertChars::Redo()
     GetEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aNewPaM ) );
 }
 
-sal_Bool EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
+bool EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
 {
     EditUndoInsertChars* pNext = dynamic_cast<EditUndoInsertChars*>(pNextAction);
     if (!pNext)
         return false;
 
     if ( aEPaM.nPara != pNext->aEPaM.nPara )
-        return sal_False;
+        return false;
 
     if ( ( aEPaM.nIndex + aText.Len() ) == pNext->aEPaM.nIndex )
     {
         aText += pNext->aText;
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 EditUndoRemoveChars::EditUndoRemoveChars(
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 834a9c4..7f7d4e3 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -110,7 +110,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
 
-    virtual sal_Bool    Merge( SfxUndoAction *pNextAction );
+    virtual bool    Merge( SfxUndoAction *pNextAction );
 };
 
 // -----------------------------------------------------------------------
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index dedd6b2..0252b8d 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -492,7 +492,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
                 }
 
                 // Parent ... (only if necessary)
-                if ( pStyle->GetParent().Len() && ( pStyle->GetParent() != pStyle->GetName() ) )
+                if ( !pStyle->GetParent().isEmpty() && ( pStyle->GetParent() != pStyle->GetName() ) )
                 {
                     SfxStyleSheet* pParent = (SfxStyleSheet*)GetStyleSheetPool()->Find( pStyle->GetParent(), pStyle->GetFamily() );
                     DBG_ASSERT( pParent, "Parent not found!" );
@@ -503,7 +503,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
 
                 // Next Style ... (more)
                 SfxStyleSheet* pNext = pStyle;
-                if ( pStyle->GetFollow().Len() && ( pStyle->GetFollow() != pStyle->GetName() ) )
+                if ( !pStyle->GetFollow().isEmpty() && ( pStyle->GetFollow() != pStyle->GetName() ) )
                     pNext = (SfxStyleSheet*)GetStyleSheetPool()->Find( pStyle->GetFollow(), pStyle->GetFamily() );
 
                 DBG_ASSERT( pNext, "Next ot found!" );
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 40d09c1..72e0f9b 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -76,10 +76,10 @@ namespace framework
                             );
         virtual             ~UndoActionWrapper();
 
-        virtual OUString GetComment() const;
+        virtual OUString    GetComment() const;
         virtual void        Undo();
         virtual void        Redo();
-        virtual sal_Bool    CanRepeat(SfxRepeatTarget&) const;
+        virtual bool        CanRepeat(SfxRepeatTarget&) const;
 
     private:
         const Reference< XUndoAction >  m_xUndoAction;
@@ -136,7 +136,7 @@ namespace framework
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    sal_Bool UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const
+    bool UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const
     {
         return sal_False;
     }
@@ -254,14 +254,14 @@ namespace framework
         }
 
         // SfxUndoListener
-        virtual void actionUndone( const String& i_actionComment );
-        virtual void actionRedone( const String& i_actionComment );
-        virtual void undoActionAdded( const String& i_actionComment );
+        virtual void actionUndone( const OUString& i_actionComment );
+        virtual void actionRedone( const OUString& i_actionComment );
+        virtual void undoActionAdded( const OUString& i_actionComment );
         virtual void cleared();
         virtual void clearedRedo();
         virtual void resetAll();
-        virtual void listActionEntered( const String& i_comment );
-        virtual void listActionLeft( const String& i_comment );
+        virtual void listActionEntered( const OUString& i_comment );
+        virtual void listActionLeft( const OUString& i_comment );
         virtual void listActionLeftAndMerged();
         virtual void listActionCancelled();
         virtual void undoManagerDying();
@@ -800,7 +800,7 @@ namespace framework
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    void UndoManagerHelper_Impl::actionUndone( const String& i_actionComment )
+    void UndoManagerHelper_Impl::actionUndone( const OUString& i_actionComment )
     {
         UndoManagerEvent aEvent;
         aEvent.Source = getXUndoManager();
@@ -811,7 +811,7 @@ namespace framework
     }
 
      //------------------------------------------------------------------------------------------------------------------
-    void UndoManagerHelper_Impl::actionRedone( const String& i_actionComment )
+    void UndoManagerHelper_Impl::actionRedone( const OUString& i_actionComment )
     {
         UndoManagerEvent aEvent;
         aEvent.Source = getXUndoManager();
@@ -822,7 +822,7 @@ namespace framework
     }
 
      //------------------------------------------------------------------------------------------------------------------
-    void UndoManagerHelper_Impl::undoActionAdded( const String& i_actionComment )
+    void UndoManagerHelper_Impl::undoActionAdded( const OUString& i_actionComment )
     {
         if ( m_bAPIActionRunning )
             return;
@@ -858,7 +858,7 @@ namespace framework
     }
 
      //------------------------------------------------------------------------------------------------------------------
-    void UndoManagerHelper_Impl::listActionEntered( const String& i_comment )
+    void UndoManagerHelper_Impl::listActionEntered( const OUString& i_comment )
     {
 #if OSL_DEBUG_LEVEL > 0
         m_aContextAPIFlags.push( m_bAPIActionRunning );
@@ -871,7 +871,7 @@ namespace framework
     }
 
      //------------------------------------------------------------------------------------------------------------------
-    void UndoManagerHelper_Impl::listActionLeft( const String& i_comment )
+    void UndoManagerHelper_Impl::listActionLeft( const OUString& i_comment )
     {
 #if OSL_DEBUG_LEVEL > 0
         const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top();
diff --git a/include/editeng/editund2.hxx b/include/editeng/editund2.hxx
index b810628..3a3578b 100644
--- a/include/editeng/editund2.hxx
+++ b/include/editeng/editund2.hxx
@@ -36,8 +36,8 @@ class EDITENG_DLLPUBLIC EditUndoManager : public SfxUndoManager
 public:
     EditUndoManager(sal_uInt16 nMaxUndoActionCount = 20);
 
-    virtual sal_Bool Undo();
-    virtual sal_Bool Redo();
+    virtual bool Undo();
+    virtual bool Redo();
 };
 
 // -----------------------------------------------------------------------
@@ -58,7 +58,7 @@ public:
     virtual void    Undo()      = 0;
     virtual void    Redo()      = 0;
 
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget&) const;
+    virtual bool    CanRepeat(SfxRepeatTarget&) const;
     virtual OUString GetComment() const;
     virtual sal_uInt16  GetId() const;
 };
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 858140d..d202219 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -152,7 +152,7 @@ public:
 
     // DDE
 #if defined( WNT )
-    long                        DdeExecute( const String& rCmd );
+    long                        DdeExecute( const OUString& rCmd );
 #endif
     sal_Bool                    InitializeDde();
     const DdeService*           GetDdeService() const;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 64e738f..4fbda63 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -471,14 +471,14 @@ public:
     void                        InvalidateName();  // Re-set to unnamed
 
     // DDE-Interface
-    virtual long                DdeExecute( const String& rCmd );
-    virtual long                DdeGetData( const String& rItem,
-                                            const String& rMimeType,
-                                        ::com::sun::star::uno::Any & rValue );
-    virtual long                DdeSetData( const String& rItem,
-                                            const String& rMimeType,
-                                const ::com::sun::star::uno::Any & rValue );
-    virtual ::sfx2::SvLinkSource*       DdeCreateLinkSource( const String& rItem );
+    virtual long                DdeExecute( const OUString& rCmd );
+    virtual long                DdeGetData( const OUString& rItem,
+                                            const OUString& rMimeType,
+                                            ::com::sun::star::uno::Any & rValue );
+    virtual long                DdeSetData( const OUString& rItem,
+                                            const OUString& rMimeType,
+                                            const ::com::sun::star::uno::Any & rValue );
+    virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem );
     virtual void                ReconnectDdeLink(SfxObjectShell& rServer);
 
     static void                 ReconnectDdeLinks(SfxObjectShell& rServer);
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index a81c20c..7c92eb4 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -139,14 +139,14 @@ public:
     virtual void            Deactivate( sal_Bool bUI );
 
     // DDE-Interface
-    virtual long            DdeExecute( const String& rCmd );
-    virtual long            DdeGetData( const String& rItem,
-                                        const String& rMimeType,
+    virtual long            DdeExecute( const OUString& rCmd );
+    virtual long            DdeGetData( const OUString& rItem,
+                                        const OUString& rMimeType,
                                         ::com::sun::star::uno::Any & rValue );
-    virtual long            DdeSetData( const String& rItem,
-                                        const String& rMimeType,
-                                const ::com::sun::star::uno::Any & rValue );
-    virtual ::sfx2::SvLinkSource*   DdeCreateLinkSource( const String& rItem );
+    virtual long            DdeSetData( const OUString& rItem,
+                                        const OUString& rMimeType,
+                                        const ::com::sun::star::uno::Any & rValue );
+    virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem );
 
     void                    UpdateTitle();
 
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index 4ee592f..bdf6926 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -21,7 +21,6 @@
 
 #include "svl/svldllapi.h"
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/brdcst.hxx>
 #include <svl/hint.hxx>
@@ -86,7 +85,7 @@ public:
             return sal_False;
     }
 
-    sal_Bool QueryUrl (const String &rUrl)
+    sal_Bool QueryUrl (const OUString &rUrl)
     {
         INetProtocol eProto =
             INetURLObject::CompareProtocolScheme (rUrl);
@@ -104,7 +103,7 @@ public:
             PutUrl_Impl (rUrl);
     }
 
-    void PutUrl (const String &rUrl)
+    void PutUrl (const OUString &rUrl)
     {
         INetProtocol eProto =
             INetURLObject::CompareProtocolScheme (rUrl);
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index c1b7ed6..46280d7 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -21,7 +21,6 @@
 
 #include "svl/svldllapi.h"
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <svl/itemset.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -35,47 +34,55 @@
 struct SfxItemPropertyMapEntry
 {
     const char*                         pName;
-    sal_uInt16                              nNameLen;
-    sal_uInt16                              nWID;
+    sal_uInt16                          nNameLen;
+    sal_uInt16                          nWID;
     const com::sun::star::uno::Type*    pType;
     long                                nFlags;
-    sal_uInt8                                nMemberId;
+    sal_uInt8                           nMemberId;
 
 };
 
 struct SfxItemPropertySimpleEntry
 {
-    sal_uInt16                              nWID;
+    sal_uInt16                          nWID;
     const com::sun::star::uno::Type*    pType;
     long                                nFlags;
-    sal_uInt8                                nMemberId;
+    sal_uInt8                           nMemberId;
 
-    SfxItemPropertySimpleEntry() :
-        nWID( 0 ),
-        pType( 0 ),
-        nFlags( 0 ),
-        nMemberId( 0 ){}
+    SfxItemPropertySimpleEntry()
+        : nWID( 0 )
+        , pType( 0 )
+        , nFlags( 0 )
+        , nMemberId( 0 )
+        {
+        }
 
     SfxItemPropertySimpleEntry(sal_uInt16 _nWID, const com::sun::star::uno::Type* _pType,
-                               long _nFlags, sal_uInt8 _nMemberId) :
-        nWID(      _nWID ),
-        pType(     _pType ),
-        nFlags(    _nFlags ),
-        nMemberId( _nMemberId ){}
-
-    SfxItemPropertySimpleEntry( const SfxItemPropertyMapEntry* pMapEntry ) :
-        nWID(      pMapEntry->nWID ),
-        pType(     pMapEntry->pType ),
-        nFlags(    pMapEntry->nFlags ),
-        nMemberId( pMapEntry->nMemberId ){}
+                               long _nFlags, sal_uInt8 _nMemberId)
+        : nWID(      _nWID )
+        , pType(     _pType )
+        , nFlags(    _nFlags )
+        , nMemberId( _nMemberId )
+        {
+        }
+
+    SfxItemPropertySimpleEntry( const SfxItemPropertyMapEntry* pMapEntry )
+        : nWID( pMapEntry->nWID )
+        , pType( pMapEntry->pType )
+        , nFlags( pMapEntry->nFlags )
+        , nMemberId( pMapEntry->nMemberId )
+        {
+        }
 
 };
 struct SfxItemPropertyNamedEntry : public SfxItemPropertySimpleEntry
 {
     OUString sName;
-    SfxItemPropertyNamedEntry( const String& rName, const SfxItemPropertySimpleEntry& rSimpleEntry) :
-        SfxItemPropertySimpleEntry( rSimpleEntry ),
-        sName( rName ){}
+    SfxItemPropertyNamedEntry( const OUString& rName, const SfxItemPropertySimpleEntry& rSimpleEntry)
+        : SfxItemPropertySimpleEntry( rSimpleEntry )
+        , sName( rName )
+{
+}
 
 };
 typedef std::vector< SfxItemPropertyNamedEntry > PropertyEntryVector_t;
@@ -92,7 +99,7 @@ public:
     com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties() const;
     com::sun::star::beans::Property getPropertyByName( const OUString rName ) const
         throw( ::com::sun::star::beans::UnknownPropertyException );
-    sal_Bool hasPropertyByName( const OUString& rName ) const;
+    bool hasPropertyByName( const OUString& rName ) const;
 
     void mergeProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rPropSeq );
     PropertyEntryVector_t getPropertyEntries() const;
diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx
index b3a2c42..d61b31f 100644
--- a/include/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
@@ -307,7 +307,7 @@ public:
                                         return pPtr;
                                     }
 
-    const   ::utl::TransliterationWrapper*  getForModule( const String& rModule, LanguageType eLang ) const
+    const   ::utl::TransliterationWrapper*  getForModule( const OUString& rModule, LanguageType eLang ) const
                                     {
                                         if ( !pPtr )
                                             pPtr = new ::utl::TransliterationWrapper( m_xContext, nType );
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 5d4413e..3fb8949 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <unotools/configitem.hxx>
 #include <rsc/rscsfx.hxx>
-#include <tools/string.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/srchdefs.hxx>
 
@@ -98,11 +97,11 @@ public:
             sal_uInt16      GetCommand() const { return nCommand; }
             void            SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; }
 
-    inline  const String    GetSearchString() const;
-    inline  void            SetSearchString(const String& rNewString);
+    inline  const OUString  GetSearchString() const;
+    inline  void            SetSearchString(const OUString& rNewString);
 
-    inline  const String    GetReplaceString() const;
-    inline  void            SetReplaceString(const String& rNewString);
+    inline  const OUString  GetReplaceString() const;
+    inline  void            SetReplaceString(const OUString& rNewString);
 
     inline  bool            GetWordOnly() const;
             void            SetWordOnly(bool bNewWordOnly);
@@ -176,22 +175,22 @@ public:
     inline  void            SetUseAsianOptions( bool bVal ) { bAsianOptions = bVal; }
 };
 
-const String SvxSearchItem::GetSearchString() const
+const OUString SvxSearchItem::GetSearchString() const
 {
     return aSearchOpt.searchString;
 }
 
-void SvxSearchItem::SetSearchString(const String& rNewString)
+void SvxSearchItem::SetSearchString(const OUString& rNewString)
 {
     aSearchOpt.searchString = rNewString;
 }
 
-const String SvxSearchItem::GetReplaceString() const
+const OUString SvxSearchItem::GetReplaceString() const
 {
     return aSearchOpt.replaceString;
 }
 
-void SvxSearchItem::SetReplaceString(const String& rNewString)
+void SvxSearchItem::SetReplaceString(const OUString& rNewString)
 {
     aSearchOpt.replaceString = rNewString;
 }
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index af58cbc..c54313e 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -29,7 +29,6 @@
 #include <cppuhelper/implbase2.hxx>
 #include "svl/svldllapi.h"
 #include <rsc/rscsfx.hxx>
-#include <tools/string.hxx>
 #include <svl/hint.hxx>
 #include <svl/lstner.hxx>
 #include <svl/brdcst.hxx>
@@ -82,7 +81,7 @@ protected:
     SfxStyleSheetBasePool*  pPool;          // zugehoeriger Pool
     SfxStyleFamily          nFamily;        // Familie
 
-    UniString               aName, aParent, aFollow;
+    OUString                aName, aParent, aFollow;
     OUString                maDisplayName;
     OUString                aHelpFile;      // Name der Hilfedatei
     SfxItemSet*             pSet;           // ItemSet
@@ -93,7 +92,7 @@ protected:
     bool                    bMySet;         // sal_True: Set loeschen im dtor
     bool                    bHidden;
 
-    SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask );
+    SfxStyleSheetBase( const OUString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask );
     SfxStyleSheetBase( const SfxStyleSheetBase& );
     virtual ~SfxStyleSheetBase();
     virtual void Load( SvStream&, sal_uInt16 );
@@ -103,10 +102,10 @@ public:
     TYPEINFO();
 
     // returns the internal name of this style
-    virtual const UniString& GetName() const;
+    virtual const OUString& GetName() const;
 
     // sets the internal name of this style
-    virtual bool SetName( const UniString& );
+    virtual bool SetName( const OUString& );
 
     /** returns the display name of this style, it is used at the user interface.
         If the display name is empty, this method returns the internal name. */
@@ -115,18 +114,18 @@ public:
     // sets the display name of this style
     virtual void SetDisplayName( const OUString& );
 
-    virtual const UniString& GetParent() const;
-    virtual bool SetParent( const UniString& );
-    virtual const UniString& GetFollow() const;
-    virtual bool SetFollow( const UniString& );
+    virtual const OUString& GetParent() const;
+    virtual bool SetParent( const OUString& );
+    virtual const OUString& GetFollow() const;
+    virtual bool SetFollow( const OUString& );
     virtual bool HasFollowSupport() const;      // Default true
     virtual bool HasParentSupport() const;      // Default true
     virtual bool HasClearParentSupport() const; // Default false
     virtual bool IsUsed() const;                // Default true
         // Default aus dem Itemset; entweder dem uebergebenen
         // oder aus dem per GetItemSet() zurueckgelieferten Set
-    virtual UniString GetDescription();
-    virtual UniString GetDescription( SfxMapUnit eMetric );
+    virtual OUString GetDescription();
+    virtual OUString GetDescription( SfxMapUnit eMetric );
 
     SfxStyleSheetBasePool& GetPool() { return *pPool; }
     SfxStyleFamily GetFamily() const     { return nFamily; }
@@ -207,15 +206,15 @@ friend class SfxStyleSheetBase;
 private:
     SVL_DLLPRIVATE SfxStyleSheetIterator&      GetIterator_Impl();
 protected:
-    String                      aAppName;
+    OUString                    aAppName;
     SfxItemPool&                rPool;
     SfxStyles                   aStyles;
     SfxStyleFamily              nSearchFamily;
-    sal_uInt16                      nMask;
+    sal_uInt16                  nMask;
 
     SfxStyleSheetBase&          Add( SfxStyleSheetBase& );
-    void                        ChangeParent( const UniString&, const UniString&, bool bVirtual = true );
-    virtual SfxStyleSheetBase*  Create( const UniString&, SfxStyleFamily, sal_uInt16 );
+    void                        ChangeParent( const OUString&, const OUString&, bool bVirtual = true );
+    virtual SfxStyleSheetBase*  Create( const OUString&, SfxStyleFamily, sal_uInt16 );
     virtual SfxStyleSheetBase*  Create( const SfxStyleSheetBase& );
 
     virtual                     ~SfxStyleSheetBasePool();
@@ -224,7 +223,7 @@ public:
                                 SfxStyleSheetBasePool( SfxItemPool& );
                                 SfxStyleSheetBasePool( const SfxStyleSheetBasePool& );
 
-    const String&               GetAppName() const { return aAppName;   }
+    const OUString&             GetAppName() const { return aAppName;   }
 
     SfxItemPool&                GetPool();
     const SfxItemPool&          GetPool() const;
@@ -233,7 +232,7 @@ public:
     virtual sal_uInt16              Count();
     virtual SfxStyleSheetBase*  operator[](sal_uInt16 nIdx);
 
-    virtual SfxStyleSheetBase&  Make(const UniString&,
+    virtual SfxStyleSheetBase&  Make(const OUString&,
                                      SfxStyleFamily eFam,
                                      sal_uInt16 nMask = SFXSTYLEBIT_ALL ,
                                      sal_uInt16 nPos = 0xffff);
@@ -252,13 +251,13 @@ public:
     const SfxStyles&            GetStyles();
     virtual SfxStyleSheetBase*  First();
     virtual SfxStyleSheetBase*  Next();
-    virtual SfxStyleSheetBase*  Find( const UniString&, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL );
+    virtual SfxStyleSheetBase*  Find( const OUString&, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL );
 
     virtual bool                SetParent(SfxStyleFamily eFam,
-                                          const UniString &rStyle,
-                                          const UniString &rParent);
+                                          const OUString &rStyle,
+                                          const OUString &rParent);
 
-    SfxStyleSheetBase*          Find(const UniString& rStr)
+    SfxStyleSheetBase*          Find(const OUString& rStr)
                                 { return Find(rStr, nSearchFamily, nMask); }
 
     void                        SetSearchMask(SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL );
@@ -274,19 +273,18 @@ class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase,
 public:
                         TYPEINFO();
 
-                        SfxStyleSheet( const UniString&, const SfxStyleSheetBasePool&, SfxStyleFamily, sal_uInt16 );
+                        SfxStyleSheet( const OUString&, const SfxStyleSheetBasePool&, SfxStyleFamily, sal_uInt16 );
                         SfxStyleSheet( const SfxStyleSheet& );
 
     virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     virtual bool        isUsedByModel() const;
 
-    virtual bool        SetParent( const UniString& );
+    virtual bool        SetParent( const OUString& );
 
 protected:
     SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2
-        : SfxStyleSheetBase(OUString("dummy"),
-            NULL, SFX_STYLE_FAMILY_ALL, 0)
+        : SfxStyleSheetBase(OUString("dummy"), NULL, SFX_STYLE_FAMILY_ALL, 0)
     {
         assert(false);
     }
@@ -299,7 +297,7 @@ class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool
 {
 protected:
     using SfxStyleSheetBasePool::Create;
-    virtual SfxStyleSheetBase* Create(const UniString&, SfxStyleFamily, sal_uInt16 mask);
+    virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask);
     virtual SfxStyleSheetBase* Create(const SfxStyleSheet &);
 
 public:
@@ -354,21 +352,20 @@ public:
 
 class SVL_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint
 {
-    String              aName;
+    OUString            aName;
 
 public:
                         TYPEINFO();
 
-                        SfxStyleSheetHintExtended(
-                            sal_uInt16, const String& rOld,
-                            SfxStyleSheetBase& );
-    const String&       GetOldName() { return aName; }
+                        SfxStyleSheetHintExtended( sal_uInt16, const OUString& rOld,
+                                                   SfxStyleSheetBase& );
+    const OUString&       GetOldName() { return aName; }
 };
 
 class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >
 {
 public:
-    SfxUnoStyleSheet( const UniString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske );
+    SfxUnoStyleSheet( const OUString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske );
 
     static SfxUnoStyleSheet* getUnoStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle );
 
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 0a1d22b..7f5e713 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -22,7 +22,7 @@
 
 #include "svl/svldllapi.h"
 #include <sot/exchange.hxx>
-#include <tools/string.hxx>
+#include <tools/solar.h>
 #include <tools/link.hxx>
 #include <vector>
 
@@ -67,7 +67,7 @@ class SVL_DLLPUBLIC DdeData
 public:
                     DdeData();
                     DdeData( SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER sal_uLong = FORMAT_STRING );
-                    DdeData( SAL_UNUSED_PARAMETER const String& );
+                    DdeData( SAL_UNUSED_PARAMETER const OUString& );
                     DdeData( const DdeData& );
                     ~DdeData();
 
@@ -90,7 +90,7 @@ class SVL_DLLPUBLIC DdeTransaction
 {
 public:
     virtual void    Data( const DdeData* );
-    virtual void    Done( sal_Bool bDataValid );
+    virtual void    Done( bool bDataValid );
 protected:
     DdeConnection&  rDde;
     DdeData         aDdeData;
@@ -102,7 +102,7 @@ protected:
     Link            aDone;
     bool            bBusy;
 
-                    DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const String&, SAL_UNUSED_PARAMETER long = 0 );
+                    DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER long = 0 );
 
 public:
     virtual        ~DdeTransaction();
@@ -141,7 +141,7 @@ class SVL_DLLPUBLIC DdeLink : public DdeTransaction
     Link            aNotify;
 
 public:
-                    DdeLink( DdeConnection&, const String&, long = 0 );
+                    DdeLink( DdeConnection&, const OUString&, long = 0 );
     virtual        ~DdeLink();
 
     void            SetNotifyHdl( const Link& rLink ) { aNotify = rLink; }
@@ -156,7 +156,7 @@ public:
 class SVL_DLLPUBLIC DdeWarmLink : public DdeLink
 {
 public:
-            DdeWarmLink( DdeConnection&, const String&, long = 0 );
+            DdeWarmLink( DdeConnection&, const OUString&, long = 0 );
 };
 
 // --------------
@@ -166,7 +166,7 @@ public:
 class SVL_DLLPUBLIC DdeHotLink : public DdeLink
 {
 public:
-            DdeHotLink( DdeConnection&, const String&, long = 0 );
+            DdeHotLink( DdeConnection&, const OUString&, long = 0 );
 };
 
 // --------------
@@ -176,7 +176,7 @@ public:
 class SVL_DLLPUBLIC DdeRequest : public DdeTransaction
 {
 public:
-            DdeRequest( DdeConnection&, const String&, long = 0 );
+            DdeRequest( DdeConnection&, const OUString&, long = 0 );
 };
 
 // -----------
@@ -186,10 +186,10 @@ public:
 class SVL_DLLPUBLIC DdePoke : public DdeTransaction
 {
 public:
-            DdePoke( DdeConnection&, const String&, const char*, long,
+            DdePoke( DdeConnection&, const OUString&, const char*, long,
                      sal_uLong = FORMAT_STRING, long = 0 );
-            DdePoke( DdeConnection&, const String&, SAL_UNUSED_PARAMETER const DdeData&, long = 0 );
-            DdePoke( DdeConnection&, const String&, const String&, long = 0 );
+            DdePoke( DdeConnection&, const OUString&, SAL_UNUSED_PARAMETER const DdeData&, long = 0 );
+            DdePoke( DdeConnection&, const OUString&, const OUString&, long = 0 );
 };
 
 // --------------
@@ -199,7 +199,7 @@ public:
 class SVL_DLLPUBLIC DdeExecute : public DdeTransaction
 {
 public:
-            DdeExecute( DdeConnection&, const String&, long = 0 );
+            DdeExecute( DdeConnection&, const OUString&, long = 0 );
 };
 
 // -----------------
@@ -216,7 +216,7 @@ class SVL_DLLPUBLIC DdeConnection
     DdeImp*         pImp;
 
 public:
-                    DdeConnection( SAL_UNUSED_PARAMETER const String&, SAL_UNUSED_PARAMETER const String& );
+                    DdeConnection( SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER const OUString& );
                     ~DdeConnection();
 
     long            GetError();
@@ -224,10 +224,10 @@ public:
 
     static const std::vector<DdeConnection*>& GetConnections();
 
-    sal_Bool            IsConnected();
+    bool            IsConnected();
 
-    const String&   GetServiceName();
-    const String&   GetTopicName();
+    const OUString  GetServiceName();
+    const OUString  GetTopicName();
 
 private:
                             DdeConnection( const DdeConnection& );
@@ -254,7 +254,7 @@ protected:
 
 public:
                     DdeItem( const sal_Unicode* );
-                    DdeItem( SAL_UNUSED_PARAMETER const String& );
+                    DdeItem( SAL_UNUSED_PARAMETER const OUString& );
                     DdeItem( const DdeItem& );
                     virtual ~DdeItem();
 
@@ -271,12 +271,12 @@ class SVL_DLLPUBLIC DdeGetPutItem : public DdeItem
 {
 public:
                     DdeGetPutItem( const sal_Unicode* p );
-                    DdeGetPutItem( const String& rStr );
+                    DdeGetPutItem( const OUString& rStr );
                     DdeGetPutItem( const DdeItem& rItem );
 
     virtual DdeData* Get( sal_uLong );
-    virtual sal_Bool    Put( const DdeData* );
-    virtual void    AdviseLoop( sal_Bool );     // AdviseLoop starten/stoppen
+    virtual bool    Put( const DdeData* );
+    virtual void    AdviseLoop( bool );     // AdviseLoop starten/stoppen
 };
 
 // ------------
@@ -291,15 +291,15 @@ public:
     virtual void    Connect( sal_IntPtr );
     virtual void    Disconnect( sal_IntPtr );
     virtual DdeData* Get( sal_uLong );
-    virtual sal_Bool    Put( const DdeData* );
-    virtual sal_Bool    Execute( const String* );
+    virtual bool    Put( const DdeData* );
+    virtual bool    Execute( const OUString* );
         // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden
-    virtual sal_Bool MakeItem( const OUString& rItem );
+    virtual bool    MakeItem( const OUString& rItem );
 
         // es wird ein Warm-/Hot-Link eingerichtet. Return-Wert
         // besagt ob es geklappt hat
-    virtual sal_Bool    StartAdviseLoop();
-    virtual sal_Bool    StopAdviseLoop();
+    virtual bool    StartAdviseLoop();
+    virtual bool    StopAdviseLoop();
 
 private:
     friend class    DdeInternal;
@@ -334,8 +334,8 @@ public:
     void            SetExecuteHdl( const Link& rLink ) { aExecLink = rLink; }
     const Link&     GetExecuteHdl() const { return aExecLink; }
 
-    void            NotifyClient( const String& );
-    sal_Bool            IsSystemTopic();
+    void            NotifyClient( const OUString& );
+    bool            IsSystemTopic();
 
     void            InsertItem( DdeItem* );     // fuer eigene Ableitungen!
     DdeItem*        AddItem( const DdeItem& );  // werden kopiert !
@@ -357,18 +357,18 @@ class SVL_DLLPUBLIC DdeService
     friend class    DdeInternal;
 
 public:
-    virtual sal_Bool    IsBusy();
-    virtual String  GetHelp();
+    virtual bool    IsBusy();
+    virtual OUString GetHelp();
         // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden
-    virtual sal_Bool    MakeTopic( const OUString& rItem );
+    virtual bool    MakeTopic( const OUString& rItem );
 
 protected:
-    virtual String  Topics();
-    virtual String  Formats();
-    virtual String  SysItems();
-    virtual String  Status();
-    virtual String  SysTopicGet( const String& );
-    virtual sal_Bool    SysTopicExecute( const String* );
+    virtual OUString Topics();
+    virtual OUString Formats();
+    virtual OUString SysItems();
+    virtual OUString Status();
+    virtual OUString SysTopicGet( const OUString& );
+    virtual bool    SysTopicExecute( const OUString* );
 
     const DdeTopic* GetSysTopic() const { return pSysTopic; }
 private:
@@ -379,13 +379,13 @@ private:
     ConvList*       pConv;
     short           nStatus;
 
-    SVL_DLLPRIVATE sal_Bool            HasCbFormat( sal_uInt16 );
+    SVL_DLLPRIVATE bool HasCbFormat( sal_uInt16 );
 
 public:
-                    DdeService( SAL_UNUSED_PARAMETER const String& );
+                    DdeService( SAL_UNUSED_PARAMETER const OUString& );
     virtual        ~DdeService();
 
-    const OUString GetName() const;
+    const OUString  GetName() const;
     short           GetError()              { return nStatus; }
 
     static DdeServices& GetServices();
@@ -396,7 +396,7 @@ public:
 
     void            AddFormat( sal_uLong );
     void            RemoveFormat( sal_uLong );
-    sal_Bool            HasFormat( sal_uLong );
+    bool            HasFormat( sal_uLong );
 
 private:
       //              DdeService( const DdeService& );
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 3e59baa..b16775f 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -65,9 +65,9 @@ public:
     virtual void            Redo();
     virtual void            RedoWithContext( SfxUndoContext& i_context );
     virtual void            Repeat(SfxRepeatTarget&);
-    virtual sal_Bool            CanRepeat(SfxRepeatTarget&) const;
+    virtual bool            CanRepeat(SfxRepeatTarget&) const;
 
-    virtual sal_Bool            Merge( SfxUndoAction *pNextAction );
+    virtual bool            Merge( SfxUndoAction *pNextAction );
 
     virtual OUString    GetComment() const;
     virtual OUString    GetRepeatComment(SfxRepeatTarget&) const;
@@ -172,13 +172,13 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
     virtual void            Redo();
     virtual void            RedoWithContext( SfxUndoContext& i_context );
     virtual void            Repeat(SfxRepeatTarget&);
-    virtual sal_Bool            CanRepeat(SfxRepeatTarget&) const;
+    virtual bool            CanRepeat(SfxRepeatTarget&) const;
 
-    virtual sal_Bool            Merge( SfxUndoAction *pNextAction );
+    virtual bool            Merge( SfxUndoAction *pNextAction );
 
-    virtual OUString    GetComment() const;
-    virtual OUString    GetRepeatComment(SfxRepeatTarget&) const;
-    virtual sal_uInt16  GetId() const;
+    virtual OUString        GetComment() const;
+    virtual OUString        GetRepeatComment(SfxRepeatTarget&) const;
+    virtual sal_uInt16      GetId() const;
 
     void SetComment(const OUString& rComment);
 
@@ -197,14 +197,14 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
 class SAL_NO_VTABLE SfxUndoListener
 {
 public:
-    virtual void actionUndone( const String& i_actionComment ) = 0;
-    virtual void actionRedone( const String& i_actionComment ) = 0;
-    virtual void undoActionAdded( const String& i_actionComment ) = 0;
+    virtual void actionUndone( const OUString& i_actionComment ) = 0;
+    virtual void actionRedone( const OUString& i_actionComment ) = 0;
+    virtual void undoActionAdded( const OUString& i_actionComment ) = 0;
     virtual void cleared() = 0;
     virtual void clearedRedo() = 0;
     virtual void resetAll() = 0;
-    virtual void listActionEntered( const String& i_comment ) = 0;
-    virtual void listActionLeft( const String& i_comment ) = 0;
+    virtual void listActionEntered( const OUString& i_comment ) = 0;
+    virtual void listActionLeft( const OUString& i_comment ) = 0;
     virtual void listActionLeftAndMerged() = 0;
     virtual void listActionCancelled() = 0;
     virtual void undoManagerDying() = 0;
@@ -231,7 +231,7 @@ namespace svl
         virtual void            SetMaxUndoActionCount( size_t nMaxUndoActionCount ) = 0;
         virtual size_t          GetMaxUndoActionCount() const = 0;
 
-        virtual void            AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False ) = 0;
+        virtual void            AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) = 0;
 
         virtual size_t          GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const = 0;
         virtual sal_uInt16      GetUndoActionId() const = 0;
@@ -242,8 +242,8 @@ namespace svl
         virtual OUString        GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
         virtual SfxUndoAction*  GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
 
-        virtual sal_Bool        Undo() = 0;
-        virtual sal_Bool        Redo() = 0;
+        virtual bool            Undo() = 0;
+        virtual bool            Redo() = 0;
 
         /** clears both the Redo and the Undo stack.
 
@@ -272,8 +272,8 @@ namespace svl
 
         virtual size_t          GetRepeatActionCount() const = 0;
         virtual OUString        GetRepeatActionComment( SfxRepeatTarget &rTarget) const = 0;
-        virtual sal_Bool        Repeat( SfxRepeatTarget &rTarget ) = 0;
-        virtual sal_Bool        CanRepeat( SfxRepeatTarget &rTarget ) const = 0;
+        virtual bool            Repeat( SfxRepeatTarget &rTarget ) = 0;
+        virtual bool            CanRepeat( SfxRepeatTarget &rTarget ) const = 0;
 
         virtual void            EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) = 0;
 
@@ -352,7 +352,7 @@ public:
     // IUndoManager overridables
     virtual void            SetMaxUndoActionCount( size_t nMaxUndoActionCount );
     virtual size_t          GetMaxUndoActionCount() const;
-    virtual void            AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False );
+    virtual void            AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false );
     virtual size_t          GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const;
     virtual sal_uInt16      GetUndoActionId() const;
     virtual OUString        GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
@@ -360,16 +360,16 @@ public:
     virtual size_t          GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const;
     virtual OUString        GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
     virtual SfxUndoAction*  GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
-    virtual sal_Bool        Undo();
-    virtual sal_Bool        Redo();
+    virtual bool            Undo();
+    virtual bool            Redo();
     virtual void            Clear();
     virtual void            ClearRedo();
     virtual void            Reset();
     virtual bool            IsDoing() const;
     virtual size_t          GetRepeatActionCount() const;
     virtual OUString        GetRepeatActionComment( SfxRepeatTarget &rTarget) const;
-    virtual sal_Bool        Repeat( SfxRepeatTarget &rTarget );
-    virtual sal_Bool        CanRepeat( SfxRepeatTarget &rTarget ) const;
+    virtual bool            Repeat( SfxRepeatTarget &rTarget );
+    virtual bool            CanRepeat( SfxRepeatTarget &rTarget ) const;
     virtual void            EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0);
     virtual size_t          LeaveListAction();
     virtual size_t          LeaveAndMergeListAction();
@@ -399,8 +399,8 @@ public:
     void            RemoveOldestUndoActions( size_t const i_count );
 
 protected:
-    sal_Bool UndoWithContext( SfxUndoContext& i_context );
-    sal_Bool RedoWithContext( SfxUndoContext& i_context );
+    bool    UndoWithContext( SfxUndoContext& i_context );
+    bool    RedoWithContext( SfxUndoContext& i_context );
 
     void    ImplClearRedo_NoLock( bool const i_currentLevel );
 
@@ -426,8 +426,8 @@ private:
     bool    ImplIsInListAction_Lock() const;
     void    ImplEnableUndo_Lock( bool const i_enable );
 
-    sal_Bool ImplUndo( SfxUndoContext* i_contextOrNull );
-    sal_Bool ImplRedo( SfxUndoContext* i_contextOrNull );
+    bool ImplUndo( SfxUndoContext* i_contextOrNull );
+    bool ImplRedo( SfxUndoContext* i_contextOrNull );
 
     friend class ::svl::undo::impl::LockGuard;
 };
@@ -462,19 +462,19 @@ public:
 
     virtual void            Undo();
     virtual void            Redo();
-    virtual sal_Bool            CanRepeat(SfxRepeatTarget& r) const;
+    virtual bool            CanRepeat(SfxRepeatTarget& r) const;
 
     virtual void            Repeat(SfxRepeatTarget&r);
 
-    virtual OUString    GetComment() const;
-    virtual OUString    GetRepeatComment(SfxRepeatTarget&r) const;
-    virtual sal_uInt16  GetId() const;
+    virtual OUString        GetComment() const;
+    virtual OUString        GetRepeatComment(SfxRepeatTarget&r) const;
+    virtual sal_uInt16      GetId() const;
 
     SfxUndoAction*          GetAction() const { return pAction; }
 
 protected:
-    ::svl::IUndoManager     *pUndoManager;
-    SfxUndoAction           *pAction;
+    ::svl::IUndoManager*    pUndoManager;
+    SfxUndoAction*          pAction;
 
 };
 
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 311e013..34521c8 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -22,7 +22,7 @@
 #include "svl/svldllapi.h"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/string.hxx>
+#include <tools/solar.h>
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/Locale.hpp>
@@ -447,11 +447,6 @@ public:
             rNewInserted==false and rCheckPos>0 the format code has errors
             and/or could not be converted.
      */
-    sal_uInt32 GetIndexPuttingAndConverting( String & rString, LanguageType eLnge,
-                                             LanguageType eSysLnge, short & rType,
-                                             bool & rNewInserted,
-                                             xub_StrLen & rCheckPos );
-
     sal_uInt32 GetIndexPuttingAndConverting( OUString & rString, LanguageType eLnge,
                                              LanguageType eSysLnge, short & rType,
                                              bool & rNewInserted, sal_Int32 & rCheckPos );
@@ -474,10 +469,6 @@ public:
 
     /// Format a number according to a format index, return string and color
     void GetOutputString( const double& fOutNumber, sal_uInt32 nFIndex,
-                          String& sOutString, Color** ppColor, bool bUseStarFormat = false );
-
-    /// Format a number according to a format index, return string and color
-    void GetOutputString( const double& fOutNumber, sal_uInt32 nFIndex,
                           OUString& sOutString, Color** ppColor, bool bUseStarFormat = false );
 
     /** Format a string according to a format index, return string and color.
@@ -489,9 +480,6 @@ public:
     /** Format a number according to the standard default format matching
         the given format index */
     void GetInputLineString( const double& fOutNumber,
-                             sal_uInt32 nFIndex, String& sOutString );
-
-    void GetInputLineString( const double& fOutNumber,
                              sal_uInt32 nFIndex, OUString& rOutString );
 
     /** Format a number according to a format code string to be scanned.
@@ -724,7 +712,7 @@ public:
         If ppEntry is not NULL and exactly one entry is found, a [$xxx-nnn] is
         returned, even if the format code only contains [$xxx] !
      */
-    bool    GetNewCurrencySymbolString( sal_uInt32 nFormat, String& rSymbol,
+    bool    GetNewCurrencySymbolString( sal_uInt32 nFormat, OUString& rSymbol,
                                         const NfCurrencyEntry** ppEntry = NULL,
                                         bool* pBank = NULL ) const;
 
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 468a7ad..af919ca 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -46,7 +46,7 @@ class E3dUndoAction : public SdrUndoAction
 
         virtual ~E3dUndoAction ();
 
-        virtual sal_Bool CanRepeat(SfxRepeatTarget&) const;
+        virtual bool CanRepeat(SfxRepeatTarget&) const;
 };
 
 /************************************************************************\
@@ -101,7 +101,7 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
 
         virtual ~E3dAttributesUndoAction();
 
-        virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
+        virtual bool CanRepeat(SfxRepeatTarget& rView) const;
         virtual void Undo();
         virtual void Redo();
         virtual void Repeat();
diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx
index 860742f..0b833eb 100644
--- a/include/svx/sdrundomanager.hxx
+++ b/include/svx/sdrundomanager.hxx
@@ -44,8 +44,8 @@ public:
     virtual ~SdrUndoManager();
 
     /// react depending on edit mode and if no more undo is possible
-    virtual sal_Bool Undo();
-    virtual sal_Bool Redo();
+    virtual bool Undo();
+    virtual bool Redo();
 
     // Call for the view which starts the interactive text edit. Use link to
     // activate (start text edit) and empty link to reset (end text edit). On
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 6684d10..f065394 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -62,7 +62,7 @@ public:
     TYPEINFO();
     virtual ~SdrUndoAction();
 
-    virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
+    virtual bool CanRepeat(SfxRepeatTarget& rView) const;
     virtual void Repeat(SfxRepeatTarget& rView);
 
     virtual OUString GetRepeatComment(SfxRepeatTarget& rView) const;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 220f31e..05c9520 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1031,7 +1031,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
         case SID_UNDO:
         {
             const OXUndoEnvironment::OUndoMode aLock( m_aReportModel->GetUndoEnv() );
-            sal_Bool ( SfxUndoManager::*doXDo )() =
+            bool ( SfxUndoManager::*doXDo )() =
                 ( _nId == SID_UNDO ) ? &SfxUndoManager::Undo : &SfxUndoManager::Redo;
 
             SfxUndoManager& rUndoManager( getUndoManager() );
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 6b5fbf6..d0e6741 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -51,11 +51,11 @@ enum ScAutoFontColorMode
 
 class SC_DLLPUBLIC ScPatternAttr: public SfxSetItem
 {
-    String*         pName;
+    OUString*       pName;
     ScStyleSheet*   pStyle;
 public:
     static ScDocument* pDoc;
-                            ScPatternAttr(SfxItemSet* pItemSet, const String& rStyleName);
+                            ScPatternAttr(SfxItemSet* pItemSet, const OUString& rStyleName);
                             ScPatternAttr(SfxItemSet* pItemSet, ScStyleSheet* pStyleSheet = NULL);
                             ScPatternAttr(SfxItemPool* pItemPool);
                             ScPatternAttr(const ScPatternAttr& rPatternAttr);
@@ -115,7 +115,7 @@ public:
 
     void                    SetStyleSheet(ScStyleSheet* pNewStyle, bool bClearDirectFormat = true);
     const ScStyleSheet*     GetStyleSheet() const  { return pStyle; }
-    const String*           GetStyleName() const;
+    const OUString*         GetStyleName() const;
     void                    UpdateStyleSheet();
     void                    StyleToName();
 
diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx
index f2a0255..f3abe11 100644
--- a/sc/inc/stlpool.hxx
+++ b/sc/inc/stlpool.hxx
@@ -47,13 +47,13 @@ public:
     void                CopyStdStylesFrom( ScStyleSheetPool* pSrcPool );
 
     void                CopyStyleFrom( ScStyleSheetPool* pSrcPool,
-                                        const String& rName, SfxStyleFamily eFamily );
+                                       const OUString& rName, SfxStyleFamily eFamily );
 
-    ScStyleSheet*       FindCaseIns( const String& rName, SfxStyleFamily eFam );
+    ScStyleSheet*       FindCaseIns( const OUString& rName, SfxStyleFamily eFam );
 
-    const String*       GetForceStdName() const { return pForceStdName; }
+    const OUString*     GetForceStdName() const { return pForceStdName; }
 
-    virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam,
+    virtual SfxStyleSheetBase& Make( const OUString&, SfxStyleFamily eFam,
                                      sal_uInt16 nMask = SFXSTYLEBIT_ALL, sal_uInt16 nPos = 0xffff );
 
 protected:
@@ -61,15 +61,15 @@ protected:
 
     using SfxStyleSheetPool::Create;    // calcwarnings: Create(const SfxStyleSheet&) - ever used?
 
-    virtual SfxStyleSheetBase* Create( const String&    rName,
+    virtual SfxStyleSheetBase* Create( const OUString&  rName,
                                        SfxStyleFamily   eFamily,
-                                       sal_uInt16           nMask);
+                                       sal_uInt16       nMask);
     virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle );
 
 private:
     SfxStyleSheetBase*  pActualStyleSheet;
     ScDocument*         pDoc;
-    const String*       pForceStdName;
+    const OUString*       pForceStdName;
 };
 
 #endif     // SC_STLPOOL_HXX
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index c66d536..28e4a9d 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -51,17 +51,17 @@ public:
 
                         ScStyleSheet( const ScStyleSheet& rStyle );
 
-    virtual bool        SetParent        ( const String& rParentName );
+    virtual bool        SetParent        ( const OUString& rParentName );
     virtual SfxItemSet& GetItemSet       ();
     virtual bool        IsUsed           () const;
     virtual bool        HasFollowSupport () const;
     virtual bool        HasParentSupport () const;
 
-    virtual const String& GetName() const;
-    virtual const String& GetParent() const;
-    virtual const String& GetFollow() const;
+    virtual const OUString& GetName() const;
+    virtual const OUString& GetParent() const;
+    virtual const OUString& GetFollow() const;
 
-    virtual bool SetName( const String& );
+    virtual bool SetName( const OUString& );
 
             void                SetUsage( ScStyleSheet::Usage eUse ) const
                                     { eUsage = eUse; }
@@ -71,10 +71,10 @@ public:
 protected:
     virtual             ~ScStyleSheet();
 
-                ScStyleSheet( const String&     rName,
+                ScStyleSheet( const OUString&   rName,
                               ScStyleSheetPool& rPool,
                               SfxStyleFamily    eFamily,
-                              sal_uInt16            nMask );
+                              sal_uInt16        nMask );
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 };
diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx
index 33fd541..50357f1 100644
--- a/sc/inc/undorangename.hxx
+++ b/sc/inc/undorangename.hxx
@@ -31,7 +31,7 @@ public:
     virtual void Undo();
     virtual void Redo();
     virtual void Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool CanRepeat(SfxRepeatTarget& rTarget) const;
     virtual OUString GetComment() const;
 
 private:
@@ -53,7 +53,7 @@ public:
     virtual void Undo();
     virtual void Redo();
     virtual void Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool CanRepeat(SfxRepeatTarget& rTarget) const;
     virtual OUString GetComment() const;
 
 private:
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index 1dbb74e..c132a8a 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -30,7 +30,7 @@ class SvNumberFormatter;
 
 class ScNumFormatAbbrev
 {
-    String sFormatstring;
+    OUString sFormatstring;
     LanguageType eLnge;
     LanguageType eSysLnge;
 public:
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 4954ac0..684c32a 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -679,7 +679,7 @@ void ScDocumentPool::CellStyleCreated( const String& rName )
                 static_cast<ScPatternAttr const*>(GetItem2(ATTR_PATTERN, i)));
         if ( pPattern && pPattern->GetStyleSheet() == NULL )
         {
-            const String* pStyleName = pPattern->GetStyleName();
+            const OUString* pStyleName = pPattern->GetStyleName();
             if ( pStyleName && *pStyleName == rName )
                 pPattern->UpdateStyleSheet();           // find and store style pointer
         }
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index bff62bd..abaf088 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -963,7 +963,7 @@ OUString ScDPCache::GetFormattedString(long nDim, const ScDPItemData& rItem) con
         if (pFormatter)
         {
             Color* pColor = NULL;
-            String aStr;
+            OUString aStr;
             pFormatter->GetOutputString(rItem.GetValue(), nNumFormat, aStr, &pColor);
             return aStr;
         }
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index d7bf56f..e4240ba 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -110,7 +110,7 @@ OUString ScDPUtil::getDateGroupName(
 
             sal_uLong nFormat = pFormatter->GetFormatIndex(NF_DATE_SYS_DDMMM, ScGlobal::eLnge);
             Color* pColor;
-            String aStr;
+            OUString aStr;
             pFormatter->GetOutputString(nDays, nFormat, aStr, &pColor);
             return aStr;
         }
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index af1d5c9..3e18fa4 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -72,9 +72,9 @@ using sc::TwipsToHMM;
 
 // -----------------------------------------------------------------------
 
-ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const String& rStyleName )
+ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const OUString& rStyleName )
     :   SfxSetItem  ( ATTR_PATTERN, pItemSet ),
-        pName       ( new String( rStyleName ) ),
+        pName       ( new OUString( rStyleName ) ),
         pStyle      ( NULL )
 {
 }
@@ -100,7 +100,7 @@ ScPatternAttr::ScPatternAttr( const ScPatternAttr& rPatternAttr )
         pStyle      ( rPatternAttr.pStyle )
 {
     if (rPatternAttr.pName)
-        pName = new String(*rPatternAttr.pName);
+        pName = new OUString(*rPatternAttr.pName);
     else
         pName = NULL;
 }
@@ -115,12 +115,12 @@ SfxPoolItem* ScPatternAttr::Clone( SfxItemPool *pPool ) const
     ScPatternAttr* pPattern = new ScPatternAttr( GetItemSet().Clone(true, pPool) );
 
     pPattern->pStyle = pStyle;
-    pPattern->pName  = pName ? new String(*pName) : NULL;
+    pPattern->pName  = pName ? new OUString(*pName) : NULL;
 
     return pPattern;
 }
 
-inline int StrCmp( const String* pStr1, const String* pStr2 )
+inline int StrCmp( const OUString* pStr1, const OUString* pStr2 )
 {
     return ( pStr1 ? ( pStr2 ? ( *pStr1 == *pStr2 ) : false ) : ( pStr2 ? false : true ) );
 }
@@ -150,7 +150,7 @@ int ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const
 
 SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ ) const
 {
-    String* pStr;
+    OUString* pStr;
     sal_Bool    bHasStyle;
 
     rStream >> bHasStyle;
@@ -158,12 +158,12 @@ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */
     if ( bHasStyle )
     {
         short   eFamDummy;
-        pStr = new String;
+        pStr = new OUString;
         *pStr = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
         rStream >> eFamDummy; // wg. altem Dateiformat
     }
     else
-        pStr = new String( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) );
+        pStr = new OUString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) );
 
     SfxItemSet *pNewSet = new SfxItemSet( *GetItemSet().GetPool(),
                                        ATTR_PATTERN_START, ATTR_PATTERN_END );
@@ -1117,7 +1117,7 @@ bool ScPatternAttr::IsVisibleEqual( const ScPatternAttr& rOther ) const
     //!     auch hier nur wirklich sichtbare Werte testen !!!
 }
 
-const String* ScPatternAttr::GetStyleName() const
+const OUString* ScPatternAttr::GetStyleName() const
 {
     return pName ? pName : ( pStyle ? &pStyle->GetName() : NULL );
 }
@@ -1184,7 +1184,7 @@ void ScPatternAttr::StyleToName()
         if ( pName )
             *pName = pStyle->GetName();
         else
-            pName = new String( pStyle->GetName() );
+            pName = new OUString( pStyle->GetName() );
 
         pStyle = NULL;
         GetItemSet().SetParent( NULL );
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index c008123..da1ddb3 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -80,8 +80,8 @@ void ScStyleSheetPool::SetDocument( ScDocument* pDocument )
 
 //------------------------------------------------------------------------
 
-SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName,
-                            SfxStyleFamily eFam, sal_uInt16 mask, sal_uInt16 nPos )
+SfxStyleSheetBase& ScStyleSheetPool::Make( const OUString& rName,
+                                           SfxStyleFamily eFam, sal_uInt16 mask, sal_uInt16 nPos )
 {
     //  When updating styles from a template, Office 5.1 sometimes created
     //  files with multiple default styles.
@@ -89,13 +89,13 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName,
 
     //! only when loading?
 
-    if ( rName.EqualsAscii(STRING_STANDARD) && Find( rName, eFam ) != NULL )
+    if ( rName == STRING_STANDARD && Find( rName, eFam ) != NULL )
     {
         OSL_FAIL("renaming additional default style");
         sal_uInt32 nCount = aStyles.size();
         for ( sal_uInt32 nAdd = 1; nAdd <= nCount; nAdd++ )
         {
-            String aNewName = ScGlobal::GetRscString(STR_STYLENAME_STANDARD);
+            OUString aNewName = ScGlobal::GetRscString(STR_STYLENAME_STANDARD);
             aNewName += OUString::number( nAdd );
             if ( Find( aNewName, eFam ) == NULL )
                 return SfxStyleSheetPool::Make( aNewName, eFam, mask, nPos );
@@ -107,10 +107,9 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName,
 
 //------------------------------------------------------------------------
 
-SfxStyleSheetBase* ScStyleSheetPool::Create(
-                                            const String&   rName,
-                                            SfxStyleFamily  eFamily,
-                                            sal_uInt16          nMaskP )
+SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString&   rName,
+                                             SfxStyleFamily  eFamily,
+                                             sal_uInt16          nMaskP )
 {
     ScStyleSheet* pSheet = new ScStyleSheet( rName, *this, eFamily, nMaskP );
     if ( eFamily == SFX_STYLE_FAMILY_PARA && ScGlobal::GetRscString(STR_STYLENAME_STANDARD) != rName )
@@ -144,7 +143,7 @@ void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle )
 //------------------------------------------------------------------------
 
 void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool,
-                                        const String& rName, SfxStyleFamily eFamily )
+                                      const OUString& rName, SfxStyleFamily eFamily )
 {
     //  this ist Dest-Pool
 
@@ -483,9 +482,9 @@ void ScStyleSheetPool::CreateStandardStyles()
 //------------------------------------------------------------------------
 
 
-ScStyleSheet* ScStyleSheetPool::FindCaseIns( const String& rName, SfxStyleFamily eFam )
+ScStyleSheet* ScStyleSheetPool::FindCaseIns( const OUString& rName, SfxStyleFamily eFam )
 {
-    String aUpSearch = ScGlobal::pCharClass->uppercase(rName);
+    OUString aUpSearch = ScGlobal::pCharClass->uppercase(rName);
 
     sal_uInt32 nCount = aStyles.size();
     for (sal_uInt32 n=0; n<nCount; n++)
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index eaa692a..c7c4fd1 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -50,12 +50,12 @@ TYPEINIT1(ScStyleSheet, SfxStyleSheet);
 
 //========================================================================
 
-ScStyleSheet::ScStyleSheet( const String&       rName,
+ScStyleSheet::ScStyleSheet( const OUString&     rName,
                             ScStyleSheetPool&   rPoolP,
                             SfxStyleFamily      eFamily,
-                            sal_uInt16              nMaskP )
+                            sal_uInt16          nMaskP )
 
-    :   SfxStyleSheet   ( rName, rPoolP, eFamily, nMaskP )
+    : SfxStyleSheet   ( rName, rPoolP, eFamily, nMaskP )
     , eUsage( UNKNOWN )
 {
 }
@@ -89,9 +89,9 @@ bool ScStyleSheet::HasParentSupport () const
 
     switch ( GetFamily() )
     {
-        case SFX_STYLE_FAMILY_PARA: bHasParentSupport = true;   break;
-        case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = false;  break;
-        default:
+    case SFX_STYLE_FAMILY_PARA: bHasParentSupport = true;   break;
+    case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = false;  break;
+    default:
         {
             // added to avoid warnings
         }
@@ -102,10 +102,10 @@ bool ScStyleSheet::HasParentSupport () const
 
 //------------------------------------------------------------------------
 
-bool ScStyleSheet::SetParent( const String& rParentName )
+bool ScStyleSheet::SetParent( const OUString& rParentName )
 {
     bool bResult = false;
-    String aEffName = rParentName;
+    OUString aEffName = rParentName;
     SfxStyleSheetBase* pStyle = pPool->Find( aEffName, nFamily );
     if (!pStyle)
     {
@@ -285,30 +285,30 @@ void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint )
 //  schmutzige Tricks, um die Standard-Vorlage immer als "Standard" zu speichern,
 //  obwohl der fuer den Benutzer sichtbare Name uebersetzt ist:
 
-const String& ScStyleSheet::GetName() const
+const OUString& ScStyleSheet::GetName() const
 {
-    const String& rBase = SfxStyleSheet::GetName();
-    const String* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName();
+    const OUString& rBase = SfxStyleSheet::GetName();
+    const OUString* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName();
     if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
         return *pForceStdName;
     else
         return rBase;
 }
 
-const String& ScStyleSheet::GetParent() const
+const OUString& ScStyleSheet::GetParent() const
 {
-    const String& rBase = SfxStyleSheet::GetParent();
-    const String* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName();
+    const OUString& rBase = SfxStyleSheet::GetParent();
+    const OUString* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName();
     if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
         return *pForceStdName;
     else
         return rBase;
 }
 
-const String& ScStyleSheet::GetFollow() const
+const OUString& ScStyleSheet::GetFollow() const
 {
-    const String& rBase = SfxStyleSheet::GetFollow();
-    const String* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName();
+    const OUString& rBase = SfxStyleSheet::GetFollow();
+    const OUString* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName();
     if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
         return *pForceStdName;
     else
@@ -323,9 +323,9 @@ const String& ScStyleSheet::GetFollow() const
 //! Flag gesetzt und abgefragt werden.
 //! Die ganze Abfrage muss raus, wenn fuer eine neue Datei-Version die Namens-Umsetzung wegfaellt.
 
-bool ScStyleSheet::SetName( const String& rNew )
+bool ScStyleSheet::SetName( const OUString& rNew )
 {
-    String aFileStdName = OUString(STRING_STANDARD);
+    OUString aFileStdName = OUString(STRING_STANDARD);
     if ( rNew == aFileStdName && aFileStdName != ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
         return false;
     else
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index c605a97..5df6257 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1068,8 +1068,9 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
 
                         Color* pColor;
                         sal_uLong nNumFmt = GetNumberFormat( nSrcX, nSrcY );
-                        pDocument->GetFormatTable()->
-                            GetOutputString( nVal, nNumFmt, aValue, &pColor );
+                        OUString sTmp(aValue);
+                        pDocument->GetFormatTable()->GetOutputString( nVal, nNumFmt, sTmp, &pColor );
+                        aValue = sTmp;
                     }
                     break;
                     //  not for formulas
@@ -1153,8 +1154,9 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
                     //! Zahlformat je nach Index holen?
                     Color* pColor;
                     sal_uLong nNumFmt = GetNumberFormat( nCol1, nRow1 );
-                    pDocument->GetFormatTable()->
-                        GetOutputString( nStart, nNumFmt, aValue, &pColor );
+                    OUString sTmp(aValue);
+                    pDocument->GetFormatTable()->GetOutputString( nStart, nNumFmt, sTmp, &pColor );
+                    aValue = sTmp;
                 }
             }
         }
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 9f6ae62..540eb55 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -824,7 +824,7 @@ bool lcl_maybeReplaceCellString(
         rCol = nCol;
         rRow = nRow;
         if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
-            rSearchItem.GetReplaceString().Len())
+            !rSearchItem.GetReplaceString().isEmpty())
         {
             rColObj.SetRawString(nRow, rSearchItem.GetReplaceString());
             rUndoStr = OUString();
@@ -952,7 +952,7 @@ bool ScTable::SearchRangeForAllEmptyCells(
 {
     bool bFound = false;
     bool bReplace = (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL) &&
-                    (rSearchItem.GetReplaceString().Len() > 0);
+                    !rSearchItem.GetReplaceString().isEmpty();
     bool bSkipFiltered = rSearchItem.IsSearchFiltered();
 
     for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 175c3db..4d72c98 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -450,9 +450,9 @@ bool ScValidationData::IsDataValid(
             // determine length, otherwise a once accepted value maybe could
             // not be edited again, for example abbreviated dates or leading
             // zeros or trailing zeros after decimal separator change length.
-            String aStr;
+            OUString aStr;
             pFormatter->GetInputLineString( nVal, nFormat, aStr);
-            nLenVal = static_cast<double>( aStr.Len() );
+            nLenVal = static_cast<double>( aStr.getLength() );
         }
         ScRefCellValue aTmpCell(nLenVal);
         bRet = IsCellValid(aTmpCell, rPos);
@@ -758,7 +758,11 @@ bool ScValidationData::GetSelectionFromFormula(
                             (SCROW)(nRow+aRange.aStart.Row()), aRange.aStart.Tab() , aValStr);
                     }
                     else
-                        pFormatter->GetInputLineString( nMatVal.fVal, 0, aValStr );
+                    {
+                        OUString sTmp(aValStr);
+                        pFormatter->GetInputLineString( nMatVal.fVal, 0, sTmp );
+                        aValStr = sTmp;
+                    }
                 }
 
                 if (!rCell.isEmpty() && rMatch < 0)
diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx
index a892eb4..11743c7 100644
--- a/sc/source/core/tool/rangeseq.cxx
+++ b/sc/source/core/tool/rangeseq.cxx
@@ -221,7 +221,7 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa
         OUString* pColAry = aColSeq.getArray();
         for (SCSIZE nCol = 0; nCol < nColCount; nCol++)
         {
-            String aStr;
+            OUString aStr;
             if ( pMatrix->IsString( nCol, nRow ) )
             {
                 if ( !pMatrix->IsEmpty( nCol, nRow ) )
@@ -233,7 +233,7 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa
                 Color* pColor;
                 pFormatter->GetOutputString( fVal, 0, aStr, &pColor );
             }
-            pColAry[nCol] = OUString( aStr );
+            pColAry[nCol] = aStr;
         }
 
         pRowAry[nRow] = aColSeq;
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index 6c75a59..3611c71 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -25,12 +25,10 @@
 #include "zforauto.hxx"
 #include "global.hxx"
 
-static const sal_Char pStandardName[] = "Standard";
-
 //------------------------------------------------------------------------
 
 ScNumFormatAbbrev::ScNumFormatAbbrev() :
-    sFormatstring   ( pStandardName ),
+    sFormatstring   ( "Standard" ),
     eLnge           (LANGUAGE_SYSTEM),
     eSysLnge        (LANGUAGE_GERMAN)       // sonst passt "Standard" nicht
 {
@@ -81,7 +79,7 @@ void ScNumFormatAbbrev::PutFormatIndex(sal_uLong nFormat,
         OSL_FAIL("SCNumFormatAbbrev:: unknown number format");
         eLnge = LANGUAGE_SYSTEM;
         eSysLnge = LANGUAGE_GERMAN;     // sonst passt "Standard" nicht
-        sFormatstring.AssignAscii( RTL_CONSTASCII_STRINGPARAM( pStandardName ) );
+        sFormatstring = "Standard";
     }
 }
 
@@ -89,9 +87,9 @@ sal_uLong ScNumFormatAbbrev::GetFormatIndex( SvNumberFormatter& rFormatter)
 {
     short nType;
     bool bNewInserted;
-    xub_StrLen nCheckPos;
+    sal_Int32 nCheckPos;
     return rFormatter.GetIndexPuttingAndConverting( sFormatstring, eLnge,
-            eSysLnge, nType, bNewInserted, nCheckPos);
+                                                    eSysLnge, nType, bNewInserted, nCheckPos);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index c3ab137..3976927 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -2722,7 +2722,7 @@ sal_uInt32 XclExpXFBuffer::InsertStyleXF( const SfxStyleSheetBase& rStyleSheet )
         {
             maXFList.AppendNewRecord( new XclExpXF( GetRoot(), rStyleSheet ) );
             // create the STYLE record
-            if( rStyleSheet.GetName().Len() )
+            if( !rStyleSheet.GetName().isEmpty() )
                 maStyleList.AppendNewRecord( new XclExpStyle( nXFId, rStyleSheet.GetName() ) );
         }
         else
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index cad6188..fd97da6 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -372,7 +372,9 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu
                                 pFormatter->GetFormatForLanguageIfBuiltIn(
                                         nIndex, LANGUAGE_SYSTEM);
                             OSL_ENSURE( nNewIndex != nIndex, "ScEEImport::WriteToDocument: NumbersEnglishUS not a built-in format?");
-                            pFormatter->GetInputLineString( fEnVal, nNewIndex, aStr);
+                            OUString sTemp(aStr);
+                            pFormatter->GetInputLineString( fEnVal, nNewIndex, sTemp);
+                            aStr = sTemp;
                         }
                         else
                             bTextFormat = true;
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index d585686..d37f2d4 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -64,7 +64,7 @@ const ScCellValue& ScMyCellInfo::CreateCell( ScDocument* pDoc )
         maCell.mpFormula->SetMatColsRows(static_cast<SCCOL>(nMatrixCols), static_cast<SCROW>(nMatrixRows));
     }
 
-    if ((nType == NUMBERFORMAT_DATE || nType == NUMBERFORMAT_TIME) && sInputString.Len() == 0)
+    if ((nType == NUMBERFORMAT_DATE || nType == NUMBERFORMAT_TIME) && sInputString.isEmpty())
     {
         sal_uInt32 nFormat(0);
         if (nType == NUMBERFORMAT_DATE)
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
index ea565c5..b08be61 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
@@ -39,7 +39,7 @@ struct ScMyCellInfo
     ScCellValue maCell;
     OUString      sFormulaAddress;
     OUString      sFormula;
-    String             sInputString;
+    OUString          sInputString;
     double             fValue;
     sal_Int32          nMatrixCols;
     sal_Int32          nMatrixRows;
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 445766e..5b1c58f 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -900,7 +900,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos)
         rXMLImport.GetMM100UnitConverter().convertDateTime( fDate, mxAnnotationData->maCreateDate );
         SvNumberFormatter* pNumForm = pDoc->GetFormatTable();
         sal_uInt32 nfIndex = pNumForm->GetFormatIndex( NF_DATE_SYS_DDMMYYYY, LANGUAGE_SYSTEM );
-        String aDate;
+        OUString aDate;
         Color* pColor = 0;
         Color** ppColor = &pColor;
         pNumForm->GetOutputString( fDate, nfIndex, aDate, ppColor );
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 48ed4c6..8d9e181 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2064,13 +2064,13 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
     rbFooter = ((const SfxBoolItem&)pSet->Get(ATTR_PAGE_ON)).GetValue();
 }
 
-long ScDocShell::DdeGetData( const String& rItem,
-                                      const String& rMimeType,
-                                      ::com::sun::star::uno::Any & rValue )
+long ScDocShell::DdeGetData( const OUString& rItem,
+                             const OUString& rMimeType,
+                             ::com::sun::star::uno::Any & rValue )
 {
     if( FORMAT_STRING == SotExchange::GetFormatIdFromMimeType( rMimeType ) )
     {
-        if( rItem.EqualsIgnoreCaseAscii( "Format" ) )
+        if( rItem.equalsIgnoreAsciiCase( "Format" ) )
         {
             OString aFmtByte(OUStringToOString(aDdeTextFmt,
                 osl_getThreadTextEncoding()));
@@ -2114,13 +2114,13 @@ long ScDocShell::DdeGetData( const String& rItem,
     return 0;
 }
 
-long ScDocShell::DdeSetData( const String& rItem,
-                                        const String& rMimeType,
-                                const ::com::sun::star::uno::Any & rValue )
+long ScDocShell::DdeSetData( const OUString& rItem,
+                             const OUString& rMimeType,
+                             const ::com::sun::star::uno::Any & rValue )
 {
     if( FORMAT_STRING == SotExchange::GetFormatIdFromMimeType( rMimeType ))
     {
-        if( rItem.EqualsIgnoreCaseAscii( "Format" ) )
+        if( rItem.equalsIgnoreAsciiCase( "Format" ) )
         {
             if ( ScByteSequenceToString::GetString( aDdeTextFmt, rValue, osl_getThreadTextEncoding() ) )
             {
@@ -2153,7 +2153,7 @@ long ScDocShell::DdeSetData( const String& rItem,
     return 0;
 }
 
-::sfx2::SvLinkSource* ScDocShell::DdeCreateLinkSource( const String& rItem )
+::sfx2::SvLinkSource* ScDocShell::DdeCreateLinkSource( const OUString& rItem )
 {
     //  only check for valid item string - range is parsed again in ScServerObject ctor
 
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 522a277..37ee0e2 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -341,10 +341,13 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
         if ( pFCell->IsValue() )
         {
             double n = pFCell->GetValue();
+            OUString sTempOut(rStrResult);
             sal_uLong nFormat = aFormatter.GetStandardFormat( n, 0,
                             pFCell->GetFormatType(), ScGlobal::eLnge );
+
             aFormatter.GetOutputString( n, nFormat,
-                                        rStrResult, &pColor );
+                                        sTempOut, &pColor );
+            rStrResult = sTempOut;
         }
         else
         {
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index d761f7f..ec2201f 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -373,11 +373,11 @@ public:
                                                bool&             rbHeader,
                                                bool&             rbFooter );
 
-    virtual long DdeGetData( const String& rItem, const String& rMimeType,
+    virtual long DdeGetData( const OUString& rItem, const OUString& rMimeType,
                                 ::com::sun::star::uno::Any & rValue );
-    virtual long DdeSetData( const String& rItem, const String& rMimeType,
+    virtual long DdeSetData( const OUString& rItem, const OUString& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue );
-    virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const String& rItem );
+    virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem );
 
     const String& GetDdeTextFmt() const { return aDdeTextFmt; }
 
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 6943408..e57e308 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -42,7 +42,7 @@ public:
                     ScSimpleUndo( ScDocShell* pDocSh );
     virtual         ~ScSimpleUndo();
 
-    virtual sal_Bool    Merge( SfxUndoAction *pNextAction );
+    virtual bool    Merge( SfxUndoAction *pNextAction );
 
 protected:
     ScDocShell*     pDocShell;
@@ -180,8 +180,8 @@ public:
     virtual void            Undo();
     virtual void            Redo();
     virtual void            Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool        CanRepeat(SfxRepeatTarget& rTarget) const;
-    virtual sal_Bool        Merge( SfxUndoAction *pNextAction );
+    virtual bool            CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool            Merge( SfxUndoAction *pNextAction );
     virtual OUString        GetComment() const;
     virtual OUString        GetRepeatComment(SfxRepeatTarget&) const;
     virtual sal_uInt16      GetId() const;
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 470e7d3..def653f 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -54,11 +54,11 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat( SfxRepeatTarget& rTarget );
-    virtual sal_Bool    CanRepeat( SfxRepeatTarget& rTarget ) const;
+    virtual bool    CanRepeat( SfxRepeatTarget& rTarget ) const;
 
     virtual OUString GetComment() const;
 
-    virtual sal_Bool    Merge( SfxUndoAction *pNextAction );
+    virtual bool    Merge( SfxUndoAction *pNextAction );
 
 private:
     ScRange         aEffRange;
@@ -87,7 +87,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -118,7 +118,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -150,7 +150,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -199,7 +199,7 @@ public:
     virtual void Undo();
     virtual void Redo();
     virtual void Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -233,7 +233,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -266,7 +266,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -300,7 +300,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -339,7 +339,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -362,24 +362,24 @@ private:
 class ScUndoWidthOrHeight: public ScSimpleUndo
 {
 public:
-                            TYPEINFO();
-                            ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
-                                    const ScMarkData& rMark,
-                                    SCCOLROW nNewStart, SCTAB nNewStartTab,
-                                    SCCOLROW nNewEnd, SCTAB nNewEndTab,
-                                    ScDocument* pNewUndoDoc,
-                                    SCCOLROW nNewCnt, SCCOLROW* pNewRanges,
-                                    ScOutlineTable* pNewUndoTab,
-                                    ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips,
-                                    sal_Bool bNewWidth );
-    virtual                 ~ScUndoWidthOrHeight();
+                    TYPEINFO();
+                    ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
+                                         const ScMarkData& rMark,
+                                         SCCOLROW nNewStart, SCTAB nNewStartTab,
+                                         SCCOLROW nNewEnd, SCTAB nNewEndTab,
+                                         ScDocument* pNewUndoDoc,
+                                         SCCOLROW nNewCnt, SCCOLROW* pNewRanges,
+                                         ScOutlineTable* pNewUndoTab,
+                                         ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips,
+                                         sal_Bool bNewWidth );
+    virtual         ~ScUndoWidthOrHeight();
 
-    virtual void            Undo();
-    virtual void            Redo();
-    virtual void            Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool        CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual void    Undo();
+    virtual void    Redo();
+    virtual void    Repeat(SfxRepeatTarget& rTarget);
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
-    virtual OUString   GetComment() const;
+    virtual OUString GetComment() const;
 
 private:
     ScMarkData      aMarkData;
@@ -413,7 +413,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -445,7 +445,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -472,7 +472,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -498,7 +498,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -533,7 +533,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -551,49 +551,48 @@ private:
 class ScUndoConversion : public ScSimpleUndo
 {
 public:
-                            TYPEINFO();
+                    TYPEINFO();
 
-                            ScUndoConversion(
-                                ScDocShell* pNewDocShell, const ScMarkData& rMark,
-                                SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocument* pNewUndoDoc,
-                                SCCOL nNewX, SCROW nNewY, SCTAB nNewZ, ScDocument* pNewRedoDoc,
-                                const ScConversionParam& rConvParam );
-    virtual                 ~ScUndoConversion();
+                    ScUndoConversion( ScDocShell* pNewDocShell, const ScMarkData& rMark,
+                                      SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocument* pNewUndoDoc,
+                                      SCCOL nNewX, SCROW nNewY, SCTAB nNewZ, ScDocument* pNewRedoDoc,
+                                      const ScConversionParam& rConvParam );
+    virtual         ~ScUndoConversion();
 
-    virtual void            Undo();
-    virtual void            Redo();
-    virtual void            Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool        CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual void    Undo();
+    virtual void    Redo();
+    virtual void    Repeat(SfxRepeatTarget& rTarget);
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
-    virtual OUString   GetComment() const;
+    virtual OUString GetComment() const;
 
 private:
-    ScMarkData              aMarkData;
-    ScAddress               aCursorPos;
-    ScDocument*             pUndoDoc;           // Block mark and deleted data
-    ScAddress               aNewCursorPos;
-    ScDocument*             pRedoDoc;           // Block mark and new data
-    sal_uLong                   nStartChangeAction;
-    sal_uLong                   nEndChangeAction;
-    ScConversionParam       maConvParam;        /// Conversion type and parameters.
+    ScMarkData      aMarkData;
+    ScAddress       aCursorPos;
+    ScDocument*     pUndoDoc;           // Block mark and deleted data
+    ScAddress       aNewCursorPos;
+    ScDocument*     pRedoDoc;           // Block mark and new data
+    sal_uLong       nStartChangeAction;
+    sal_uLong       nEndChangeAction;
+    ScConversionParam maConvParam;        /// Conversion type and parameters.
 
-    void                    DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPos );
-    void                    SetChangeTrack();
+    void            DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPos );
+    void            SetChangeTrack();
 };
 
 class ScUndoRefConversion: public ScSimpleUndo
 {
 public:
-                        TYPEINFO();
-                        ScUndoRefConversion( ScDocShell* pNewDocShell,
-                            const ScRange& aMarkRange, const ScMarkData& rMark,
-                            ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, sal_Bool bNewMulti, sal_uInt16 nNewFlag);
-    virtual             ~ScUndoRefConversion();
+                    TYPEINFO();
+                    ScUndoRefConversion( ScDocShell* pNewDocShell,
+                                         const ScRange& aMarkRange, const ScMarkData& rMark,
+                                         ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, sal_Bool bNewMulti, sal_uInt16 nNewFlag);
+    virtual         ~ScUndoRefConversion();
 
-    virtual void        Undo();
-    virtual void        Redo();
-    virtual void        Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual void    Undo();
+    virtual void    Redo();
+    virtual void    Repeat(SfxRepeatTarget& rTarget);
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -623,7 +622,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual OUString GetComment() const;
 
@@ -638,19 +637,19 @@ private:
 class ScUndoUseScenario: public ScSimpleUndo
 {
 public:
-                            TYPEINFO();
-                            ScUndoUseScenario( ScDocShell* pNewDocShell,
-                                    const ScMarkData& rMark,
-                                    const ScArea& rDestArea, ScDocument* pNewUndoDoc,
-                                    const String& rNewName );
-    virtual                 ~ScUndoUseScenario();
+                    TYPEINFO();
+                    ScUndoUseScenario( ScDocShell* pNewDocShell,
+                                       const ScMarkData& rMark,
+                                       const ScArea& rDestArea, ScDocument* pNewUndoDoc,
+                                       const String& rNewName );
+    virtual         ~ScUndoUseScenario();
 
-    virtual void            Undo();
-    virtual void            Redo();
-    virtual void            Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool        CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual void    Undo();
+    virtual void    Redo();
+    virtual void    Repeat(SfxRepeatTarget& rTarget);
+    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list