[Libreoffice-commits] core.git: include/filter include/svl include/svx include/vcl include/xmloff

[Noel Grandin (via logerrit)]

 include/filter/msfilter/escherex.hxx      |    3 +--
 include/svl/svdde.hxx                     |    7 +++----
 include/svx/xmlgrhlp.hxx                  |    5 ++---
 include/vcl/builder.hxx                   |    3 +--
 include/xmloff/XMLEventsImportContext.hxx |    4 +---
 5 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 30562669909def344c529e9c899c03248bc11149
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jul 30 14:24:06 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jul 30 18:26:33 2020 +0200

    inline some use-once typedefs
    
    Change-Id: I66400bcfef1d609662f44cc25a4984b68efb4b44
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99801
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 9acfb51bd892..f55074ecf856 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1025,7 +1025,6 @@ private:
         sal_uInt32          mnNextShapeId;      /// Next free shape identifier in this cluster.
         explicit     ClusterEntry( sal_uInt32 nDrawingId ) : mnDrawingId( nDrawingId ), mnNextShapeId( 0 ) {}
     };
-    typedef ::std::vector< ClusterEntry > ClusterTable;
 
     struct DrawingInfo
     {
@@ -1036,7 +1035,7 @@ private:
     };
     typedef ::std::vector< DrawingInfo > DrawingInfoVector;
 
-    ClusterTable        maClusterTable;     /// List with cluster IDs (used object IDs in drawings).
+    std::vector< ClusterEntry > maClusterTable;     /// List with cluster IDs (used object IDs in drawings).
     DrawingInfoVector   maDrawingInfos;     /// Data about all used drawings.
     SvStream*           mpPicStrm;          /// Cached result of ImplQueryPictureStream().
     bool                mbHasDggCont;       /// True = the DGGCONTAINER has been initialized.
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 546b20710e88..c0d5975e84c7 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -40,8 +40,6 @@ struct DdeItemImpData;
 struct Conversation;
 
 typedef ::std::vector< DdeService* > DdeServices;
-typedef ::std::vector< long > DdeFormats;
-typedef std::vector<std::unique_ptr<Conversation>> ConvList;
 
 
 class SVL_DLLPUBLIC DdeData
@@ -287,10 +285,11 @@ protected:
     const DdeTopic* GetSysTopic() const { return pSysTopic; }
 private:
     std::vector<DdeTopic*> aTopics;
-    DdeFormats      aFormats;
+    std::vector< long >    aFormats;
     DdeTopic*       pSysTopic;
     DdeString*      pName;
-    ConvList        m_vConv;
+    std::vector<std::unique_ptr<Conversation>>
+                    m_vConv;
     short           nStatus;
 
     SVL_DLLPRIVATE bool HasCbFormat( sal_uInt16 );
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index 37d8c63bda35..e72bae191b54 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -49,12 +49,11 @@ class SVXCORE_DLLPUBLIC SvXMLGraphicHelper final : public cppu::WeakComponentImp
                                                                                     css::document::XBinaryStreamResolver>
 {
 private:
-    typedef ::std::vector< css::uno::Reference< css::io::XOutputStream > >    GraphicOutputStreamVector;
-
     ::osl::Mutex                maMutex;
     css::uno::Reference < css::embed::XStorage > mxRootStorage;
     OUString             maCurStorageName;
-    GraphicOutputStreamVector   maGrfStms;
+    std::vector< css::uno::Reference< css::io::XOutputStream > >
+                                maGrfStms;
 
     std::unordered_map<OUString, css::uno::Reference<css::graphic::XGraphic>> maGraphicObjects;
     std::unordered_map<Graphic, std::pair<OUString, OUString>> maExportGraphics;
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 64f929248fb5..9ceca5cb53dd 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -252,7 +252,6 @@ private:
         SizeGroup() {}
     };
 
-    typedef std::map<VclPtr<vcl::Window>, stringmap> AtkMap;
 
     struct ParserState
     {
@@ -282,7 +281,7 @@ private:
 
         std::vector<SizeGroup> m_aSizeGroups;
 
-        AtkMap m_aAtkInfo;
+        std::map<VclPtr<vcl::Window>, stringmap> m_aAtkInfo;
 
         std::vector<MnemonicWidgetMap> m_aMnemonicWidgetMaps;
 
diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx
index 4fb08ffb9d40..fd0a98396f2b 100644
--- a/include/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
@@ -40,8 +40,6 @@ typedef ::std::pair<
             OUString,
             css::uno::Sequence<css::beans::PropertyValue> > EventNameValuesPair;
 
-typedef ::std::vector< EventNameValuesPair > EventsVector;
-
 /**
  * Import <script:events> element.
  *
@@ -57,7 +55,7 @@ class XMLOFF_DLLPUBLIC XMLEventsImportContext : public SvXMLImportContext
 
 protected:
     // if no XNameReplace is given, use this vector to collect events
-    EventsVector aCollectEvents;
+    std::vector< EventNameValuesPair > aCollectEvents;
 
 public: