re-land "new loplugin typedefparam""

This reverts commit c9bb48386bad7d2a40e6958883328145ae439cad,
and adds a bunch more fixes.

Change-Id: Ib584d302a73125528eba85fa1e722cb6fc41538a
Reviewed-on: https://gerrit.libreoffice.org/68680
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 21 insertions, 21 deletions

diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx
index 379edc9eba4e..cb91df1caf3b 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 */
-sd::MainSequencePtr const & SdPage::getMainSequence()
+std::shared_ptr< sd::MainSequence >  const & SdPage::getMainSequence()
 {
     if (nullptr == mpMainSequence)
         mpMainSequence.reset( new sd::MainSequence( getAnimationNode() ) );
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index f96cb090ad25..dfc923a01c6b 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -247,7 +247,7 @@ Size const & MasterPageContainer::GetPreviewSizePixel() const
 }
 
 MasterPageContainer::Token MasterPageContainer::PutMasterPage (
-    const SharedMasterPageDescriptor& rDescriptor)
+    const std::shared_ptr<MasterPageDescriptor>& rDescriptor)
 {
     return mpImpl->PutMasterPage(rDescriptor);
 }
@@ -448,7 +448,7 @@ sal_Int32 MasterPageContainer::GetTemplateIndexForToken (Token aToken)
         return -1;
 }
 
-SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken (
+std::shared_ptr<MasterPageDescriptor> MasterPageContainer::GetDescriptorForToken (
     MasterPageContainer::Token aToken)
 {
     const ::osl::MutexGuard aGuard (mpImpl->maMutex);
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 1bf528861cc8..18c55417fdf7 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -392,7 +392,7 @@ void MasterPagesSelector::AssignMasterPageToSelectedSlides (
 
 void MasterPagesSelector::AssignMasterPageToPageList (
     SdPage* pMasterPage,
-    const ::sd::slidesorter::SharedPageSelection& rPageList)
+    const std::shared_ptr<std::vector<SdPage*>>& rPageList)
 {
     DocumentHelper::AssignMasterPageToPageList(mrDocument, pMasterPage, rPageList);
 }
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 744e789fc46b..fa22290a15d6 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 ::sd::slidesorter::SharedPageSelection& rPageList);
+        const std::shared_ptr<std::vector<SdPage*>>& rPageList);
 
     virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent);
 
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index 6fb776e2e6f3..f9f3b27c9337 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -299,7 +299,7 @@ void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue)
         mpSlideSorter->GetProperties()->SetSmoothSelectionScrolling(bValue);
 }
 
-util::Color SAL_CALL SlideSorterService::getBackgroundColor()
+sal_Int32 SAL_CALL SlideSorterService::getBackgroundColor()
 {
     ThrowIfDisposed();
     if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
@@ -309,14 +309,14 @@ util::Color SAL_CALL SlideSorterService::getBackgroundColor()
             mpSlideSorter->GetProperties()->GetBackgroundColor());
 }
 
-void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundColor)
+void SAL_CALL SlideSorterService::setBackgroundColor (sal_Int32 aBackgroundColor)
 {
     ThrowIfDisposed();
     if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
         mpSlideSorter->GetProperties()->SetBackgroundColor(Color(aBackgroundColor));
 }
 
-util::Color SAL_CALL SlideSorterService::getTextColor()
+sal_Int32 SAL_CALL SlideSorterService::getTextColor()
 {
     ThrowIfDisposed();
     if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
@@ -326,14 +326,14 @@ util::Color SAL_CALL SlideSorterService::getTextColor()
             mpSlideSorter->GetProperties()->GetTextColor());
 }
 
-void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor)
+void SAL_CALL SlideSorterService::setTextColor (sal_Int32 aTextColor)
 {
     ThrowIfDisposed();
     if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
         mpSlideSorter->GetProperties()->SetTextColor(Color(aTextColor));
 }
 
-util::Color SAL_CALL SlideSorterService::getSelectionColor()
+sal_Int32 SAL_CALL SlideSorterService::getSelectionColor()
 {
     ThrowIfDisposed();
     if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
@@ -343,14 +343,14 @@ util::Color SAL_CALL SlideSorterService::getSelectionColor()
             mpSlideSorter->GetProperties()->GetSelectionColor());
 }
 
-void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor)
+void SAL_CALL SlideSorterService::setSelectionColor (sal_Int32 aSelectionColor)
 {
     ThrowIfDisposed();
     if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
         mpSlideSorter->GetProperties()->SetSelectionColor(Color(aSelectionColor));
 }
 
-util::Color SAL_CALL SlideSorterService::getHighlightColor()
+sal_Int32 SAL_CALL SlideSorterService::getHighlightColor()
 {
     ThrowIfDisposed();
     if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
@@ -360,7 +360,7 @@ util::Color SAL_CALL SlideSorterService::getHighlightColor()
             mpSlideSorter->GetProperties()->GetHighlightColor());
 }
 
-void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor)
+void SAL_CALL SlideSorterService::setHighlightColor (sal_Int32 aHighlightColor)
 {
     ThrowIfDisposed();
     if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index f1a21818d3b4..2a39548b05e7 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -114,21 +114,21 @@ public:
 
     virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) override;
 
-    virtual css::util::Color SAL_CALL getBackgroundColor() override;
+    virtual sal_Int32 SAL_CALL getBackgroundColor() override;
 
-    virtual void SAL_CALL setBackgroundColor (css::util::Color aBackgroundColor) override;
+    virtual void SAL_CALL setBackgroundColor (sal_Int32 aBackgroundColor) override;
 
-    virtual css::util::Color SAL_CALL getTextColor() override;
+    virtual sal_Int32 SAL_CALL getTextColor() override;
 
-    virtual void SAL_CALL setTextColor (css::util::Color aTextColor) override;
+    virtual void SAL_CALL setTextColor (sal_Int32 aTextColor) override;
 
-    virtual css::util::Color SAL_CALL getSelectionColor() override;
+    virtual sal_Int32 SAL_CALL getSelectionColor() override;
 
-    virtual void SAL_CALL setSelectionColor (css::util::Color aSelectionColor) override;
+    virtual void SAL_CALL setSelectionColor (sal_Int32 aSelectionColor) override;
 
-    virtual css::util::Color SAL_CALL getHighlightColor() override;
+    virtual sal_Int32 SAL_CALL getHighlightColor() override;
 
-    virtual void SAL_CALL setHighlightColor (css::util::Color aHighlightColor) override;
+    virtual void SAL_CALL setHighlightColor (sal_Int32 aHighlightColor) override;
 
     virtual sal_Bool SAL_CALL getIsUIReadOnly() override;