diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index f890c017f348..19112e33cf0d 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -39,7 +39,7 @@ class MasterPageObserver
     : public SdGlobalResource
 {
 public:
-    typedef ::std::set<String> MasterPageNameSet;
+    typedef ::std::set<OUString> MasterPageNameSet;
 
     /** Return the single instance of this class.
     */
diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx
index 250990125222..1bcceac9845c 100644
--- a/sd/source/ui/inc/unoaprms.hxx
+++ b/sd/source/ui/inc/unoaprms.hxx
@@ -104,7 +104,7 @@ public:
             { bOldDimHide = bTheOldDimHide; bNewDimHide = bTheNewDimHide; }
         void SetSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn)
             { bOldSoundOn = bTheOldSoundOn; bNewSoundOn = bTheNewSoundOn; }
-        void SetSound(String aTheOldSound, OUString aTheNewSound)
+        void SetSound(OUString aTheOldSound, OUString aTheNewSound)
             { aOldSoundFile = aTheOldSound; aNewSoundFile = aTheNewSound; }
         void SetBlueScreen(Color aTheOldBlueScreen, Color aTheNewBlueScreen)
             { aOldBlueScreen = aTheOldBlueScreen; aNewBlueScreen = aTheNewBlueScreen; }
@@ -114,7 +114,7 @@ public:
             { pOldPathObj = pTheOldPath; pNewPathObj = pTheNewPath; }
         void SetClickAction(::com::sun::star::presentation::ClickAction eTheOldAction, ::com::sun::star::presentation::ClickAction eTheNewAction)
             { eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; }
-        void SetBookmark(String aTheOldBookmark, OUString aTheNewBookmark)
+        void SetBookmark(OUString aTheOldBookmark, OUString aTheNewBookmark)
             { aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; }
         void SetInvisibleInPres(sal_Bool bTheOldInvisibleInPres, sal_Bool bTheNewInvisibleInPres)
             { bOldInvisibleInPres = bTheOldInvisibleInPres; bNewInvisibleInPres = bTheNewInvisibleInPres; }
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 2295bc90a998..9fc151d163ec 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -137,7 +137,7 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
     SdPage* pMasterPage;
     // Remember the names of the master pages that have been inserted to
     // avoid double insertion.
-    ::std::set<String> aMasterPageNames;
+    ::std::set<OUString> aMasterPageNames;
     for (sal_uInt16 nIndex=0; nIndex<nPageCount; nIndex++)
     {
         pMasterPage = mrDocument.GetMasterSdPage (nIndex, PK_STANDARD);
@@ -188,7 +188,7 @@ void CurrentMasterPagesSelector::UpdateSelection (void)
     // their master page into a set.
     sal_uInt16 nPageCount = mrDocument.GetSdPageCount(PK_STANDARD);
     SdPage* pPage;
-    ::std::set<String> aNames;
+    ::std::set<OUString> aNames;
     sal_uInt16 nIndex;
     bool bLoop (true);
     for (nIndex=0; nIndex<nPageCount && bLoop; nIndex++)
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index 7aa47d72eebb..99aa6c1a8831 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -229,7 +229,7 @@ void MasterPageObserver::Implementation::AddEventListener (
              aDocumentIterator!=maUsedMasterPages.end();
              ++aDocumentIterator)
         {
-            ::std::set<String>::reverse_iterator aNameIterator;
+            ::std::set<OUString>::reverse_iterator aNameIterator;
             for (aNameIterator=aDocumentIterator->second.rbegin();
                  aNameIterator!=aDocumentIterator->second.rend();
                  ++aNameIterator)
@@ -317,7 +317,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
 {
     // Create a set of names of the master pages used by the given document.
     sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
-    ::std::set<String> aCurrentMasterPages;
+    ::std::set<OUString> aCurrentMasterPages;
     for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++)
     {
         SdPage* pMasterPage = rDocument.GetMasterSdPage (nIndex, PK_STANDARD);
@@ -329,7 +329,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
                 RTL_TEXTENCODING_UTF8).getStr());
     }
 
-    typedef ::std::vector<String> StringList;
+    typedef ::std::vector<OUString> StringList;
     StringList aNewMasterPages;
     StringList aRemovedMasterPages;
     MasterPageContainer::iterator aOldMasterPagesDescriptor (
@@ -338,7 +338,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
     {
         StringList::iterator I;
 
-        ::std::set<String>::iterator J;
+        ::std::set<OUString>::iterator J;
         int i=0;
         for (J=aOldMasterPagesDescriptor->second.begin();
              J!=aOldMasterPagesDescriptor->second.end();