[Libreoffice-commits] core.git: configmgr/source connectivity/source cui/source dbaccess/source filter/source idlc/inc linguistic/source sc/source sd/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 17 12:11:53 UTC 2020
configmgr/source/broadcaster.hxx | 26 ++++-----------
connectivity/source/drivers/postgresql/pq_connection.cxx | 7 +---
connectivity/source/inc/hsqldb/HConnection.hxx | 5 --
cui/source/inc/macropg.hxx | 3 -
dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx | 2 -
dbaccess/source/filter/hsqldb/parseschema.cxx | 2 -
dbaccess/source/ui/dlg/advancedsettings.hxx | 3 -
filter/source/svg/svgwriter.hxx | 5 --
idlc/inc/astinterface.hxx | 4 --
linguistic/source/convdic.hxx | 3 -
linguistic/source/convdicxml.cxx | 2 -
sc/source/core/data/dpsave.cxx | 3 -
sc/source/filter/inc/xicontent.hxx | 3 -
sc/source/ui/inc/retypepassdlg.hxx | 7 +---
sd/source/ui/annotations/annotationmanagerimpl.hxx | 3 -
15 files changed, 20 insertions(+), 58 deletions(-)
New commits:
commit dd6db74abddfe27671c2593eefefa871466b02f5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Aug 17 09:26:16 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Aug 17 14:11:12 2020 +0200
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 at collabora.co.uk>
diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx
index bdb39adfbcbf..40778979ac1a 100644
--- a/configmgr/source/broadcaster.hxx
+++ b/configmgr/source/broadcaster.hxx
@@ -126,25 +126,13 @@ private:
css::util::ChangesEvent const & theEvent);
};
- typedef std::vector< DisposeNotification > DisposeNotifications;
-
- typedef std::vector< ContainerNotification > ContainerNotifications;
-
- typedef std::vector< PropertyChangeNotification >
- PropertyChangeNotifications;
-
- typedef std::vector< PropertiesChangeNotification >
- PropertiesChangeNotifications;
-
- typedef std::vector< ChangesNotification > ChangesNotifications;
-
- DisposeNotifications disposeNotifications_;
- ContainerNotifications containerElementInsertedNotifications_;
- ContainerNotifications containerElementRemovedNotifications_;
- ContainerNotifications containerElementReplacedNotifications_;
- PropertyChangeNotifications propertyChangeNotifications_;
- PropertiesChangeNotifications propertiesChangeNotifications_;
- ChangesNotifications changesNotifications_;
+ std::vector< DisposeNotification > disposeNotifications_;
+ std::vector< ContainerNotification > containerElementInsertedNotifications_;
+ std::vector< ContainerNotification > containerElementRemovedNotifications_;
+ std::vector< ContainerNotification > containerElementReplacedNotifications_;
+ std::vector< PropertyChangeNotification > propertyChangeNotifications_;
+ std::vector< PropertiesChangeNotification > propertiesChangeNotifications_;
+ std::vector< ChangesNotification > changesNotifications_;
};
}
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index b0521d0a83a7..43ce0bc6ba2b 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -133,14 +133,11 @@ Connection::~Connection()
m_settings.pConnection = nullptr;
}
}
-typedef std::vector< css::uno::Reference< css::sdbc::XCloseable > > CloseableVector;
-
-typedef std::vector< css::uno::Reference< css::lang::XComponent > > DisposeableVector;
void Connection::close()
{
- CloseableVector vectorCloseable;
- DisposeableVector vectorDispose;
+ std::vector< css::uno::Reference< css::sdbc::XCloseable > > vectorCloseable;
+ std::vector< css::uno::Reference< css::lang::XComponent > > vectorDispose;
{
MutexGuard guard( m_xMutex->GetMutex() );
// silently ignore, if the connection has been closed already
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 93efe9dfb9d2..78bcfe26eaf1 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -130,12 +130,9 @@ namespace connectivity::hsqldb
class MethodGuard : public ::osl::MutexGuard
{
- private:
- typedef ::osl::MutexGuard BaseGuard;
-
public:
MethodGuard( const IMethodGuardAccess& _rComponent )
- :BaseGuard( _rComponent.getMutex() )
+ : ::osl::MutexGuard( _rComponent.getMutex() )
{
_rComponent.checkDisposed();
}
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 5017aeeabfe8..26ea92f65ad5 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -42,7 +42,6 @@ struct EventDisplayName
{
}
};
-typedef std::vector< EventDisplayName > EventDisplayNames;
class SvxMacroTabPage_;
class SvTabListBox;
@@ -66,7 +65,7 @@ protected:
EventsHash m_appEventsHash;
EventsHash m_docEventsHash;
bool bDocModified, bAppEvents, bInitialized;
- EventDisplayNames aDisplayNames;
+ std::vector< EventDisplayName > aDisplayNames;
SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemSet);
diff --git a/dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx b/dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx
index 6211916fcd05..c02da2c4b411 100644
--- a/dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx
+++ b/dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx
@@ -22,8 +22,6 @@
namespace dbahsql
{
-using ColumnTypeVector = std::vector<ColumnDefinition>;
-
HsqlBinaryNode::HsqlBinaryNode(sal_Int32 nPos)
: m_nPos(nPos)
{
diff --git a/dbaccess/source/filter/hsqldb/parseschema.cxx b/dbaccess/source/filter/hsqldb/parseschema.cxx
index d2215e96eb31..6dfc59778bf0 100644
--- a/dbaccess/source/filter/hsqldb/parseschema.cxx
+++ b/dbaccess/source/filter/hsqldb/parseschema.cxx
@@ -102,8 +102,6 @@ using namespace css::io;
using namespace css::uno;
using namespace css::embed;
-typedef std::vector<ColumnDefinition> ColumnTypeVector;
-
SchemaParser::SchemaParser(Reference<XStorage>& rStorage)
: m_rStorage(rStorage)
{
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 8efc8642863d..80edec0d4a68 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -27,7 +27,6 @@
namespace dbaui
{
struct BooleanSettingDesc;
- typedef std::vector< BooleanSettingDesc > BooleanSettingDescs;
// SpecialSettingsPage
// implements the "Special Settings" page of the advanced database settings
@@ -58,7 +57,7 @@ namespace dbaui
std::map<weld::ToggleButton*, TriState> m_aTriStates;
- BooleanSettingDescs m_aBooleanSettings;
+ std::vector< BooleanSettingDesc > m_aBooleanSettings;
bool m_bHasBooleanComparisonMode;
bool m_bHasMaxRowScan;
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index fea556060619..d582a42c37af 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -196,9 +196,6 @@ struct BulletListItemInfo
class SVGTextWriter final
{
- public:
- typedef std::unordered_map< OUString, BulletListItemInfo > BulletListItemInfoMap;
-
private:
SVGExport& mrExport;
SVGAttributeWriter& mrAttributeWriter;
@@ -224,7 +221,7 @@ class SVGTextWriter final
bool mbIsNewListItem;
sal_Int16 meNumberingType;
sal_Unicode mcBulletChar;
- BulletListItemInfoMap maBulletListItemMap;
+ std::unordered_map< OUString, BulletListItemInfo > maBulletListItemMap;
bool mbIsListLevelStyleImage;
bool mbLineBreak;
bool mbIsURLField;
diff --git a/idlc/inc/astinterface.hxx b/idlc/inc/astinterface.hxx
index b83c79657252..7e3e1e30bad6 100644
--- a/idlc/inc/astinterface.hxx
+++ b/idlc/inc/astinterface.hxx
@@ -32,8 +32,6 @@ class AstInterface : public AstType
public:
typedef std::vector< InheritedInterface > InheritedInterfaces;
- typedef std::vector< AstInterface const * > DoubleInterfaceDeclarations;
-
struct DoubleMemberDeclaration {
AstDeclaration const * first;
AstDeclaration const * second;
@@ -42,7 +40,7 @@ public:
typedef std::vector< DoubleMemberDeclaration > DoubleMemberDeclarations;
struct DoubleDeclarations {
- DoubleInterfaceDeclarations interfaces;
+ std::vector< AstInterface const * > interfaces;
DoubleMemberDeclarations members;
};
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 23d51f87f440..d15fe83a085c 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -41,9 +41,6 @@
bool IsConvDic( const OUString &rFileURL, LanguageType &nLang, sal_Int16 &nConvType );
typedef std::unordered_multimap<OUString, OUString> ConvMap;
-
-typedef std::set<OUString> ConvMapKeySet;
-
typedef std::unordered_multimap<OUString, sal_Int16> PropTypeMap;
class ConvDic :
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 3cd2f950ff85..f7503732465f 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -294,7 +294,7 @@ ErrCode ConvDicXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum /*eClass
void ConvDicXMLExport::ExportContent_()
{
// acquire sorted list of all keys
- ConvMapKeySet aKeySet;
+ std::set<OUString> aKeySet;
for (auto const& elem : rDic.aFromLeft)
aKeySet.insert( elem.first );
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;
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 92d27cd8a81b..a41e8cc88b18 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -41,7 +41,6 @@ namespace sd
{
class ViewShellBase;
-typedef std::vector< rtl::Reference< AnnotationTag > > AnnotationTagVector;
namespace tools {
class EventMultiplexerEvent;
@@ -123,7 +122,7 @@ private:
ViewShellBase& mrBase;
SdDrawDocument* mpDoc;
- AnnotationTagVector maTagVector;
+ std::vector< rtl::Reference< AnnotationTag > > maTagVector;
css::uno::Reference< css::drawing::XDrawView > mxView;
css::uno::Reference< css::office::XAnnotationAccess > mxCurrentPage;
More information about the Libreoffice-commits
mailing list