diff options
author | Collabora <l.lunak@collabora.com> | 2021-07-15 12:18:49 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2021-07-23 10:32:08 +0200 |
commit | 2d04d7cc559445d8c1559af6af6d981d9f682db4 (patch) | |
tree | 8f9ed81590800f772f162f93473c654f4eefb468 /extensions/source | |
parent | a470d97f2ddcb3607ae9d1df871a59f04d823564 (diff) |
do not use "using namespace std" in headers
It's a bad style, doing that in headers can affect many source files
(especially with PCH used).
Change-Id: Ic9091a1d018e74606c9fa95df71a55faaa93d4ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119011
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/ole/ole2uno.hxx | 1 | ||||
-rw-r--r-- | extensions/source/ole/oleobjw.hxx | 3 | ||||
-rw-r--r-- | extensions/source/ole/servprov.hxx | 3 | ||||
-rw-r--r-- | extensions/source/ole/unoobjw.hxx | 3 |
4 files changed, 3 insertions, 7 deletions
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index ca166415fa74..5fcf2fd96ad8 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.hxx @@ -45,7 +45,6 @@ using namespace com::sun::star::registry; using namespace com::sun::star::reflection; using namespace com::sun::star::beans; using namespace osl; -using namespace std; VARTYPE getVarType(const Any& val); /* creates a Type object for a given type name. diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 97ba2f0be8f0..d1a1d0ed81fc 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -41,12 +41,11 @@ #include "unoconversionutilities.hxx" #include "windata.hxx" using namespace cppu; -using namespace std; using namespace com::sun::star::lang; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::oleautomation; -typedef std::unordered_map<OUString, pair<DISPID, unsigned short>> DispIdMap; +typedef std::unordered_map<OUString, std::pair<DISPID, unsigned short>> DispIdMap; typedef std::unordered_multimap<OUString, unsigned int> TLBFuncIndexMap; diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx index 6b9275da17ad..8871f28cf7a0 100644 --- a/extensions/source/ole/servprov.hxx +++ b/extensions/source/ole/servprov.hxx @@ -30,7 +30,6 @@ using namespace com::sun::star::bridge; using namespace cppu; -using namespace std; /// @throws Exception Reference< XInterface> ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr); @@ -176,7 +175,7 @@ public: protected: bool provideInstance(std::function<const Reference<XInterface>()> xInstFunction, GUID const * guid); - list< OneInstanceOleWrapper* > m_wrapperList; + std::list< OneInstanceOleWrapper* > m_wrapperList; Reference< XBridgeSupplier2 > m_bridgeSupplier; Reference<XMultiServiceFactory> m_smgr; diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx index 9b3c6b6b751c..845724d819ae 100644 --- a/extensions/source/ole/unoobjw.hxx +++ b/extensions/source/ole/unoobjw.hxx @@ -40,7 +40,6 @@ #define DISPID_GET_STRUCT_FUNC -102 #define DISPID_CREATE_TYPE_FUNC -103 -using namespace std; using namespace cppu; using namespace com::sun::star::bridge; using namespace com::sun::star::script; @@ -196,7 +195,7 @@ protected: Reference<XExactName> m_xExactName; Reference<XInterface> m_xOrigin; NameToIdMap m_nameToDispIdMap; - vector<MemberInfo> m_MemberInfos; + std::vector<MemberInfo> m_MemberInfos; // This member is used to determine the default value // denoted by DISPID_VALUE (0). For proper results in JavaScript // we have to return the default value when we write an object |