diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-17 15:04:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-19 10:14:16 +0200 |
| commit | 781751b37ca3657d21cc3f94eb6f66f4637e49e0 (patch) | |
| tree | f1209e0eb4567fb4147d6d36b72e8992d51b33fa /sw | |
| parent | 6eb770f9d6ded95f187d0509fb5a465868b07ad8 (diff) | |
convert sw/inc/toxwrap.hxx from String to OUString
Change-Id: I17b3a09921dd905c26b6138ba3babbd3ef3b69fe
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/toxwrap.hxx | 12 | ||||
| -rw-r--r-- | sw/source/core/tox/toxhlp.cxx | 18 |
2 files changed, 14 insertions, 16 deletions
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx index 72deb8d869ff..64b9d1dbfe07 100644 --- a/sw/inc/toxwrap.hxx +++ b/sw/inc/toxwrap.hxx @@ -35,8 +35,6 @@ namespace lang { }}} -class String; - class SW_DLLPUBLIC IndexEntrySupplierWrapper { ::com::sun::star::lang::Locale aLcl; @@ -48,20 +46,20 @@ public: void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLcl = rLocale; } - String GetIndexKey( const String& rTxt, const String& rTxtReading, + OUString GetIndexKey( const OUString& rTxt, const OUString& rTxtReading, const ::com::sun::star::lang::Locale& rLocale ) const; - String GetFollowingText( sal_Bool bMorePages ) const; + OUString GetFollowingText( sal_Bool bMorePages ) const; ::com::sun::star::uno::Sequence< OUString > GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const; sal_Bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl, - const String& sSortAlgorithm, long nOptions ) const; + const OUString& sSortAlgorithm, long nOptions ) const; - sal_Int16 CompareIndexEntry( const String& rTxt1, const String& rTxtReading1, + sal_Int16 CompareIndexEntry( const OUString& rTxt1, const OUString& rTxtReading1, const ::com::sun::star::lang::Locale& rLcl1, - const String& rTxt2, const String& rTxtReading2, + const OUString& rTxt2, const OUString& rTxtReading2, const ::com::sun::star::lang::Locale& rLcl2 ) const; }; diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx index 9c58de47f79e..317813f54672 100644 --- a/sw/source/core/tox/toxhlp.cxx +++ b/sw/source/core/tox/toxhlp.cxx @@ -44,11 +44,11 @@ IndexEntrySupplierWrapper::~IndexEntrySupplierWrapper() { } -String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt, - const String& rTxtReading, - const ::com::sun::star::lang::Locale& rLocale ) const +OUString IndexEntrySupplierWrapper::GetIndexKey( const OUString& rTxt, + const OUString& rTxtReading, + const ::com::sun::star::lang::Locale& rLocale ) const { - String sRet; + OUString sRet; try { sRet = xIES->getIndexKey( rTxt, rTxtReading, rLocale ); } @@ -59,9 +59,9 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt, return sRet; } -String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const +OUString IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const { - String sRet; + OUString sRet; try { sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl ); } @@ -89,7 +89,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Local sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl, - const String& sSortAlgorithm, long nOptions ) const + const OUString& sSortAlgorithm, long nOptions ) const { sal_Bool bRet = sal_False; try { @@ -103,9 +103,9 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm( } sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry( - const String& rTxt1, const String& rTxtReading1, + const OUString& rTxt1, const OUString& rTxtReading1, const ::com::sun::star::lang::Locale& rLocale1, - const String& rTxt2, const String& rTxtReading2, + const OUString& rTxt2, const OUString& rTxtReading2, const ::com::sun::star::lang::Locale& rLocale2 ) const { sal_Int16 nRet = 0; |