summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorIvan Timofeev <timofeev.i.s@gmail.com>2013-08-13 23:01:07 +0400
committerIvan Timofeev <timofeev.i.s@gmail.com>2013-08-14 13:49:09 +0400
commitdcbad1b3bfe719f4eecdfafe8c78dd01f34b6605 (patch)
treeae7364a355c25d1537b5db19e229958503227441 /sd
parentfb0238d276e5835dbb316a6f4ae383988ed62aee (diff)
convert GetSelectionText... methods to OUString and bool
Change-Id: I77726f009338ae49877c5f58fe6c14d386089bbe
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx2
-rw-r--r--sd/source/ui/inc/OutlineViewShell.hxx2
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx2
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx2
-rw-r--r--sd/source/ui/view/drviewsf.cxx2
-rw-r--r--sd/source/ui/view/outlnvsh.cxx2
6 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 61c8d1ce3da9..1565648391f7 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -154,7 +154,7 @@ public:
virtual void Deactivate(sal_Bool IsMDIActivate);
virtual void UIActivating( SfxInPlaceClient* );
virtual void UIDeactivated( SfxInPlaceClient* );
- virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False );
+ virtual OUString GetSelectionText( bool bCompleteWords = false );
virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const;
void ExecCtrl(SfxRequest& rReq);
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index f4ca53f62fc8..957b3af219c7 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -102,7 +102,7 @@ public:
virtual void SetZoom(long nZoom);
virtual void SetZoomRect(const Rectangle& rZoomRect);
- virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False );
+ virtual OUString GetSelectionText( bool bCompleteWords = false );
virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const;
void Execute(SfxRequest& rReq);
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 0de9a17007db..dc1cc4ea93c5 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -115,7 +115,7 @@ public:
virtual void GetState (SfxItemSet& rSet);
/* override these from SfxViewShell */
- virtual String GetSelectionText(sal_Bool);
+ virtual OUString GetSelectionText(bool);
virtual sal_Bool HasSelection(sal_Bool) const;
SvBorder GetBorder (bool bOuterResize);
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index a069311e4fa1..4c6817f3e151 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -459,7 +459,7 @@ void ViewShellBase::InitializeFramework (void)
}
-String ViewShellBase::GetSelectionText(sal_Bool bCompleteWords)
+OUString ViewShellBase::GetSelectionText(bool bCompleteWords)
{
::boost::shared_ptr<ViewShell> const pMainShell(GetMainViewShell());
DrawViewShell *const pDrawViewShell(
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index f18f17598464..5667740e39e0 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -744,7 +744,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
-String DrawViewShell::GetSelectionText(sal_Bool bCompleteWords)
+OUString DrawViewShell::GetSelectionText(bool bCompleteWords)
{
OUString aStrSelection;
::Outliner* pOl = mpDrawView->GetTextEditOutliner();
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 1c5a50d07e1e..6e0cee76bc43 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1466,7 +1466,7 @@ sal_Bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
/**
* Return text of the selection
*/
-String OutlineViewShell::GetSelectionText(sal_Bool bCompleteWords)
+OUString OutlineViewShell::GetSelectionText(bool bCompleteWords)
{
OUString aStrSelection;
::Outliner* pOl = pOlView->GetOutliner();