From 104261010aa5ccbb7df4a82a3a3cafcfb0591fa7 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 4 Jul 2012 23:58:05 +0100
Subject: some UniString->rtl::OUString

Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
---
 sw/source/ui/table/tabledlg.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sw/source/ui/table/tabledlg.cxx')

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 234827ac7f93..411337c86e98 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -32,6 +32,7 @@
 #endif
 
 #include <hintids.hxx>
+#include <comphelper/string.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
@@ -919,7 +920,7 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
     }
     for( sal_uInt16 i = 0; (i < nNoOfVisibleCols ) && ( i < MET_FIELDS); i++ )
     {
-        String sEntry('~');
+        String sEntry = rtl::OUString('~');
         String sIndex = String::CreateFromInt32( aValueTbl[i] + 1 );
         sEntry += sIndex;
         pTextArr[i]->SetText( sEntry );
@@ -1446,7 +1447,7 @@ sal_Bool  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
         sal_uInt16 nPgNum = static_cast< sal_uInt16 >(aPageNoNF.GetValue());
         if ( !pDesc || !pDesc->GetPageDesc() ||
             ( pDesc->GetPageDesc() && ((pDesc->GetPageDesc()->GetName() != sPage) ||
-                    aPageNoNF.GetSavedValue() != (String)nPgNum)))
+                    !comphelper::string::equals(aPageNoNF.GetSavedValue(), nPgNum))))
         {
             SwFmtPageDesc aFmt( pShell->FindPageDescByName( sPage, sal_True ) );
             aFmt.SetNumOffset(bState ? nPgNum : 0);
-- 
cgit