summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-17 10:26:10 +0200
committerNoel Grandin <noel@peralex.com>2013-09-19 10:14:11 +0200
commit2a77e758912f0f7bc9057fb240c1b3f5a2aad268 (patch)
tree2d9702bbf40beb85d0b0b26ebd0e77cf6b5099a6
parent27db86559a7b744e122359bde5003de281693658 (diff)
convert sd/source/ui/sidebar/DocumentHelper.hxx from String to OUString
Change-Id: Iebb77569d4121233f509913f4f077d4737039bb3
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.cxx2
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.hxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index c880e9f13b50..d386841c2431 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -414,7 +414,7 @@ SdPage* DocumentHelper::AddMasterPage (
*/
void DocumentHelper::AssignMasterPageToPage (
SdPage* pMasterPage,
- const String& rsBaseLayoutName,
+ const OUString& rsBaseLayoutName,
SdPage* pPage)
{
// Leave early when the parameters are invalid.
diff --git a/sd/source/ui/sidebar/DocumentHelper.hxx b/sd/source/ui/sidebar/DocumentHelper.hxx
index b0b1d1550a3f..9683cc602d64 100644
--- a/sd/source/ui/sidebar/DocumentHelper.hxx
+++ b/sd/source/ui/sidebar/DocumentHelper.hxx
@@ -21,12 +21,12 @@
#define SD_SIDEBAR_PANELS_DCUMENT_HELPER_HXX
#include <tools/solar.h>
+#include <rtl/ustring.hxx>
#include <boost/shared_ptr.hpp>
#include <vector>
class SdDrawDocument;
class SdPage;
-class String;
namespace sd { namespace sidebar {
@@ -98,7 +98,7 @@ private:
*/
static void AssignMasterPageToPage (
SdPage* pMasterPage,
- const String& rsBaseLayoutName,
+ const OUString& rsBaseLayoutName,
SdPage* pPage);
};