From c9bb48386bad7d2a40e6958883328145ae439cad Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 4 Mar 2019 08:56:11 +0200
Subject: 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.
---
 sfx2/source/dialog/filedlghelper.cxx | 2 +-
 sfx2/source/dialog/filedlgimpl.hxx   | 2 +-
 sfx2/source/dialog/templdlg.cxx      | 2 +-
 sfx2/source/inc/macroloader.hxx      | 2 +-
 sfx2/source/inc/templdgi.hxx         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sfx2')

diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 33c7ed012f40..154f742b1fc2 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2401,7 +2401,7 @@ void FileDialogHelper::StartExecuteModal( const Link<FileDialogHelper*,void>& rE
         mpImpl->implStartExecute();
 }
 
-sal_Int16 FileDialogHelper::GetDialogType() const { return mpImpl ? mpImpl->m_nDialogType : 0; }
+short FileDialogHelper::GetDialogType() const { return mpImpl ? mpImpl->m_nDialogType : 0; }
 
 bool FileDialogHelper::IsPasswordEnabled() const
 {
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index b3de82cbe6a5..57f73d5c79e3 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -167,7 +167,7 @@ namespace sfx2
         // Own methods
                                 FileDialogHelper_Impl(
                                     FileDialogHelper* _pAntiImpl,
-                                    const sal_Int16 nDialogType,
+                                    const short nDialogType,
                                     FileDialogFlags nFlags,
                                     sal_Int16 nDialog,
                                     weld::Window* pFrameWeld,
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index f3d4fb3024fc..c638c8be836a 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -437,7 +437,7 @@ bool StyleTreeListBox_Impl::EventNotify( NotifyEvent& rNEvt )
 TriState StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry*  pTarget,
                                          SvTreeListEntry*  pEntry,
                                          SvTreeListEntry*& rpNewParent,
-                                         sal_uLong& lPos)
+                                         sal_uIntPtr& lPos)
 {
     if(!pTarget || !pEntry)
         return TRISTATE_FALSE;
diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx
index 9e1dfba18ed0..54decff36a37 100644
--- a/sfx2/source/inc/macroloader.hxx
+++ b/sfx2/source/inc/macroloader.hxx
@@ -68,7 +68,7 @@ public:
 
     virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch(
             const css::util::URL& aURL, const OUString& sTargetFrameName,
-            sal_Int32 eSearchFlags ) override;
+            FrameSearchFlags eSearchFlags ) override;
 
     virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches(
             const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor ) override;
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 9ab64b0262a7..c371fb74e8fd 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -104,7 +104,7 @@ protected:
     virtual void ExpandedHdl() override;
     virtual TriState NotifyMoving(
                 SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
-                SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) override;
+                SvTreeListEntry*& rpNewParent, sal_uIntPtr& rNewChildPos) override;
 public:
     StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle);
 
-- 
cgit