summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-08-01 11:46:42 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-08-02 10:55:53 +0200
commit2aa728780e273feaa3646f0299b727c02502c18d (patch)
tree6e63c49624ebf735849b98aff2aa724c589fcc05 /sd
parent4d1e53bcbd8af9655ea5d6b1cd5b03436b25feb7 (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 'sd')
-rw-r--r--sd/inc/undo/undomanager.hxx2
-rw-r--r--sd/source/core/drawdoc3.cxx4
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx2
-rw-r--r--sd/source/ui/func/fubullet.cxx4
-rw-r--r--sd/source/ui/func/fuinsfil.cxx2
-rw-r--r--sd/source/ui/func/fuoaprms.cxx2
-rw-r--r--sd/source/ui/func/fupage.cxx2
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.cxx2
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx2
-rw-r--r--sd/source/ui/view/drawview.cxx4
-rw-r--r--sd/source/ui/view/drviews2.cxx2
-rw-r--r--sd/source/ui/view/outlview.cxx2
12 files changed, 15 insertions, 15 deletions
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index 53bfc4b55df9..ecea0ed3949e 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 36e16cc5caf4..fe2f66cacbf2 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -488,7 +488,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
@@ -1426,7 +1426,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 44c10f1bb7f9..c8ae5ed0fe96 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -249,7 +249,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 d98fe2f80a4d..9bd341923ba9 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 b768b077d23c..c1c7a73977de 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -637,7 +637,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 a7068b0bff56..2f4c67204e19 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -618,7 +618,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 96a1ef37db05..91670b3b01bf 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -412,7 +412,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 9e1d855e469d..61205a255fdf 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -320,7 +320,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 794430425dbc..75c5ca19b0be 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -175,7 +175,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 4343113ddcc8..f929197eda81 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 40e34a0752e4..4852ef384b75 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -210,7 +210,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 0359203f96a6..09f1008f839e 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1455,7 +1455,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));
}