diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-17 10:20:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-19 10:14:11 +0200 |
| commit | bad532dfd9cfd6c8a37d128c31f2916fdf290e1d (patch) | |
| tree | 5f9d17125063c3bb039091e0aa00935f3f742135 /sd | |
| parent | 19d7fd2c412e3c545a69b3fa801661743e4938bb (diff) | |
convert sd/source/ui/toolpanel/controls/DocumentHelper.hxx to OUString
Change-Id: Ida144cac6d6f459531ddfe80c5b0c790df38dd5d
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/toolpanel/controls/DocumentHelper.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/controls/DocumentHelper.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index deb94ac06a5e..61b8be152cde 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx @@ -415,7 +415,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/toolpanel/controls/DocumentHelper.hxx b/sd/source/ui/toolpanel/controls/DocumentHelper.hxx index 01039681cf5e..6f2820140dc7 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.hxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.hxx @@ -20,13 +20,13 @@ #ifndef SD_TOOLPANEL_CONTROLS_DCUMENT_HELPER_HXX #define SD_TOOLPANEL_CONTROLS_DCUMENT_HELPER_HXX +#include <rtl/ustring.hxx> #include <tools/solar.h> #include <boost/shared_ptr.hpp> #include <vector> class SdDrawDocument; class SdPage; -class String; namespace sd { namespace toolpanel { namespace controls { @@ -98,7 +98,7 @@ private: */ static void AssignMasterPageToPage ( SdPage* pMasterPage, - const String& rsBaseLayoutName, + const OUString& rsBaseLayoutName, SdPage* pPage); }; |