diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-02 10:55:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-05 09:18:19 +0000 |
| commit | bacfd2dc4cea1a5d87658ed8592116acd931e000 (patch) | |
| tree | d22172a33fdd13a440b6882a28c23ea2d639bbad /svx/inc | |
| parent | 6281eb0e0792da0194c07da18296e94dd944b8e5 (diff) | |
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
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/gallery1.hxx | 4 | ||||
| -rw-r--r-- | svx/inc/svx/simptabl.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
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); |