commit bad532dfd9cfd6c8a37d128c31f2916fdf290e1d
author Noel Grandin <noel@peralex.com> Tue Sep 17 10:20:44 2013 +0200
committer Noel Grandin <noel@peralex.com> Thu Sep 19 10:14:11 2013 +0200
tree 5f9d17125063c3bb039091e0aa00935f3f742135
parent 19d7fd2c412e3c545a69b3fa801661743e4938bb

convert sd/source/ui/toolpanel/controls/DocumentHelper.hxx to OUString

Change-Id: Ida144cac6d6f459531ddfe80c5b0c790df38dd5d

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

diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
index deb94ac..61b8be1 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.

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

diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.hxx b/sd/source/ui/toolpanel/controls/DocumentHelper.hxx
index 0103968..6f28201 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);
};