convert sd/.../MasterPageContainer.hxx from String to OUString

Change-Id: I88f8bcd6f6f447f3184beedee04b4aab1fddd41e

sd/source/ui/toolpanel/controls/MasterPageContainer.cxx

@@ -374,12 +374,12 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForIndex (int nIndex)
 
 
 MasterPageContainer::Token MasterPageContainer::GetTokenForURL (
-    const String& sURL)
+    const OUString& sURL)
 {
     const ::osl::MutexGuard aGuard (mpImpl->maMutex);
 
     Token aResult (NIL_TOKEN);
-    if (sURL.Len() > 0)
+    if (!sURL.isEmpty())
     {
         MasterPageContainerType::iterator iEntry (
             ::std::find_if (
@@ -395,12 +395,12 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForURL (
 
 
 
-MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const String& sStyleName)
+MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const OUString& sStyleName)
 {
     const ::osl::MutexGuard aGuard (mpImpl->maMutex);
 
     Token aResult (NIL_TOKEN);
-    if (sStyleName.Len() > 0)
+    if (!sStyleName.isEmpty())
     {
         MasterPageContainerType::iterator iEntry (
             ::std::find_if (
@@ -438,7 +438,7 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForPageObject (
 
 
 
-String MasterPageContainer::GetURLForToken (
+OUString MasterPageContainer::GetURLForToken (
     MasterPageContainer::Token aToken)
 {
     const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -447,13 +447,13 @@ String MasterPageContainer::GetURLForToken (
     if (pDescriptor.get() != NULL)
         return pDescriptor->msURL;
     else
-        return String();
+        return OUString();
 }
 
 
 
 
-String MasterPageContainer::GetPageNameForToken (
+OUString MasterPageContainer::GetPageNameForToken (
     MasterPageContainer::Token aToken)
 {
     const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -462,13 +462,13 @@ String MasterPageContainer::GetPageNameForToken (
     if (pDescriptor.get() != NULL)
         return pDescriptor->msPageName;
     else
-        return String();
+        return OUString();
 }
 
 
 
 
-String MasterPageContainer::GetStyleNameForToken (
+OUString MasterPageContainer::GetStyleNameForToken (
     MasterPageContainer::Token aToken)
 {
     const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -477,7 +477,7 @@ String MasterPageContainer::GetStyleNameForToken (
     if (pDescriptor.get() != NULL)
         return pDescriptor->msStyleName;
     else
-        return String();
+        return OUString();
 }
 
 

sd/source/ui/toolpanel/controls/MasterPageContainer.hxx

@@ -128,13 +128,13 @@ public:
     */
     Token GetTokenForIndex (int nIndex);
 
-    Token GetTokenForURL (const String& sURL);
-    Token GetTokenForStyleName (const String& sStyleName);
+    Token GetTokenForURL (const OUString& sURL);
+    Token GetTokenForStyleName (const OUString& sStyleName);
     Token GetTokenForPageObject (const SdPage* pPage);
 
-    String GetURLForToken (Token aToken);
-    String GetPageNameForToken (Token aToken);
-    String GetStyleNameForToken (Token aToken);
+    OUString GetURLForToken (Token aToken);
+    OUString GetPageNameForToken (Token aToken);
+    OUString GetStyleNameForToken (Token aToken);
     SdPage* GetPageObjectForToken (Token aToken, bool bLoad=true);
     Origin GetOriginForToken (Token aToken);
     sal_Int32 GetTemplateIndexForToken (Token aToken);

sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx

@@ -414,7 +414,7 @@ void RecentlyUsedMasterPages::AddMasterPage (
     // has to have a valid URL.  This excludes master pages that do not come
     // from template files.
     if (aToken != MasterPageContainer::NIL_TOKEN
-        && mpContainer->GetURLForToken(aToken).Len()>0)
+        && !mpContainer->GetURLForToken(aToken).isEmpty())
     {
 
         MasterPageList::iterator aIterator (