Kaydet (Commit) 781751b3 authored tarafından Noel Grandin's avatar Noel Grandin

convert sw/inc/toxwrap.hxx from String to OUString

Change-Id: I17b3a09921dd905c26b6138ba3babbd3ef3b69fe
üst 6eb770f9
...@@ -35,8 +35,6 @@ namespace lang { ...@@ -35,8 +35,6 @@ namespace lang {
}}} }}}
class String;
class SW_DLLPUBLIC IndexEntrySupplierWrapper class SW_DLLPUBLIC IndexEntrySupplierWrapper
{ {
::com::sun::star::lang::Locale aLcl; ::com::sun::star::lang::Locale aLcl;
...@@ -48,20 +46,20 @@ public: ...@@ -48,20 +46,20 @@ public:
void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLcl = rLocale; } 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; 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 > ::com::sun::star::uno::Sequence< OUString >
GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const; GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const;
sal_Bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl, 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 ::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; const ::com::sun::star::lang::Locale& rLcl2 ) const;
}; };
......
...@@ -44,11 +44,11 @@ IndexEntrySupplierWrapper::~IndexEntrySupplierWrapper() ...@@ -44,11 +44,11 @@ IndexEntrySupplierWrapper::~IndexEntrySupplierWrapper()
{ {
} }
String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt, OUString IndexEntrySupplierWrapper::GetIndexKey( const OUString& rTxt,
const String& rTxtReading, const OUString& rTxtReading,
const ::com::sun::star::lang::Locale& rLocale ) const const ::com::sun::star::lang::Locale& rLocale ) const
{ {
String sRet; OUString sRet;
try { try {
sRet = xIES->getIndexKey( rTxt, rTxtReading, rLocale ); sRet = xIES->getIndexKey( rTxt, rTxtReading, rLocale );
} }
...@@ -59,9 +59,9 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt, ...@@ -59,9 +59,9 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
return sRet; return sRet;
} }
String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const OUString IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const
{ {
String sRet; OUString sRet;
try { try {
sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl ); sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl );
} }
...@@ -89,7 +89,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Local ...@@ -89,7 +89,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Local
sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm( sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
const ::com::sun::star::lang::Locale& rLcl, const ::com::sun::star::lang::Locale& rLcl,
const String& sSortAlgorithm, long nOptions ) const const OUString& sSortAlgorithm, long nOptions ) const
{ {
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
try { try {
...@@ -103,9 +103,9 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm( ...@@ -103,9 +103,9 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
} }
sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry( sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
const String& rTxt1, const String& rTxtReading1, const OUString& rTxt1, const OUString& rTxtReading1,
const ::com::sun::star::lang::Locale& rLocale1, 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 const ::com::sun::star::lang::Locale& rLocale2 ) const
{ {
sal_Int16 nRet = 0; sal_Int16 nRet = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment