summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-14 11:21:10 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-14 11:21:10 +0100
commit7c1415e06ff480c5df75db2451ea522b0150f9b2 (patch)
tree8ee773de8e4d9e49219dd92537d90d7e69def3b5 /sd
parenta31abd3d203ac8de4e045492fed53ca706bb24d1 (diff)
Remove unused bForBrowsing parameter
Change-Id: I32b458390130e9ed83af0831069329ac8f672d67
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/ViewShell.hxx2
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx2
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx2
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx6
-rw-r--r--sd/source/ui/view/drviews1.cxx4
-rw-r--r--sd/source/ui/view/outlnvsh.cxx4
-rw-r--r--sd/source/ui/view/viewshel.cxx4
9 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index e1182207fb5b..a6537d6c2e9f 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -227,7 +227,7 @@ public:
const Ruler& rRuler,
const MouseEvent& rMEvt);
- virtual bool PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
+ virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
PageKind GetPageKind() { return mePageKind; }
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index 931d62ec7b0e..f69132ba9986 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -70,7 +70,7 @@ public:
*/
virtual void ArrangeGUIElements (void);
- virtual bool PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
+ virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
virtual long VirtHScrollHdl(ScrollBar* pHScroll);
virtual long VirtVScrollHdl(ScrollBar* pVHScroll);
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 725428f1b408..d2ef6067ee8f 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -274,7 +274,7 @@ public:
sal_uInt16 GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; }
void SetPrintedHandoutPageCount (sal_uInt16 nPageCount) {mnPrintedHandoutPageCount=nPageCount; }
- virtual bool PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
+ virtual bool PrepareClose( sal_Bool bUI = sal_True );
void GetMenuState(SfxItemSet& rSet);
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index cfa022341ee9..782f4d94a0ed 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -161,7 +161,7 @@ public:
virtual void SetZoomFactor (
const Fraction &rZoomX,
const Fraction &rZoomY);
- virtual bool PrepareClose (sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False);
+ virtual bool PrepareClose (sal_Bool bUI = sal_True) SAL_OVERRIDE;
virtual void WriteUserData (OUString&, bool bBrowse = false);
virtual void ReadUserData (const OUString&, bool bBrowse = false);
virtual SdrView* GetDrawView (void) const;
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 4136e89d8762..813aa06c68a3 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1472,7 +1472,7 @@ private:
// When in outline view then apply all pending changes to the model.
if (pShell->ISA(OutlineViewShell))
- static_cast<OutlineViewShell*>(pShell)->PrepareClose (sal_False, sal_False);
+ static_cast<OutlineViewShell*>(pShell)->PrepareClose (sal_False);
// Collect some frequently used data.
if (mpOptions->IsDate())
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 4478109e3026..c30cda2e1c20 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -831,9 +831,9 @@ void ViewShellBase::SetZoomFactor (
-bool ViewShellBase::PrepareClose (sal_Bool bUI, sal_Bool bForBrowsing)
+bool ViewShellBase::PrepareClose (sal_Bool bUI)
{
- bool nResult = SfxViewShell::PrepareClose (bUI, bForBrowsing);
+ bool nResult = SfxViewShell::PrepareClose (bUI);
if (nResult)
{
@@ -842,7 +842,7 @@ bool ViewShellBase::PrepareClose (sal_Bool bUI, sal_Bool bForBrowsing)
// Forward call to main sub shell.
ViewShell* pShell = GetMainViewShell().get();
if (pShell != NULL)
- nResult = pShell->PrepareClose (bUI, bForBrowsing);
+ nResult = pShell->PrepareClose (bUI);
}
return nResult;
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 9b93ec1dbe44..3e8337191588 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -293,9 +293,9 @@ void DrawViewShell::SetZoomRect( const Rectangle& rZoomRect )
* discover an refreshed text objext.
*/
-bool DrawViewShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
+bool DrawViewShell::PrepareClose( sal_Bool bUI )
{
- if ( !ViewShell::PrepareClose(bUI, bForBrowsing) )
+ if ( !ViewShell::PrepareClose(bUI) )
return false;
if( HasCurrentFunction() )
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 79bc5801314f..9475f401b16e 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1145,9 +1145,9 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll)
* PrepareClose, gets called when the Shell shall be destroyed.
* Forwards the invocation to the View
*/
-bool OutlineViewShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
+bool OutlineViewShell::PrepareClose( sal_Bool bUI )
{
- if( ViewShell::PrepareClose(bUI, bForBrowsing) != sal_True )
+ if( ViewShell::PrepareClose(bUI) != sal_True )
return false;
return pOlView == NULL || pOlView->PrepareClose(bUI);
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 4c1c0122dfee..d0b7a54445ea 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1035,13 +1035,13 @@ void ViewShell::SetDefTabHRuler( sal_uInt16 nDefTab )
/** Tell the FmFormShell that the view shell is closing. Give it the
oportunity to prevent that.
*/
-bool ViewShell::PrepareClose (sal_Bool bUI, sal_Bool bForBrowsing)
+bool ViewShell::PrepareClose (sal_Bool bUI)
{
bool nResult = true;
FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell();
if (pFormShell != NULL)
- nResult = pFormShell->PrepareClose (bUI, bForBrowsing);
+ nResult = pFormShell->PrepareClose (bUI);
return nResult;
}