[Libreoffice-commits] core.git: basctl/source include/sfx2 include/svx sc/source sd/source sfx2/source svx/source sw/inc sw/source
Stephan Bergmann
sbergman at redhat.com
Tue Jan 14 02:21:54 PST 2014
basctl/source/basicide/basidesh.cxx | 4 +---
basctl/source/inc/basidesh.hxx | 2 +-
include/sfx2/frame.hxx | 2 +-
include/sfx2/objsh.hxx | 2 +-
include/sfx2/viewsh.hxx | 2 +-
include/svx/fmshell.hxx | 2 +-
sc/source/ui/docshell/docsh.cxx | 4 ++--
sc/source/ui/inc/docsh.hxx | 2 +-
sc/source/ui/inc/tabvwsh.hxx | 2 +-
sc/source/ui/view/tabvwsh4.cxx | 6 +++---
sd/source/ui/inc/DrawViewShell.hxx | 2 +-
sd/source/ui/inc/OutlineViewShell.hxx | 2 +-
sd/source/ui/inc/ViewShell.hxx | 2 +-
sd/source/ui/inc/ViewShellBase.hxx | 2 +-
sd/source/ui/view/DocumentRenderer.cxx | 2 +-
sd/source/ui/view/ViewShellBase.cxx | 6 +++---
sd/source/ui/view/drviews1.cxx | 4 ++--
sd/source/ui/view/outlnvsh.cxx | 4 ++--
sd/source/ui/view/viewshel.cxx | 4 ++--
sfx2/source/doc/objxtor.cxx | 7 +++----
sfx2/source/view/frame.cxx | 8 ++++----
sfx2/source/view/viewsh.cxx | 3 +--
svx/source/form/fmshell.cxx | 2 +-
sw/inc/docsh.hxx | 2 +-
sw/source/ui/app/docsh2.cxx | 4 ++--
sw/source/ui/inc/view.hxx | 2 +-
sw/source/ui/uiview/view.cxx | 6 +++---
27 files changed, 43 insertions(+), 47 deletions(-)
New commits:
commit 7c1415e06ff480c5df75db2451ea522b0150f9b2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 14 11:21:10 2014 +0100
Remove unused bForBrowsing parameter
Change-Id: I32b458390130e9ed83af0831069329ac8f672d67
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 0f4169a..03a31ee 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -371,10 +371,8 @@ void Shell::StoreAllWindowData( bool bPersistent )
}
-bool Shell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
+bool Shell::PrepareClose( sal_Bool bUI )
{
- (void)bForBrowsing;
-
// reset here because it's modified after printing etc. (DocInfo)
GetViewFrame()->GetObjectShell()->SetModified(false);
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 94265a2..a571d77 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -119,7 +119,7 @@ private:
virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize );
virtual void OuterResizePixel( const Point &rPos, const Size &rSize );
sal_uInt16 InsertWindowInTable (BaseWindow* pNewWin);
- virtual bool PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing );
+ virtual bool PrepareClose( sal_Bool bUI ) SAL_OVERRIDE;
void SetCurWindow (BaseWindow* pNewWin, bool bUpdateTabBar = false, bool bRememberAsCurrent = true);
void ManageToolbars();
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 7426ed2..94bee5f 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -172,7 +172,7 @@ public:
SAL_DLLPRIVATE void ReleasingComponent_Impl( sal_Bool bSet );
SAL_DLLPRIVATE void GetViewData_Impl();
SAL_DLLPRIVATE void SetFrameType_Impl( sal_uInt32 );
- SAL_DLLPRIVATE bool PrepareClose_Impl( sal_Bool bUI, sal_Bool bForBrowsing=sal_False );
+ SAL_DLLPRIVATE bool PrepareClose_Impl( sal_Bool bUI );
SAL_DLLPRIVATE sal_Bool DocIsModified_Impl();
SAL_DLLPRIVATE void SetCurrentViewFrame_Impl( SfxViewFrame* );
SAL_DLLPRIVATE sal_Bool IsClosing_Impl() const;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 79a0bca..c38ed8f 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -426,7 +426,7 @@ public:
static sal_uInt32 HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc );
virtual void ViewAssigned();
- virtual bool PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
+ virtual bool PrepareClose( sal_Bool bUI = sal_True );
virtual sal_Bool IsInformationLost();
virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, Window* pParent );
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index f6bfdb4..27a6bfe 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -184,7 +184,7 @@ public:
void VisAreaChanged(const Rectangle& rRect);
// Misc
- virtual bool PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
+ virtual bool PrepareClose( sal_Bool bUI = sal_True );
virtual OUString GetSelectionText( bool bCompleteWords = false );
virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const;
virtual SdrView* GetDrawView() const;
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 815a786..42d204d 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -123,7 +123,7 @@ public:
FmFormPage* GetCurPage() const;
FmXFormShell* GetImpl() const {return m_pImpl;};
- bool PrepareClose(sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False);
+ bool PrepareClose(sal_Bool bUI = sal_True);
bool IsActiveControl() const;
void ForgetActiveControl();
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 49150e3..e7cdf57 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2500,7 +2500,7 @@ sal_Bool ScDocShell::QuerySlotExecutable( sal_uInt16 nSlotId )
}
-bool ScDocShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
+bool ScDocShell::PrepareClose( sal_Bool bUI )
{
if(SC_MOD()->GetCurRefDlgId()>0)
{
@@ -2546,7 +2546,7 @@ bool ScDocShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
}
// end handler code
- bool nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing );
+ bool nRet = SfxObjectShell::PrepareClose( bUI );
if (nRet) // true = close
aDocument.EnableIdle(false); // nicht mehr drin rumpfuschen !!!
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index b71577a..6bfee71 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -209,7 +209,7 @@ public:
virtual sal_Bool Save();
virtual sal_Bool SaveAs( SfxMedium& rMedium );
virtual sal_Bool ConvertTo( SfxMedium &rMedium );
- virtual bool PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = false );
+ virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
virtual void PrepareReload();
virtual sal_Bool IsInformationLost();
virtual void LoadStyles( SfxObjectShell &rSource );
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index a1654da..285b68e 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -202,7 +202,7 @@ private:
protected:
virtual void Activate(sal_Bool bMDI);
virtual void Deactivate(sal_Bool bMDI);
- virtual bool PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = false );
+ virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
virtual void ShowCursor(bool bOn);
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 2f566a4..36110fe 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -276,7 +276,7 @@ void ScTabViewShell::SetActive()
ActiveGrabFocus();
}
-bool ScTabViewShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing)
+bool ScTabViewShell::PrepareClose(sal_Bool bUI)
{
// Call EnterHandler even in formula mode here,
// so a formula change in an embedded object isn't lost
@@ -303,11 +303,11 @@ bool ScTabViewShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing)
if ( pFormShell )
{
- sal_uInt16 nRet = pFormShell->PrepareClose(bUI, bForBrowsing);
+ sal_uInt16 nRet = pFormShell->PrepareClose(bUI);
if (nRet!=sal_True)
return nRet;
}
- return SfxViewShell::PrepareClose(bUI,bForBrowsing);
+ return SfxViewShell::PrepareClose(bUI);
}
//------------------------------------------------------------------
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index e118220..a6537d6 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 931d62e..f69132b 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 725428f..d2ef606 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 cfa0223..782f4d9 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 4136e89d8..813aa06 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 4478109..c30cda2 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 9b93ec1..3e83371 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 79bc580..9475f40 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 4c1c012..d0b7a54 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;
}
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index d65711d..e552c4b 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -567,9 +567,8 @@ struct BoolEnv_Impl
bool SfxObjectShell::PrepareClose
(
- sal_Bool bUI, // sal_True: Dialog and so on is allowed
+ sal_Bool bUI // sal_True: Dialog and so on is allowed
// sal_False: silent-mode
- sal_Bool bForBrowsing
)
{
if( pImp->bInPrepareClose || pImp->bPreparedForClose )
@@ -581,7 +580,7 @@ bool SfxObjectShell::PrepareClose
return false;
SfxViewFrame* pFirst = SfxViewFrame::GetFirst( this );
- if( pFirst && !pFirst->GetFrame().PrepareClose_Impl( bUI, bForBrowsing ) )
+ if( pFirst && !pFirst->GetFrame().PrepareClose_Impl( bUI ) )
return false;
// prepare views for closing
@@ -591,7 +590,7 @@ bool SfxObjectShell::PrepareClose
DBG_ASSERT(pFrm->GetViewShell(),"No Shell");
if ( pFrm->GetViewShell() )
{
- bool nRet = pFrm->GetViewShell()->PrepareClose( bUI, bForBrowsing );
+ bool nRet = pFrm->GetViewShell()->PrepareClose( bUI );
if ( !nRet )
return nRet;
}
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index e4fb67f..350affb 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -193,7 +193,7 @@ sal_Bool SfxFrame::DocIsModified_Impl()
return sal_False;
}
-bool SfxFrame::PrepareClose_Impl( sal_Bool bUI, sal_Bool bForBrowsing )
+bool SfxFrame::PrepareClose_Impl( sal_Bool bUI )
{
bool nRet = true;
@@ -218,17 +218,17 @@ bool SfxFrame::PrepareClose_Impl( sal_Bool bUI, sal_Bool bForBrowsing )
if ( bOther )
// if there are other views only the current view of this frame must be asked
- nRet = GetCurrentViewFrame()->GetViewShell()->PrepareClose( bUI, bForBrowsing );
+ nRet = GetCurrentViewFrame()->GetViewShell()->PrepareClose( bUI );
else
// otherwise ask the document
- nRet = pCur->PrepareClose( bUI, bForBrowsing );
+ nRet = pCur->PrepareClose( bUI );
}
if ( nRet )
{
// if this frame has child frames, ask them too
for( sal_uInt16 nPos = GetChildFrameCount(); nRet && nPos--; )
- nRet = (*pChildArr)[ nPos ]->PrepareClose_Impl( bUI, bForBrowsing );
+ nRet = (*pChildArr)[ nPos ]->PrepareClose_Impl( bUI );
}
pImp->bPrepClosing = sal_False;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index ffcd740..3d5199d 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1288,8 +1288,7 @@ SfxViewShell::~SfxViewShell()
bool SfxViewShell::PrepareClose
(
- sal_Bool bUI, // TRUE: Allow Dialog and so on, FALSE: silent-mode
- sal_Bool /*bForBrowsing*/
+ sal_Bool bUI // TRUE: Allow Dialog and so on, FALSE: silent-mode
)
{
SfxPrinter *pPrinter = GetPrinter();
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 958a58f..40e1ba2 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -247,7 +247,7 @@ void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView)
}
//------------------------------------------------------------------------
-bool FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool /*bForBrowsing*/)
+bool FmFormShell::PrepareClose(sal_Bool bUI)
{
if ( GetImpl()->didPrepareClose() )
// we already did a PrepareClose for the current modifications of the current form
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index fffe7df..e75a4d1 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -91,7 +91,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
SW_DLLPRIVATE virtual sal_Bool SaveAs( SfxMedium& rMedium );
SW_DLLPRIVATE virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
- SW_DLLPRIVATE virtual bool PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
+ SW_DLLPRIVATE virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
SW_DLLPRIVATE virtual bool InsertGeneratedStream(SfxMedium& rMedium,
css::uno::Reference<css::text::XTextRange> const& xInsertPosition)
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 7a6bfc8..e793fe4 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -303,9 +303,9 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
// Notification Close Doc
-bool SwDocShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
+bool SwDocShell::PrepareClose( sal_Bool bUI )
{
- bool nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing );
+ bool nRet = SfxObjectShell::PrepareClose( bUI );
if( nRet )
EndListening( *this );
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 271579f..f86e1ed 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -418,7 +418,7 @@ public:
bool bEraseTrail );
virtual sal_Bool HasSelection( sal_Bool bText ) const;
virtual OUString GetSelectionText( bool bCompleteWords = false );
- 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 MarginChanged();
// replace word/selection with text from the thesaurus
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 109fb73..04aba5d 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -1728,18 +1728,18 @@ void SwView::StopShellTimer()
}
}
-bool SwView::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
+bool SwView::PrepareClose( sal_Bool bUI )
{
SfxViewFrame* pVFrame = GetViewFrame();
pVFrame->SetChildWindow( SwInputChild::GetChildWindowId(), sal_False );
if( pVFrame->GetDispatcher()->IsLocked() )
pVFrame->GetDispatcher()->Lock(sal_False);
- if ( m_pFormShell && !m_pFormShell->PrepareClose( bUI, bForBrowsing ) )
+ if ( m_pFormShell && !m_pFormShell->PrepareClose( bUI ) )
{
return false;
}
- return SfxViewShell::PrepareClose( bUI, bForBrowsing );
+ return SfxViewShell::PrepareClose( bUI );
}
// status methods for clipboard.
More information about the Libreoffice-commits
mailing list