From bacfd2dc4cea1a5d87658ed8592116acd931e000 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 2 Jan 2012 10:55:27 +0000 Subject: add a comphelper::string::getTokenCount suitable for conversion from [Byte]String::GetTokenCount converted low-hanging variants to rtl::O[UString]::getToken loops added unit test --- svx/inc/svx/gallery1.hxx | 4 ++-- svx/inc/svx/simptabl.hxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'svx/inc') diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index de6ebc684a32..aad41fa28341 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -139,7 +139,7 @@ private: sal_uIntPtr nLastFileNumber; sal_Bool bMultiPath; - void ImplLoad( const String& rMultiPath ); + void ImplLoad( const rtl::OUString& rMultiPath ); void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly ); void ImplLoadImports(); void ImplWriteImportList(); @@ -151,7 +151,7 @@ private: GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); void ImplDeleteCachedTheme( GalleryTheme* pTheme ); - SVX_DLLPUBLIC Gallery( const String& rMultiPath ); + SVX_DLLPUBLIC Gallery( const rtl::OUString& rMultiPath ); SVX_DLLPUBLIC ~Gallery(); public: diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 9867707a80ed..c192458be2c8 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -106,7 +106,7 @@ public: void UpdateViewSize(); - void InsertHeaderEntry(const XubString& rText, + void InsertHeaderEntry(const rtl::OUString& rText, sal_uInt16 nCol=HEADERBAR_APPEND, HeaderBarItemBits nBits = HIB_STDSTYLE); -- cgit