From dd6db74abddfe27671c2593eefefa871466b02f5 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 17 Aug 2020 09:26:16 +0200
Subject: inline some use-once typedefs

Change-Id: I683175c1e788a2a4cfec9504dc8dc3ebfee7c5de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100858
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 sc/source/core/data/dpsave.cxx     | 3 +--
 sc/source/filter/inc/xicontent.hxx | 3 +--
 sc/source/ui/inc/retypepassdlg.hxx | 7 ++-----
 3 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'sc')

diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 692186dacd5e..8ae1f8b3657f 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -610,11 +610,10 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
 
 void ScDPSaveDimension::UpdateMemberVisibility(const std::unordered_map<OUString, bool>& rData)
 {
-    typedef std::unordered_map<OUString, bool> DataMap;
     for (ScDPSaveMember* pMem : maMemberList)
     {
         const OUString& rMemName = pMem->GetName();
-        DataMap::const_iterator itr = rData.find(rMemName);
+        auto itr = rData.find(rMemName);
         if (itr != rData.end())
             pMem->SetIsVisible(itr->second);
     }
diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx
index 8f3fdc183696..7c0d50a75d45 100644
--- a/sc/source/filter/inc/xicontent.hxx
+++ b/sc/source/filter/inc/xicontent.hxx
@@ -185,9 +185,8 @@ private:
 
         explicit DVItem ( const ScRangeList& rRanges, const ScValidationData& rValidData );
     };
-    typedef std::vector< std::unique_ptr<DVItem> > DVItemList;
 
-    DVItemList maDVItems;
+    std::vector< std::unique_ptr<DVItem> > maDVItems;
 };
 
 // Web queries ================================================================
diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx
index 60321a73f038..4d5b9f48fd8c 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -40,9 +40,6 @@ struct PassFragment
 class ScRetypePassDlg : public weld::GenericDialogController
 {
 public:
-    typedef std::shared_ptr<ScDocProtection>    DocProtectionPtr;
-    typedef std::shared_ptr<ScTableProtection>  TabProtectionPtr;
-
     explicit ScRetypePassDlg(weld::Window* pParent);
     virtual ~ScRetypePassDlg() override;
 
@@ -79,11 +76,11 @@ private:
     struct TableItem
     {
         OUString       maName;
-        TabProtectionPtr    mpProtect;
+        std::shared_ptr<ScTableProtection> mpProtect;
     };
     ::std::vector<TableItem> maTableItems;
 
-    DocProtectionPtr    mpDocItem;
+    std::shared_ptr<ScDocProtection> mpDocItem;
     ScPasswordHash      meDesiredHash;
 
     std::unique_ptr<weld::Button> mxBtnOk;
-- 
cgit