diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-26 16:07:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-28 08:08:52 +0200 |
| commit | edd0d35590fc368c6c06a9bb5c108aacbc742371 (patch) | |
| tree | 467434c8c07ae5291b3347fe326cad12cc08f1ba /sd | |
| parent | a3783c0af4bd21eb9c001aadc60c660c06a47779 (diff) | |
loplugin:countusersofdefaultparams
Change-Id: I84868b3115c534a8240394283cc3beedf8cb3a80
Reviewed-on: https://gerrit.libreoffice.org/53543
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/drawdoc.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/DrawDocShell.hxx | 2 | ||||
| -rw-r--r-- | sd/workben/custompanel/ctp_panel.cxx | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 5ddb69a9b451..ac824cf90653 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -459,7 +459,7 @@ public: SAL_DLLPRIVATE void Merge(SdrModel& rSourceModel, sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, - bool bMergeMasterPages, bool bAllMasterPages = false, + bool bMergeMasterPages, bool bAllMasterPages, bool bUndo = true, bool bTreadSourceAsConst = false) override; css::text::WritingMode GetDefaultWritingMode() const; diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 3860e025508a..7012e2113433 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -93,7 +93,7 @@ public: virtual bool SaveAs( SfxMedium &rMedium ) override; virtual ::tools::Rectangle GetVisArea(sal_uInt16 nAspect) const override; - virtual void Draw(OutputDevice*, const JobSetup& rSetup, sal_uInt16 nAspect = ASPECT_CONTENT) override; + virtual void Draw(OutputDevice*, const JobSetup& rSetup, sal_uInt16 nAspect) override; virtual ::svl::IUndoManager* GetUndoManager() override; virtual Printer* GetDocumentPrinter() override; diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx index 536eb3d0828b..b7b1cf3e62d9 100644 --- a/sd/workben/custompanel/ctp_panel.cxx +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -84,7 +84,7 @@ namespace sd { namespace colortoolpanel } catch( const Exception& ) { - DBG_UNHANDLED_EXCEPTION(); + DBG_UNHANDLED_EXCEPTION("sd"); } return NULL; } @@ -114,7 +114,7 @@ namespace sd { namespace colortoolpanel } catch( const Exception& ) { - DBG_UNHANDLED_EXCEPTION(); + DBG_UNHANDLED_EXCEPTION("sd"); } osl_atomic_increment( &m_refCount ); if ( xParentWindow.is() ) @@ -182,7 +182,7 @@ namespace sd { namespace colortoolpanel } catch( const Exception& ) { - DBG_UNHANDLED_EXCEPTION(); + DBG_UNHANDLED_EXCEPTION("sd"); } } @@ -205,7 +205,7 @@ namespace sd { namespace colortoolpanel } catch( const Exception& ) { - DBG_UNHANDLED_EXCEPTION(); + DBG_UNHANDLED_EXCEPTION("sd"); } m_xWindow.clear(); } |