[Libreoffice-commits] core.git: sw/inc sw/source

[Matteo Casalin]

 sw/inc/swabstdlg.hxx            |    1 +
 sw/source/ui/inc/instable.hxx   |    1 +
 sw/source/ui/shells/basesh.cxx  |    3 ++-
 sw/source/ui/table/instable.cxx |    7 +++----
 4 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 8a183e1a7dec63742d6438adc0aa03b9b02396c3
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Wed Sep 18 00:05:54 2013 +0200

    String to OUString
    
    Change-Id: Iee0d6356ad8f06d97f7fa25223f3429857b1309f
    Reviewed-on: https://gerrit.libreoffice.org/6024
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index eb14336..cc8baed 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -19,6 +19,7 @@
 #ifndef _SW_ABSTDLG_HXX
 #define _SW_ABSTDLG_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
 #include <tools/string.hxx>
 #include <sfx2/sfxdlg.hxx>
diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx
index 029a213..7e7d3b0 100644
--- a/sw/source/ui/inc/instable.hxx
+++ b/sw/source/ui/inc/instable.hxx
@@ -19,6 +19,7 @@
 #ifndef _INSTABLE_HXX
 #define _INSTABLE_HXX
 
+#include <rtl/ustring.hxx>
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <vcl/edit.hxx>
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 47296ce..a4ffed0 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -2474,7 +2474,8 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
             sal_uInt16 nCols = 0;
             sal_uInt16 nRows = 0;
             SwInsertTableOptions aInsTblOpts( tabopts::ALL_TBL_INS_ATTR, 1 );
-            OUString aTableName, aAutoName;
+            OUString aTableName;
+            OUString aAutoName;
             SwTableAutoFmt* pTAFmt = 0;
 
             if( pArgs && pArgs->Count() >= 2 )
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index db78747..4b86528 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <comphelper/string.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "wrtsh.hxx"
@@ -145,10 +144,10 @@ SwInsTableDlg::~SwInsTableDlg()
 
 IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit )
 {
-    String sTblName = pEdit->GetText();
-    if(sTblName.Search(' ') != STRING_NOTFOUND)
+    OUString sTblName = pEdit->GetText();
+    if (sTblName.indexOf(' ') != -1)
     {
-        sTblName = comphelper::string::remove(sTblName, ' ');
+        sTblName = sTblName.replaceAll(" ", "");
         pEdit->SetText(sTblName);
     }