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 /dbaccess | |
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 'dbaccess')
4 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 710efd3486d8..8f80056068de 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -746,7 +746,7 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin) OQueryDesignView* pParent = static_cast<OQueryDesignView*>(getDesignView()); SfxUndoManager& rUndoMgr = m_pView->getController().GetUndoManager(); - rUndoMgr.EnterListAction( OUString( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), OUString() ); + rUndoMgr.EnterListAction( OUString( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), OUString(), 0 ); // add the Undo-Action OQueryTabWinDelUndoAct* pUndoAction = new OQueryTabWinDelUndoAct(this); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 4727b2355986..8f6cd728409c 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -941,7 +941,7 @@ bool OSelectionBrowseBox::SaveModified() strOldCellContents = pEntry->GetField(); bListAction = true; if ( !m_bInUndoMode ) - rController.GetUndoManager().EnterListAction(OUString(),OUString()); + rController.GetUndoManager().EnterListAction(OUString(),OUString(),0); sal_Int32 nPos = m_pFieldCell->GetEntryPos(aFieldName); OUString aAliasName = pEntry->GetAlias(); @@ -2457,7 +2457,7 @@ void OSelectionBrowseBox::appendUndoAction(const OUString& _rOldValue, const OUS if ( !_bListAction ) { _bListAction = true; - static_cast<OQueryController&>(getDesignView()->getController()).GetUndoManager().EnterListAction(OUString(),OUString()); + static_cast<OQueryController&>(getDesignView()->getController()).GetUndoManager().EnterListAction(OUString(),OUString(),0); } appendUndoAction(_rOldValue,_rNewValue,_nRow); } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index cec03384ad0b..99d81faf4a09 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -684,7 +684,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& break; case SID_BROWSER_CLEAR_QUERY: { - GetUndoManager().EnterListAction( OUString( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), OUString() ); + GetUndoManager().EnterListAction( OUString( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), OUString(), 0 ); getContainer()->clear(); GetUndoManager().LeaveListAction(); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index acf5bbd4f584..9ec0806dac07 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -654,7 +654,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) default: sActionDescription = ModuleRes( STR_CHANGE_COLUMN_ATTRIBUTE ); break; } - GetUndoManager().EnterListAction( sActionDescription, OUString() ); + GetUndoManager().EnterListAction( sActionDescription, OUString(),0 ); if (!pActFieldDescr) { const OTypeInfoMap& rTypeInfoMap = GetView()->getController().getTypeInfo(); |