[Libreoffice-commits] core.git: dbaccess/source framework/source include/svl reportdesign/inc reportdesign/source sc/source sd/inc sd/source svx/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Aug 1 10:33:04 UTC 2016
dbaccess/source/ui/querydesign/QueryTableView.cxx | 2 +-
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4 ++--
dbaccess/source/ui/querydesign/querycontroller.cxx | 2 +-
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 +-
framework/source/fwe/helper/undomanagerhelper.cxx | 2 +-
include/svl/undo.hxx | 4 ++--
reportdesign/inc/UndoActions.hxx | 2 +-
reportdesign/source/ui/dlg/GroupsSorting.cxx | 4 ++--
reportdesign/source/ui/report/SectionWindow.cxx | 2 +-
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 2 +-
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 2 +-
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 2 +-
sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 2 +-
sc/source/ui/docshell/docfunc.cxx | 10 +++++-----
sc/source/ui/docshell/docsh4.cxx | 2 +-
sc/source/ui/drawfunc/drtxtob.cxx | 2 +-
sc/source/ui/drawfunc/futext3.cxx | 2 +-
sc/source/ui/view/cellsh1.cxx | 2 +-
sc/source/ui/view/cellsh2.cxx | 2 +-
sc/source/ui/view/dbfunc.cxx | 2 +-
sc/source/ui/view/dbfunc3.cxx | 2 +-
sc/source/ui/view/editsh.cxx | 2 +-
sc/source/ui/view/formatsh.cxx | 4 ++--
sc/source/ui/view/gridwin.cxx | 6 +++---
sc/source/ui/view/gridwin2.cxx | 2 +-
sc/source/ui/view/tabvwshf.cxx | 2 +-
sc/source/ui/view/viewfun3.cxx | 8 ++++----
sc/source/ui/view/viewfun6.cxx | 2 +-
sc/source/ui/view/viewfunc.cxx | 6 +++---
sd/inc/undo/undomanager.hxx | 2 +-
sd/source/core/drawdoc3.cxx | 4 ++--
sd/source/ui/animations/SlideTransitionPane.cxx | 2 +-
sd/source/ui/func/fubullet.cxx | 4 ++--
sd/source/ui/func/fuinsfil.cxx | 2 +-
sd/source/ui/func/fuoaprms.cxx | 2 +-
sd/source/ui/func/fupage.cxx | 2 +-
sd/source/ui/sidebar/DocumentHelper.cxx | 2 +-
sd/source/ui/view/ViewShellImplementation.cxx | 2 +-
sd/source/ui/view/drawview.cxx | 4 ++--
sd/source/ui/view/drviews2.cxx | 2 +-
sd/source/ui/view/outlview.cxx | 2 +-
svx/source/svdraw/svdmodel.cxx | 6 +++---
42 files changed, 62 insertions(+), 62 deletions(-)
New commits:
commit 6850f4e8454652ec475811860f5e8cf9bdea67a7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Aug 1 11:46:42 2016 +0200
svl: avoid defaulted parameter in SfxUndoManager::EnterListAction()
It's a virtual function, and defaulted parameters there are problematic.
Change-Id: I3f110c7ac36dfda90811b033620286ad9fce1af1
Reviewed-on: https://gerrit.libreoffice.org/27772
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index a2af2d8..cadc449 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -741,7 +741,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 8a823a0..d8cdc58 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();
@@ -2458,7 +2458,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 f56bcab..9ce1eaa 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -678,7 +678,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 7a39f55d..b8dfd9d 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -648,7 +648,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();
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index d1eb62a..88ea67f 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -525,7 +525,7 @@ namespace framework
{
::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning );
- rUndoManager.EnterListAction( i_title, OUString() );
+ rUndoManager.EnterListAction( i_title, OUString(), 0 );
}
m_aContextVisibilities.push( i_hidden );
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 6966472..ad80d8c 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -228,7 +228,7 @@ namespace svl
virtual bool Repeat( SfxRepeatTarget &rTarget ) = 0;
virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const = 0;
- virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) = 0;
+ virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId) = 0;
/** leaves the list action entered with EnterListAction
@return the number of the sub actions in the list which has just been left. Note that in case no such
@@ -319,7 +319,7 @@ public:
virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const override;
virtual bool Repeat( SfxRepeatTarget &rTarget ) override;
virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const override;
- virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) override;
+ virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId) override;
virtual size_t LeaveListAction() override;
virtual size_t LeaveAndMergeListAction() override;
virtual bool IsInListAction() const override;
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index b9728fe..4d7b04e 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 fdd00a7..d55bc86 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -444,7 +444,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(true);
@@ -783,7 +783,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 b4c1ea9..09aae0b 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -319,7 +319,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 )
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index e1e07f4..a859d59 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -289,7 +289,7 @@ void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const
ScDocShell* pDocShell = mpViewData->GetDocShell();
svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
- pUndoManager->EnterListAction( aUndo, aUndo );
+ pUndoManager->EnterListAction( aUndo, aUndo, 0 );
SCROW nRowStart = maInputRange.aStart.Row();
SCROW nRowEnd = maInputRange.aEnd.Row();
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 259ff2b..9e07e94 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -273,7 +273,7 @@ void ScSamplingDialog::PerformSampling()
ScRange aModifiedRange;
- pUndoManager->EnterListAction( aUndo, aUndo );
+ pUndoManager->EnterListAction( aUndo, aUndo, 0 );
if (mpRandomMethodRadio->IsChecked())
{
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index 69f819c..d2d3e02 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -287,7 +287,7 @@ void ScStatisticsInputOutputDialog::CalculateInputAndWriteToOutput()
OUString aUndo(SC_STRLOAD(RID_STATISTICS_DLGS, GetUndoNameId()));
ScDocShell* pDocShell = mViewData->GetDocShell();
svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
- pUndoManager->EnterListAction( aUndo, aUndo );
+ pUndoManager->EnterListAction( aUndo, aUndo, 0 );
ScRange aOutputRange = ApplyOutput(pDocShell);
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index 3d99a1f..afb34f3 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -326,7 +326,7 @@ void ScStatisticsTwoVariableDialog::CalculateInputAndWriteToOutput()
OUString aUndo(SC_STRLOAD(RID_STATISTICS_DLGS, GetUndoNameId()));
ScDocShell* pDocShell = mViewData->GetDocShell();
svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
- pUndoManager->EnterListAction( aUndo, aUndo );
+ pUndoManager->EnterListAction( aUndo, aUndo, 0 );
ScRange aOutputRange = ApplyOutput(pDocShell);
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index cdaedc2..76fd9c5 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1789,7 +1789,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
std::vector<ScRange> qIncreaseRange;
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_INSERTCELLS );
if (bRecord)
- rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo );
+ rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
itr = aMark.begin();
for (; itr != itrEnd && nTabCount; ++itr)
@@ -2217,7 +2217,7 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
bool bDeletingMerge = false;
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_DELETECELLS );
if (bRecord)
- rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo );
+ rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
itr = aMark.begin();
for (; itr != itrEnd && *itr < nTabCount; ++itr)
@@ -5199,7 +5199,7 @@ void ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_RESIZEMATRIX );
bool bUndo(rDoc.IsUndoEnabled());
if (bUndo)
- rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo );
+ rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
aFormula = aFormula.copy(1, aFormula.getLength()-2);
@@ -5252,7 +5252,7 @@ void ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter,
{
// group all remove and the insert action
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_INSERTAREALINK );
- rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo );
+ rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
}
ScAreaLink* pOldArea = static_cast<ScAreaLink*>(pBase);
@@ -5449,7 +5449,7 @@ void ScDocFunc::ConvertFormulaToValue( const ScRange& rRange, bool bInteraction
void ScDocFunc::EnterListAction( sal_uInt16 nNameResId )
{
OUString aUndo( ScGlobal::GetRscString( nNameResId ) );
- rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo );
+ rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
}
void ScDocFunc::EndListAction()
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 0b611f9..056a45c 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -196,7 +196,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
if (bUndo)
{
OUString aStrImport = ScGlobal::GetRscString( STR_UNDO_IMPORTDATA );
- GetUndoManager()->EnterListAction( aStrImport, aStrImport );
+ GetUndoManager()->EnterListAction( aStrImport, aStrImport, 0 );
}
ScDBData* pDBData = GetDBData( ScRange(aPos), SC_DB_IMPORT, SC_DBSEL_KEEP );
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 4a305db..99077e4 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -621,7 +621,7 @@ static void lcl_RemoveFields( OutlinerView& rOutView )
if (bUpdate)
pOutliner->SetUpdateMode( false );
OUString aName = ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS );
- pOutliner->GetUndoManager().EnterListAction( aName, aName );
+ pOutliner->GetUndoManager().EnterListAction( aName, aName, 0 );
bChanged = true;
}
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index 6be50c4..eeacf24 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -82,7 +82,7 @@ void FuText::StopEditMode()
if(pCalcUndo)
{
const OUString aUndoStr = ScGlobal::GetRscString( STR_UNDO_EDITNOTE );
- pUndoMgr->EnterListAction( aUndoStr, aUndoStr );
+ pUndoMgr->EnterListAction( aUndoStr, aUndoStr, 0 );
/* Note has been created before editing, if first undo action is
an insert action. Needed below to decide whether to drop the
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 365297c..50d5892 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2268,7 +2268,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
size_t nRangeSize = aRanges.size();
OUString aUndo = ScGlobal::GetRscString( bShowNote ? STR_UNDO_SHOWNOTE : STR_UNDO_HIDENOTE );
- pData->GetDocShell()->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pData->GetDocShell()->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
for ( size_t i = 0; i < nRangeSize; ++i )
{
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index eacbe87..5a6a60b 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -987,7 +987,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
OSL_ENSURE( pDocSh, "ScCellShell::ExecuteDB: SID_TEXT_TO_COLUMNS - pDocSh is null!" );
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_TEXTTOCOLUMNS );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
ScImportExport aImport( pDoc, aRange.aStart );
ScAsciiOptions aOptions;
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index ef70468..cd1ccff 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -325,7 +325,7 @@ void ScDBFunc::ToggleAutoFilter()
// use a list action for the AutoFilter buttons (ScUndoAutoFilter) and the filter operation
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_QUERY );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
ScRange aRange;
pDBData->GetArea( aRange );
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index c290409..3ad24ce 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -2044,7 +2044,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
::svl::IUndoManager* pMgr = GetViewData().GetDocShell()->GetUndoManager();
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_DOOUTLINE );
- pMgr->EnterListAction( aUndo, aUndo );
+ pMgr->EnterListAction( aUndo, aUndo, 0 );
OUString aNewTabName;
pDoc->CreateValidTabName(aNewTabName);
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 7953fc5..b79ab5c 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -135,7 +135,7 @@ static void lcl_RemoveAttribs( EditView& rEditView )
pEngine->SetUpdateMode(false);
OUString aName = ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS );
- pEngine->GetUndoManager().EnterListAction( aName, aName );
+ pEngine->GetUndoManager().EnterListAction( aName, aName, 0 );
rEditView.RemoveAttribs(true);
pEngine->RepeatDefaults(); // paragraph attributes from cell formats must be preserved
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 3fb44d5..96c8979 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -572,7 +572,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
if ( bUndo )
{
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_EDITCELLSTYLE );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
bListAction = true;
}
@@ -630,7 +630,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
if ( bUndo )
{
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_EDITCELLSTYLE );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
bListAction = true;
}
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 89837d0..fa477a3 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4116,7 +4116,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
nSourceTab != nThisTab )
{
OUString aUndo = ScGlobal::GetRscString( bIsMove ? STR_UNDO_MOVE : STR_UNDO_COPY );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
SCsCOL nCorrectCursorPosCol = 0;
SCsROW nCorrectCursorPosRow = 0;
@@ -4270,7 +4270,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
if (pSourceSh)
{
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_COPY );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
bDone = true;
if ( meDragInsertMode != INS_NONE )
@@ -4330,7 +4330,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
//! or don't start dragging on a part of a matrix
OUString aUndo = ScGlobal::GetRscString( bIsMove ? STR_UNDO_MOVE : STR_UNDO_COPY );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
bDone = true;
if ( meDragInsertMode != INS_NONE )
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index d999728..c821f4e 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -961,7 +961,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp )
if (bUndo)
{
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_DRAG_BREAK );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
}
bool bGrow = !bHide && nNew > nPagebreakBreak;
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 63ba25e..c4a28c0 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -655,7 +655,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
::svl::IUndoManager* pUndoManager = pDocSh->GetUndoManager();
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_TAB_RTL );
- pUndoManager->EnterListAction( aUndo, aUndo );
+ pUndoManager->EnterListAction( aUndo, aUndo, 0 );
ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end();
for (; itr != itrEnd; ++itr)
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 2f5ecb6..54cc27a 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1181,7 +1181,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc,
if ( bRecord )
{
OUString aUndo = ScGlobal::GetRscString( pClipDoc->IsCutMode() ? STR_UNDO_MOVE : STR_UNDO_COPY );
- pUndoMgr->EnterListAction( aUndo, aUndo );
+ pUndoMgr->EnterListAction( aUndo, aUndo, 0 );
}
if (bClipOver)
@@ -1576,7 +1576,7 @@ bool ScViewFunc::PasteMultiRangesFromClip(
::svl::IUndoManager* pUndoMgr = pDocSh->GetUndoManager();
OUString aUndo = ScGlobal::GetRscString(
pClipDoc->IsCutMode() ? STR_UNDO_CUT : STR_UNDO_COPY);
- pUndoMgr->EnterListAction(aUndo, aUndo);
+ pUndoMgr->EnterListAction(aUndo, aUndo, 0);
ScUndoPasteOptions aOptions; // store options for repeat
aOptions.nFunction = nFunction;
@@ -1740,7 +1740,7 @@ bool ScViewFunc::PasteFromClipToMultiRanges(
svl::IUndoManager* pUndoMgr = pDocSh->GetUndoManager();
OUString aUndo = ScGlobal::GetRscString(
pClipDoc->IsCutMode() ? STR_UNDO_CUT : STR_UNDO_COPY);
- pUndoMgr->EnterListAction(aUndo, aUndo);
+ pUndoMgr->EnterListAction(aUndo, aUndo, 0);
ScUndoPasteOptions aOptions; // store options for repeat
aOptions.nFunction = nFunction;
@@ -1809,7 +1809,7 @@ bool ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
// moving within one table and several tables selected -> apply to all selected tables
OUString aUndo = ScGlobal::GetRscString( bCut ? STR_UNDO_MOVE : STR_UNDO_COPY );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
// collect ranges of consecutive selected tables
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index d7848f5..99e088e 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -438,7 +438,7 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const OUString& rUndoStr)
}
::svl::IUndoManager* pUndoMgr = pDocSh->GetUndoManager();
- pUndoMgr->EnterListAction(rUndoStr, rUndoStr);
+ pUndoMgr->EnterListAction(rUndoStr, rUndoStr, 0);
pDocSh->GetDocFunc().SetValueCell(aCurPos, fVal, true);
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 649c384..a7d4b18 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2290,7 +2290,7 @@ void ScViewFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect )
if (bUndo)
{
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_PROTECT_TAB );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
}
ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
@@ -2320,7 +2320,7 @@ void ScViewFunc::Protect( SCTAB nTab, const OUString& rPassword )
if (bUndo)
{
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_PROTECT_TAB );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
}
ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
@@ -2352,7 +2352,7 @@ bool ScViewFunc::Unprotect( SCTAB nTab, const OUString& rPassword )
if (bUndo)
{
OUString aUndo = ScGlobal::GetRscString( STR_UNDO_UNPROTECT_TAB );
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
+ pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo, 0 );
}
ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index 53bfc4b..ecea0ed 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -31,7 +31,7 @@ class UndoManager : public SdrUndoManager
public:
UndoManager( sal_uInt16 nMaxUndoActionCount = 20 );
- virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) override;
+ virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId) override;
virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) override;
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index b736595..33656fe 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -484,7 +484,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
if( mpDocSh )
{
pUndoMgr = mpDocSh->GetUndoManager();
- pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_INSERTPAGES), "");
+ pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_INSERTPAGES), "", 0);
}
// Refactored copy'n'pasted layout name collection into IterateBookmarkPages
@@ -1422,7 +1422,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
if (bUndo)
{
- pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString());
+ pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString(), 0);
}
SdPage* pSelectedPage = GetSdPage(nSdPageNum, PK_STANDARD);
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 1b7de20..92f4d90 100755
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -245,7 +245,7 @@ void lcl_CreateUndoForPages(
return;
OUString aComment( SdResId(STR_UNDO_SLIDE_PARAMS) );
- pManager->EnterListAction(aComment, aComment);
+ pManager->EnterListAction(aComment, aComment, 0);
SdUndoGroup* pUndoGroup = new SdUndoGroup( pDoc );
pUndoGroup->SetComment( aComment );
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 666952a..f03dfa5 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -128,7 +128,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
// prepare undo
::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager();
rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
- "" );
+ "", 0 );
// insert given text
OUString aStr( cMark );
@@ -256,7 +256,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager();
rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
- "" );
+ "", 0 );
pOV->InsertText(aChars, true);
// set attributes (set font)
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 8739104..1a4152b 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -630,7 +630,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
nNewPages = 0;
rDocliner.GetUndoManager().EnterListAction(
- SD_RESSTR(STR_UNDO_INSERT_FILE), OUString() );
+ SD_RESSTR(STR_UNDO_INSERT_FILE), OUString(), 0 );
sal_Int32 nSourcePos = 0;
SfxStyleSheet* pStyleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE );
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 621e791..6dc2bba 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -619,7 +619,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
// with 'following curves', we have an additional UndoAction
// therefore cling? here
- pUndoMgr->EnterListAction(aComment, aComment);
+ pUndoMgr->EnterListAction(aComment, aComment, 0);
// create undo group
SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 8d56182..712549e 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -417,7 +417,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
{
OUString aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
::svl::IUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
- pUndoMgr->EnterListAction(aComment, aComment);
+ pUndoMgr->EnterListAction(aComment, aComment, 0);
SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
pUndoGroup->SetComment(aComment);
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 30e43c9..0380081 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -319,7 +319,7 @@ void DocumentHelper::AssignMasterPageToPageList (
::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager();
if( pUndoMgr )
- pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString());
+ pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString(), 0);
SdPage* pMasterPageInDocument = ProvideMasterPage(rTargetDocument,pMasterPage,rpPageList);
if (pMasterPageInDocument == nullptr)
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index f50e3b0..709ab58 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -171,7 +171,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
if( pUndoManager )
{
OUString aComment( SdResId(STR_UNDO_MODIFY_PAGE) );
- pUndoManager->EnterListAction(aComment, aComment);
+ pUndoManager->EnterListAction(aComment, aComment, 0);
ModifyPageUndoAction* pAction = new ModifyPageUndoAction(
pDocument, pUndoPage, aNewName, aNewAutoLayout, bBVisible, bBObjsVisible);
pUndoManager->AddUndoAction(pAction);
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index df01fde..6ba151f 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -181,7 +181,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
// replace placeholder by template name
OUString aComment(SD_RESSTR(STR_UNDO_CHANGE_PRES_OBJECT));
aComment = aComment.replaceFirst("$", SD_RESSTR(STR_PSEUDOSHEET_OUTLINE));
- mpDocSh->GetUndoManager()->EnterListAction( aComment, OUString() );
+ mpDocSh->GetUndoManager()->EnterListAction( aComment, OUString(), 0 );
std::vector<Paragraph*> aSelList;
pOV->CreateSelectionList(aSelList);
@@ -545,7 +545,7 @@ void DrawView::DeleteMarked()
{
OUString aUndo(SVX_RESSTR(STR_EditDelete));
aUndo = aUndo.replaceFirst("%1", GetDescriptionOfMarkedObjects());
- pUndoManager->EnterListAction(aUndo, aUndo);
+ pUndoManager->EnterListAction(aUndo, aUndo, 0);
}
SdPage* pPage = nullptr;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 214cc73..ca3c370 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -211,7 +211,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
if( rMarkList.GetMarkCount() == 1 )
{
- pUndoManager->EnterListAction("", "");
+ pUndoManager->EnterListAction("", "", 0);
mpDrawView->BegUndo();
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 00dd7eb..024b5be 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1459,7 +1459,7 @@ void OutlineView::IgnoreCurrentPageChanges (bool bIgnoreChanges)
and or the drawing document model. It will create needed undo actions */
void OutlineView::BeginModelChange()
{
- mrOutliner.GetUndoManager().EnterListAction("", "");
+ mrOutliner.GetUndoManager().EnterListAction("", "", 0);
BegUndo(SD_RESSTR(STR_UNDO_CHANGE_TITLE_AND_LAYOUT));
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 240abf8..8dafcc3 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -464,7 +464,7 @@ void SdrModel::BegUndo()
{
if( mpImpl->mpUndoManager )
{
- mpImpl->mpUndoManager->EnterListAction("","");
+ mpImpl->mpUndoManager->EnterListAction("","",0);
nUndoLevel++;
}
else if( IsUndoEnabled() )
@@ -485,7 +485,7 @@ void SdrModel::BegUndo(const OUString& rComment)
{
if( mpImpl->mpUndoManager )
{
- mpImpl->mpUndoManager->EnterListAction( rComment, "" );
+ mpImpl->mpUndoManager->EnterListAction( rComment, "", 0 );
nUndoLevel++;
}
else if( IsUndoEnabled() )
@@ -507,7 +507,7 @@ void SdrModel::BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrR
{
aComment = aComment.replaceFirst("%1", rObjDescr);
}
- mpImpl->mpUndoManager->EnterListAction( aComment,"" );
+ mpImpl->mpUndoManager->EnterListAction( aComment,"",0 );
nUndoLevel++;
}
else if( IsUndoEnabled() )
More information about the Libreoffice-commits
mailing list