From 552b1fc70fc2fca2ba3d33929f20c3172e9e8bb4 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 21 May 2020 13:43:41 +0200 Subject: inline some use-once typedefs Change-Id: Idddba2f3fd05265b08dbc88edb6152d34a166052 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94730 Tested-by: Jenkins Reviewed-by: Noel Grandin --- package/source/xstor/xstorage.cxx | 4 +--- package/source/xstor/xstorage.hxx | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'package') diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index ae0802f65c0c..017ee528e616 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -72,8 +72,6 @@ using namespace ::com::sun::star; #define THROW_WHERE "" #endif -typedef ::std::vector< uno::WeakReference< lang::XComponent > > WeakComponentVector; - struct StorInternalData_Impl { rtl::Reference m_xSharedMutex; @@ -85,7 +83,7 @@ struct StorInternalData_Impl ::rtl::Reference m_pSubElDispListener; - WeakComponentVector m_aOpenSubComponentsVector; + ::std::vector< uno::WeakReference< lang::XComponent > > m_aOpenSubComponentsVector; ::rtl::Reference< OHierarchyHolder_Impl > m_rHierarchyHolder; diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx index a54ef671db17..6e19a36838f4 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -92,8 +92,6 @@ public: SotElement_Impl(const OUString& rName, bool bStor, bool bNew); }; -typedef ::std::vector< SotElement_Impl* > SotElementVector_Impl; - // Main storage implementation class OStorage; @@ -133,7 +131,7 @@ struct OStorage_Impl } std::unordered_map> m_aChildrenMap; - SotElementVector_Impl m_aDeletedVector; + std::vector< SotElement_Impl* > m_aDeletedVector; css::uno::Reference< css::container::XNameContainer > m_xPackageFolder; -- cgit