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

convert sc/inc/servuno.hxx from String to OUString

Change-Id: I199f60167d39b5e079fe429a3c787aad03a446ec
üst d109f166
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
class String;
class ScDocShell; class ScDocShell;
...@@ -102,7 +101,7 @@ public: ...@@ -102,7 +101,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
MakeInstance( sal_uInt16 nType, ScDocShell* pDocShell ); MakeInstance( sal_uInt16 nType, ScDocShell* pDocShell );
static ::com::sun::star::uno::Sequence<OUString> GetAllServiceNames(); static ::com::sun::star::uno::Sequence<OUString> GetAllServiceNames();
static sal_uInt16 GetProviderType(const String& rServiceName); static sal_uInt16 GetProviderType(const OUString& rServiceName);
}; };
......
...@@ -384,15 +384,15 @@ static const sal_Char* aOldNames[SC_SERVICE_COUNT] = ...@@ -384,15 +384,15 @@ static const sal_Char* aOldNames[SC_SERVICE_COUNT] =
// alles static // 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 = const sal_uInt16 nEntries =
sizeof(aProvNamesId) / sizeof(aProvNamesId[0]); sizeof(aProvNamesId) / sizeof(aProvNamesId[0]);
for (sal_uInt16 i = 0; i < nEntries; i++) for (sal_uInt16 i = 0; i < nEntries; i++)
{ {
if (rServiceName.EqualsAscii( aProvNamesId[i].pName )) if (rServiceName.equalsAscii( aProvNamesId[i].pName ))
{ {
return aProvNamesId[i].nType; return aProvNamesId[i].nType;
} }
...@@ -402,7 +402,7 @@ sal_uInt16 ScServiceProvider::GetProviderType(const String& rServiceName) ...@@ -402,7 +402,7 @@ sal_uInt16 ScServiceProvider::GetProviderType(const String& rServiceName)
for (i=0; i<SC_SERVICE_COUNT; i++) for (i=0; i<SC_SERVICE_COUNT; i++)
{ {
OSL_ENSURE( aOldNames[i], "ScServiceProvider::GetProviderType: no oldname => crash"); 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"); OSL_FAIL("old service name used");
return i; return i;
......
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