commit 856707082f2cc8dbd0476397f1c330c331cceb8e
author Noel Grandin <noel@peralex.com> Wed Sep 18 10:39:56 2013 +0200
committer Noel Grandin <noel@peralex.com> Thu Sep 19 10:14:18 2013 +0200
tree f08c1ca34784fac58929c2f01f6a7c6b0a3eb999
parent 9909daaa60d1b26bd97bb7c632b24239894a476f

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

Change-Id: I4bb95e075c1946efd3f81aee044170ec2baabc7f

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

diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
index d2fc2cc..3ebeb3d 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
@@ -32,9 +32,9 @@ namespace sd { namespace toolpanel { namespace controls {
MasterPageDescriptor::MasterPageDescriptor (
    MasterPageContainer::Origin eOrigin,
    const sal_Int32 nTemplateIndex,
    const String& rsURL,
    const String& rsPageName,
    const String& rsStyleName,
    const OUString& rsURL,
    const OUString& rsPageName,
    const OUString& rsStyleName,
    const bool bIsPrecious,
    const ::boost::shared_ptr<PageObjectProvider>& rpPageObjectProvider,
    const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider)

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

diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
index 5627b53..bf1beb4 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
@@ -40,9 +40,9 @@ public:
    MasterPageDescriptor (
        MasterPageContainer::Origin eOrigin,
        const sal_Int32 nTemplateIndex,
        const String& rURL,
        const String& rPageName,
        const String& rStyleName,
        const OUString& rURL,
        const OUString& rPageName,
        const OUString& rStyleName,
        const bool bIsPrecious,
        const ::boost::shared_ptr<PageObjectProvider>& rpPageObjectProvider,
        const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider);