summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-12 10:57:26 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-12 11:20:10 +0100
commit63483b882c80d656dff4279e5be8a59a664a06fe (patch)
treeab3f0f06b1ddbbb8eeaba973da1e964aefcfba49 /cui
parent59a5dcb2065c93e2b4bc95207f7f4e362ce3ee08 (diff)
XubString->OUString
Change-Id: Ibcb2dd5861ad14e286596999b757ca5c41137626
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/linkdlg.cxx6
-rw-r--r--cui/source/options/optfltr.cxx2
-rw-r--r--cui/source/options/optfltr.hxx2
3 files changed, 5 insertions, 5 deletions
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: