remove some tools/string.hxx

4 files changed, 22 insertions, 33 deletions

diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index d6bb8b23ffe8..279dba93d665 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -50,24 +50,15 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString&
     aBeforeBtn( this, CUI_RES( CB_POS_BEFORE ) ),
     aAfterBtn( this, CUI_RES( CB_POS_AFTER ) ),
     aPosFL( this, CUI_RES( FL_POS ) ),
-    aRow(CUI_RES(STR_ROW)),
-    aCol(CUI_RES(STR_COL)),
+    aRow(ResId::toString(CUI_RES(STR_ROW))),
+    aCol(ResId::toString(CUI_RES(STR_COL))),
     aOKBtn( this, CUI_RES( BT_OK ) ),
     aCancelBtn( this, CUI_RES( BT_CANCEL ) ),
     aHelpBtn( this, CUI_RES( BT_HELP ) ),
     bColumn( bCol )
 {
     FreeResource();
-    String aTmp;
-    if( bColumn )
-    {
-        aTmp += aCol;
-    }
-    else
-    {
-        aTmp += aRow;
-    }
-    SetText( aTmp );
+    SetText( bColumn ? aCol : aRow );
     SetHelpId( sHelpId );
 }
 
@@ -76,6 +67,4 @@ short SvxInsRowColDlg::Execute(void)
     return ModalDialog::Execute();
 }
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index 33e8efabeb70..7e4f186059e5 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -28,6 +28,9 @@
 #ifndef _SVX_INSRC_HXX
 #define _SVX_INSRC_HXX
 
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+
 #include <svx/stddlg.hxx>
 
 #include <vcl/fixed.hxx>
@@ -35,8 +38,6 @@
 #include <vcl/group.hxx>
 #include <vcl/button.hxx>
 
-#include <tools/string.hxx>
-
 class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog
 {
     FixedText       aCount;
@@ -47,8 +48,8 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog
     RadioButton     aAfterBtn;
     FixedLine        aPosFL;
 
-    String          aRow;
-    String          aCol;
+    rtl::OUString   aRow;
+    rtl::OUString   aCol;
 
     OKButton        aOKBtn;
     CancelButton    aCancelBtn;
diff --git a/svtools/inc/svtools/indexentryres.hxx b/svtools/inc/svtools/indexentryres.hxx
index 56424cc00c7e..127710777ce5 100644
--- a/svtools/inc/svtools/indexentryres.hxx
+++ b/svtools/inc/svtools/indexentryres.hxx
@@ -4,7 +4,7 @@
 #define SVTOOLS_INDEXENTRYRESSOURCE_HXX
 
 #include "svtools/svtdllapi.h"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 class IndexEntryRessourceData;
 
@@ -16,7 +16,7 @@ class SVT_DLLPUBLIC IndexEntryRessource
     public:
         IndexEntryRessource ();
         ~IndexEntryRessource ();
-        const String& GetTranslation (const String& r_Algorithm);
+        const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm);
 };
 
 #endif /* SVTOOLS_INDEXENTRYRESSOURCE_HXX */
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index 857718030f44..3a85f039093f 100644
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.cxx
@@ -41,17 +41,17 @@ class IndexEntryRessourceData
 {
     friend class IndexEntryRessource;
     private: /* data */
-        String  ma_Name;
-        String  ma_Translation;
+        rtl::OUString  ma_Name;
+        rtl::OUString  ma_Translation;
     private: /* member functions */
         IndexEntryRessourceData () {}
     public:
-        IndexEntryRessourceData ( const String &r_Algorithm, const String &r_Translation)
+        IndexEntryRessourceData ( const rtl::OUString &r_Algorithm, const rtl::OUString &r_Translation)
                 : ma_Name (r_Algorithm), ma_Translation (r_Translation) {}
 
-        const String&   GetAlgorithm () const { return ma_Name; }
+        const rtl::OUString& GetAlgorithm () const { return ma_Name; }
 
-        const String&   GetTranslation () const { return ma_Translation; }
+        const rtl::OUString& GetTranslation () const { return ma_Translation; }
 
         ~IndexEntryRessourceData () {}
 
@@ -75,8 +75,8 @@ IndexEntryRessource::IndexEntryRessource()
 {
         mp_Data = new IndexEntryRessourceData[INDEXENTRY_RESSOURCE_COUNT];
 
-        #define ASCSTR(str) String(RTL_CONSTASCII_USTRINGPARAM(str))
-        #define RESSTR(rid) String(SvtResId(rid))
+        #define ASCSTR(str) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(str))
+        #define RESSTR(rid) ResId::toString(SvtResId(rid))
 
         mp_Data[STR_SVT_INDEXENTRY_ALPHANUMERIC - STR_SVT_INDEXENTRY_START] =
         IndexEntryRessourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_INDEXENTRY_ALPHANUMERIC));
@@ -109,17 +109,16 @@ IndexEntryRessource::~IndexEntryRessource()
     delete[] mp_Data;
 }
 
-const String&
-IndexEntryRessource::GetTranslation (const String &r_Algorithm)
+const rtl::OUString& IndexEntryRessource::GetTranslation(const rtl::OUString &r_Algorithm)
 {
-    xub_StrLen nIndex = r_Algorithm.Search('.');
-    String aLocaleFreeAlgorithm;
+    sal_Int32 nIndex = r_Algorithm.indexOf('.');
+    rtl::OUString aLocaleFreeAlgorithm;
 
-    if (nIndex == STRING_NOTFOUND)
+    if (nIndex == -1)
         aLocaleFreeAlgorithm = r_Algorithm;
     else {
         nIndex += 1;
-        aLocaleFreeAlgorithm = String(r_Algorithm, nIndex, r_Algorithm.Len() - nIndex);
+        aLocaleFreeAlgorithm = r_Algorithm.copy(nIndex, r_Algorithm.getLength() - nIndex);
     }
 
     for (sal_uInt32 i = 0; i < INDEXENTRY_RESSOURCE_COUNT; i++)