From 63483b882c80d656dff4279e5be8a59a664a06fe Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 12 Aug 2013 10:57:26 +0100
Subject: XubString->OUString

Change-Id: Ibcb2dd5861ad14e286596999b757ca5c41137626
---
 cui/source/dialogs/linkdlg.cxx | 6 +++---
 cui/source/options/optfltr.cxx | 2 +-
 cui/source/options/optfltr.hxx | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'cui')

diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index db1dfaaca9bf..299d04cc612e 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -629,14 +629,14 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_
     // So the first text column's width is Tab(2)-Tab(1).
     long nWidthPixel = Links().GetLogicTab( 2 ) - Links().GetLogicTab( 1 );
     nWidthPixel -= SV_TAB_BORDER;
-    XubString aTxt = Links().GetEllipsisString( sFileNm, nWidthPixel, TEXT_DRAW_PATHELLIPSIS );
+    OUString aTxt = Links().GetEllipsisString( sFileNm, nWidthPixel, TEXT_DRAW_PATHELLIPSIS );
     INetURLObject aPath( sFileNm, INET_PROT_FILE );
     String aFileName = aPath.getName();
     aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
 
-    if( aFileName.Len() > aTxt.Len() )
+    if( aFileName.Len() > aTxt.getLength() )
         aTxt = aFileName;
-    else if( aTxt.Search( aFileName, aTxt.Len() - aFileName.Len() ) == STRING_NOTFOUND )
+    else if( aTxt.indexOf( aFileName, aTxt.getLength() - aFileName.Len() ) == -1 )
         // filename not in string
         aTxt = aFileName;
 
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index a42702042531..384fccd103be 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -277,7 +277,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
     aCheckLB.SetUpdateMode( sal_True );
 }
 
-void OfaMSFilterTabPage2::InsertEntry( const String& _rTxt, sal_IntPtr _nType )
+void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType )
 {
     SvTreeListEntry* pEntry = new SvTreeListEntry;
 
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index bdcaf49f4edf..81a965068c12 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -86,7 +86,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
     OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMSFilterTabPage2();
 
-    void            InsertEntry( const String& _rTxt, sal_IntPtr _nType );
+    void                InsertEntry( const OUString& _rTxt, sal_IntPtr _nType );
     SvTreeListEntry*    GetEntry4Type( sal_IntPtr _nType ) const;
 
 public:
-- 
cgit