summaryrefslogtreecommitdiffstats
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-18 13:40:08 +0200
committerNoel Grandin <noel@peralex.com>2013-09-19 10:14:22 +0200
commit4bbbbee8ba2395bb09fc83cbf4598085c3ef0d5f (patch)
tree9e17c8f2b2855e1022be5d950e87bacd94ef6be8 /sd
parentconvert sd/.../TitleBar.hxx from String to OUString (diff)
downloadcore-4bbbbee8ba2395bb09fc83cbf4598085c3ef0d5f.tar.gz
core-4bbbbee8ba2395bb09fc83cbf4598085c3ef0d5f.zip
convert sd/.../ScrollPanel.hxx from String to OUString
Change-Id: I6dde03dd77dac7b8e7568597329d65c8ec317da6
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/inc/taskpane/ScrollPanel.hxx2
-rw-r--r--sd/source/ui/toolpanel/ScrollPanel.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
index f3cfd1d72eb4..1d799f57c470 100644
--- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx
+++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
@@ -67,7 +67,7 @@ public:
*/
TitledControl* AddControl (
::std::auto_ptr<TreeNode> pControl,
- const String& rTitle,
+ const OUString& rTitle,
const OString& sHelpId);
/** Add a control to the sub panel without a title bar.
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 8d9a6b0afc60..677f0075081a 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -106,7 +106,7 @@ ScrollPanel::~ScrollPanel (void)
SAL_WNODEPRECATED_DECLARATIONS_PUSH
TitledControl* ScrollPanel::AddControl (
::std::auto_ptr<TreeNode> pControl,
- const String& rTitle,
+ const OUString& rTitle,
const OString& rHelpId)
{
// We are interested only in the title. The control itself is