summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/qa/unit/tiledrendering/tiledrendering.cxx8
-rw-r--r--sd/source/filter/ppt/pptin.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx4
-rw-r--r--sd/source/ui/inc/OutlinerIteratorImpl.hxx6
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx12
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx4
-rw-r--r--sd/source/ui/inc/unomodel.hxx2
-rw-r--r--sd/source/ui/view/FormShellManager.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx2
9 files changed, 23 insertions, 19 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 6467cf7d933f..3822664c40e9 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -333,8 +333,12 @@ void SdTiledRenderingTest::testPostMouseEvent()
vcl::Cursor* pCursor = rEditView.GetCursor();
Point aPosition = pCursor->GetPos();
aPosition.setX(aPosition.getX() - 1000);
- pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, convertMm100ToTwip(aPosition.getX()), convertMm100ToTwip(aPosition.getY()), 1);
- pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, convertMm100ToTwip(aPosition.getX()), convertMm100ToTwip(aPosition.getY()), 1);
+ pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN,
+ convertMm100ToTwip(aPosition.getX()), convertMm100ToTwip(aPosition.getY()),
+ 1, MOUSE_LEFT, 0);
+ pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP,
+ convertMm100ToTwip(aPosition.getX()), convertMm100ToTwip(aPosition.getY()),
+ 1, MOUSE_LEFT, 0);
CPPUNIT_ASSERT(pView->GetTextEditObject());
// The new cursor position must be before the first word.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), rEditView.GetSelection().nStartPos);
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index ef69e29c9308..a6a25d26b592 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -64,7 +64,7 @@ class ImplSdPPTImport : public SdrPowerPointImport
void FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiveInfoAtom* pIAtom, const OUString& aMacroName );
- virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) override;
+ virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj = nullptr ) override;
virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPageCapsule pPage,
SfxStyleSheet*, SfxStyleSheet** ) const override;
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 90182198ba3d..300da5f96d59 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -204,7 +204,7 @@ public:
CustomAnimationListEntryItem(const OUString& aDescription,
CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent);
virtual ~CustomAnimationListEntryItem();
- void InitViewData(SvTreeListBox*,SvTreeListEntry*,SvViewDataItem*) override;
+ void InitViewData(SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* = nullptr) override;
SvLBoxItem* Create() const override;
void Clone(SvLBoxItem* pSource) override;
@@ -376,7 +376,7 @@ class CustomAnimationTriggerEntryItem : public SvLBoxString
public:
explicit CustomAnimationTriggerEntryItem( const OUString& aDescription );
virtual ~CustomAnimationTriggerEntryItem();
- void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) override;
+ void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* = nullptr ) override;
SvLBoxItem* Create() const override;
void Clone( SvLBoxItem* pSource ) override;
virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext,
diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index 18468e8d46ce..4df456224a92 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -144,7 +144,7 @@ public:
virtual void GotoNextText() override;
virtual const IteratorPosition& GetPosition() override;
- virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const override;
+ virtual IteratorImplBase* Clone (IteratorImplBase* pObject = nullptr) const override;
virtual bool operator== (const IteratorImplBase& rIterator) const override;
private:
@@ -191,7 +191,7 @@ public:
virtual ~ViewIteratorImpl();
virtual void GotoNextText() override;
- virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const override;
+ virtual IteratorImplBase* Clone (IteratorImplBase* pObject = nullptr) const override;
virtual void Reverse() override;
protected:
@@ -234,7 +234,7 @@ public:
virtual ~DocumentIteratorImpl();
virtual void GotoNextText() override;
- virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const override;
+ virtual IteratorImplBase* Clone (IteratorImplBase* pObject = nullptr) const override;
private:
/// Number of pages in the view that is specified by <member>maPosition</member>.
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 8e667521c7bf..ec0922bae1a6 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -138,15 +138,15 @@ public:
virtual sal_Int8 AcceptDrop (
const AcceptDropEvent& rEvt,
DropTargetHelper& rTargetHelper,
- ::sd::Window* pTargetWindow = nullptr,
- sal_uInt16 nPage = SDRPAGE_NOTFOUND,
- sal_uInt16 nLayer = SDRPAGE_NOTFOUND ) override;
+ ::sd::Window* pTargetWindow,
+ sal_uInt16 nPage,
+ sal_uInt16 nLayer ) override;
virtual sal_Int8 ExecuteDrop (
const ExecuteDropEvent& rEvt,
DropTargetHelper& rTargetHelper,
- ::sd::Window* pTargetWindow = nullptr,
- sal_uInt16 nPage = SDRPAGE_NOTFOUND,
- sal_uInt16 nLayer = SDRPAGE_NOTFOUND) override;
+ ::sd::Window* pTargetWindow,
+ sal_uInt16 nPage,
+ sal_uInt16 nLayer) override;
typedef ::std::vector<SdPage*> PageSelection;
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 4d92b0d671fe..f47a49a0a049 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -114,8 +114,8 @@ public:
void GetState (SfxItemSet& rSet);
/* override these from SfxViewShell */
- virtual OUString GetSelectionText(bool) override;
- virtual bool HasSelection(bool) const override;
+ virtual OUString GetSelectionText(bool = false) override;
+ virtual bool HasSelection(bool = true ) const override;
SvBorder GetBorder (bool bOuterResize);
virtual void InnerResizePixel (const Point& rOrigin, const Size& rSize) override;
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index 894ff3ad873b..158b177c21a0 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -250,7 +250,7 @@ public:
/// @see vcl::ITiledRenderable::postKeyEvent().
virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override;
/// @see vcl::ITiledRenderable::postMouseEvent().
- virtual void postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons = MOUSE_LEFT, int nModifier = 0) override;
+ virtual void postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons, int nModifier) override;
/// @see vcl::ITiledRenderable::setTextSelection().
virtual void setTextSelection(int nType, int nX, int nY) override;
/// @see vcl::ITiledRenderable::getTextSelection().
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index d978012620e1..dd5a0d69caa7 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -37,7 +37,7 @@ class FormShellManagerFactory
{
public:
FormShellManagerFactory (ViewShell& rViewShell, FormShellManager& rManager);
- virtual FmFormShell* CreateShell (ShellId nId, vcl::Window* pParentWindow, FrameView* pFrameView) override;
+ virtual FmFormShell* CreateShell (ShellId nId, vcl::Window* pParentWindow, FrameView* pFrameView = nullptr) override;
virtual void ReleaseShell (SfxShell* pShell) override;
private:
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 32eb612f3aef..7ca5c6a451fc 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -105,7 +105,7 @@ public:
virtual SfxShell* CreateShell (
::sd::ShellId nId,
vcl::Window* pParentWindow,
- ::sd::FrameView* pFrameView) override;
+ ::sd::FrameView* pFrameView = nullptr) override;
virtual void ReleaseShell (SfxShell* pShell) override;
private:
::sd::ViewShell& mrViewShell;