diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-01 11:46:42 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-02 10:55:53 +0200 |
commit | 2aa728780e273feaa3646f0299b727c02502c18d (patch) | |
tree | 6e63c49624ebf735849b98aff2aa724c589fcc05 /reportdesign | |
parent | 4d1e53bcbd8af9655ea5d6b1cd5b03436b25feb7 (diff) |
svl: avoid defaulted parameter in SfxUndoManager::EnterListAction()
It's a virtual function, and defaulted parameters there are problematic.
Reviewed-on: https://gerrit.libreoffice.org/27772
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 6850f4e8454652ec475811860f5e8cf9bdea67a7)
Conflicts:
sc/source/ui/view/viewfun3.cxx
Change-Id: I3f110c7ac36dfda90811b033620286ad9fce1af1
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/inc/UndoActions.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/SectionWindow.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 4317b50a0255..46217f6ecf7b 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -112,7 +112,7 @@ namespace rptui UndoContext( SfxUndoManager& i_undoManager, const OUString& i_undoTitle ) :m_rUndoManager( i_undoManager ) { - m_rUndoManager.EnterListAction( i_undoTitle, OUString() ); + m_rUndoManager.EnterListAction( i_undoTitle, OUString(), 0 ); } ~UndoContext() diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index fd6a1720da56..eaf32eb2e9be 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -448,7 +448,7 @@ bool OFieldExpressionControl::SaveModified(bool _bAppendRow) { bAppend = true; OUString sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP)); - m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString() ); + m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString(), 0 ); xGroup = m_pParent->getGroups()->createGroup(); xGroup->setHeaderOn(sal_True); @@ -787,7 +787,7 @@ void OFieldExpressionControl::DeleteRows() { bFirstTime = false; OUString sUndoAction(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION)); - m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString() ); + m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString(), 0 ); } sal_Int32 nGroupPos = m_aGroupPositions[nIndex]; diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 2c6de371290f..c87e80dfc33e 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -320,7 +320,7 @@ void OSectionWindow::zoom(const Fraction& _aZoom) IMPL_LINK_NOARG_TYPED( OSectionWindow, StartSplitHdl, Splitter*, void) { const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) ); - getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, OUString() ); + getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, OUString(), 0 ); } IMPL_LINK_NOARG_TYPED( OSectionWindow, EndSplitHdl, Splitter*, void ) |