summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorIvan Timofeev <timofeev.i.s@gmail.com>2013-08-14 18:41:28 +0400
committerIvan Timofeev <timofeev.i.s@gmail.com>2013-08-14 18:42:05 +0400
commitdde3a753cead04915259d3fde0e913096f1a3922 (patch)
treea3dc973ad724eb7ed9678962e907078e21b99f8c /sd
parent46d122d4cc405c4070eb4945abd20cdf3a5fac33 (diff)
convert Read/WriteUserData methods to OUString and bool
Change-Id: I06a8158b7f503976b19383014a7c8a867c0184ea
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/inc/ViewShell.hxx4
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx4
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx4
-rw-r--r--sd/source/ui/view/viewshe2.cxx4
4 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index a13648054d34..e44ee40cd7fa 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -233,8 +233,8 @@ public:
void SetFrameView (FrameView* pFrameView);
virtual void ReadFrameViewData(FrameView* pView);
virtual void WriteFrameViewData();
- virtual void WriteUserData(String& rString);
- virtual void ReadUserData(const String& rString);
+ virtual void WriteUserData(OUString& rString);
+ virtual void ReadUserData(const OUString& rString);
virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb);
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index dc1cc4ea93c5..ca5959741036 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -162,8 +162,8 @@ public:
const Fraction &rZoomX,
const Fraction &rZoomY);
virtual sal_uInt16 PrepareClose (sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False);
- virtual void WriteUserData (String&, sal_Bool bBrowse = sal_False);
- virtual void ReadUserData (const String&, sal_Bool bBrowse = sal_False);
+ virtual void WriteUserData (OUString&, bool bBrowse = false);
+ virtual void ReadUserData (const OUString&, bool bBrowse = false);
virtual SdrView* GetDrawView (void) const;
virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize);
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 4c6817f3e151..7228dd830905 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -864,7 +864,7 @@ sal_uInt16 ViewShellBase::PrepareClose (sal_Bool bUI, sal_Bool bForBrowsing)
-void ViewShellBase::WriteUserData (String& rString, sal_Bool bBrowse)
+void ViewShellBase::WriteUserData (OUString& rString, bool bBrowse)
{
SfxViewShell::WriteUserData (rString, bBrowse);
@@ -877,7 +877,7 @@ void ViewShellBase::WriteUserData (String& rString, sal_Bool bBrowse)
-void ViewShellBase::ReadUserData (const String& rString, sal_Bool bBrowse)
+void ViewShellBase::ReadUserData (const OUString& rString, bool bBrowse)
{
SfxViewShell::ReadUserData (rString, bBrowse);
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index cf055d0a81ac..b6d7c5fdf7b1 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -906,7 +906,7 @@ const Rectangle& ViewShell::GetAllWindowRect()
return maAllWindowRectangle;
}
-void ViewShell::ReadUserData(const String&)
+void ViewShell::ReadUserData(const OUString&)
{
// zoom onto VisArea from FrameView
GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_VISAREA,
@@ -914,7 +914,7 @@ void ViewShell::ReadUserData(const String&)
}
-void ViewShell::WriteUserData(String&)
+void ViewShell::WriteUserData(OUString&)
{
// writing of our data is always done in WriteFrameViewData()
WriteFrameViewData();