diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-17 11:51:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-19 10:14:14 +0200 |
| commit | d1649c52fe915724d40bc8a9d1ce3ccb3916f3c7 (patch) | |
| tree | 8d95b2acb51904bb34e401d8172a9619575f6781 | |
| parent | d109f1660ec75e1253232dbf09d9cdc185b8386a (diff) | |
convert sc/inc/servuno.hxx from String to OUString
Change-Id: I199f60167d39b5e079fe429a3c787aad03a446ec
| -rw-r--r-- | sc/inc/servuno.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/servuno.cxx | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx index f17e50134991..2dd3686b9dd7 100644 --- a/sc/inc/servuno.hxx +++ b/sc/inc/servuno.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Sequence.hxx> -class String; class ScDocShell; @@ -102,7 +101,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance( sal_uInt16 nType, ScDocShell* pDocShell ); static ::com::sun::star::uno::Sequence<OUString> GetAllServiceNames(); - static sal_uInt16 GetProviderType(const String& rServiceName); + static sal_uInt16 GetProviderType(const OUString& rServiceName); }; diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 2fa6324264c0..c8f8bea3455e 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -384,15 +384,15 @@ static const sal_Char* aOldNames[SC_SERVICE_COUNT] = // alles static -sal_uInt16 ScServiceProvider::GetProviderType(const String& rServiceName) +sal_uInt16 ScServiceProvider::GetProviderType(const OUString& rServiceName) { - if (rServiceName.Len()) + if (!rServiceName.isEmpty()) { const sal_uInt16 nEntries = sizeof(aProvNamesId) / sizeof(aProvNamesId[0]); for (sal_uInt16 i = 0; i < nEntries; i++) { - if (rServiceName.EqualsAscii( aProvNamesId[i].pName )) + if (rServiceName.equalsAscii( aProvNamesId[i].pName )) { return aProvNamesId[i].nType; } @@ -402,7 +402,7 @@ sal_uInt16 ScServiceProvider::GetProviderType(const String& rServiceName) for (i=0; i<SC_SERVICE_COUNT; i++) { OSL_ENSURE( aOldNames[i], "ScServiceProvider::GetProviderType: no oldname => crash"); - if (rServiceName.EqualsAscii( aOldNames[i] )) + if (rServiceName.equalsAscii( aOldNames[i] )) { OSL_FAIL("old service name used"); return i; |