summaryrefslogtreecommitdiffstats
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-01 10:32:27 +0000
commit6850f4e8454652ec475811860f5e8cf9bdea67a7 (patch)
treeb5d47bbccea41f303d83086e702239de2c666525 /sd
parent[GSoC] Add functionality to disable buttons in SvxMessDialog (diff)
downloadcore-6850f4e8454652ec475811860f5e8cf9bdea67a7.tar.gz
core-6850f4e8454652ec475811860f5e8cf9bdea67a7.zip
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@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/undo/undomanager.hxx2
-rw-r--r--sd/source/core/drawdoc3.cxx4
-rwxr-xr-xsd/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 b736595418a3..33656fe616d6 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 1b7de206fbbe..92f4d909677f 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 666952a9ebf6..f03dfa544f20 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 87391049f8cb..1a4152be0e9c 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 621e7919419d..6dc2bbabab40 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 8d56182bb00f..712549e1b00f 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 30e43c9b15f8..0380081644b9 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 f50e3b002ca3..709ab58a81cf 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 df01fde9d11d..6ba151f9f9f8 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 214cc7351fb1..ca3c3704b529 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 00dd7eb55cbb..024b5be5d39f 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));
}