diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:56:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:56:11 +0200 |
| commit | c9bb48386bad7d2a40e6958883328145ae439cad (patch) | |
| tree | 8576ed314b2d219fdd96b8c1990f16fb70847a54 /sd/source | |
| parent | 9865440d217d975206a3f91612f0666312bc8fd8 (diff) | |
Revert "new loplugin typedefparam"
This reverts commit 9865440d217d975206a3f91612f0666312bc8fd8.
This is not ready to land yet, seems like the latest update
of the logic reveals a bunch more places I need to fix before it can land.
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/core/sdpage_animations.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index cb91df1caf3b..379edc9eba4e 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::presentation; using ::com::sun::star::drawing::XShape; /** returns a helper class to manipulate effects inside the main sequence */ -std::shared_ptr< sd::MainSequence > const & SdPage::getMainSequence() +sd::MainSequencePtr const & SdPage::getMainSequence() { if (nullptr == mpMainSequence) mpMainSequence.reset( new sd::MainSequence( getAnimationNode() ) ); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index fa22290a15d6..744e789fc46b 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -107,7 +107,7 @@ protected: virtual void AssignMasterPageToPageList ( SdPage* pMasterPage, - const std::shared_ptr<std::vector<SdPage*>>& rPageList); + const ::sd::slidesorter::SharedPageSelection& rPageList); virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent); |