tdf#96099 Remove trivial std::map typedefs in [cd]*

Change-Id: I043d265d3d73a3e16f05d5ca7e29a09341651d82
Reviewed-on: https://gerrit.libreoffice.org/56639
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

16 files changed, 54 insertions, 66 deletions

diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 71f4faa16117..5530392b278b 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -94,8 +94,6 @@ OUString createUnoName(
     return buf.makeStringAndClear();
 }
 
-typedef std::set< OUString > Dependencies;
-
 enum SpecialType {
     SPECIAL_TYPE_NONE,
     SPECIAL_TYPE_ANY,
@@ -128,7 +126,7 @@ struct PolymorphicUnoType {
 
 SpecialType translateUnoTypeToDescriptor(
     rtl::Reference< TypeManager > const & manager, OUString const & type,
-    bool array, bool classType, Dependencies * dependencies,
+    bool array, bool classType, std::set<OUString> * dependencies,
     OStringBuffer * descriptor, OStringBuffer * signature,
     bool * needsSignature, PolymorphicUnoType * polymorphicUnoType);
 
@@ -136,7 +134,7 @@ SpecialType translateUnoTypeToDescriptor(
     rtl::Reference< TypeManager > const & manager,
     codemaker::UnoType::Sort sort, OUString const & nucleus, sal_Int32 rank,
     std::vector< OUString > const & arguments, bool array, bool classType,
-    Dependencies * dependencies, OStringBuffer * descriptor,
+    std::set<OUString> * dependencies, OStringBuffer * descriptor,
     OStringBuffer * signature, bool * needsSignature,
     PolymorphicUnoType * polymorphicUnoType)
 {
@@ -274,7 +272,7 @@ SpecialType translateUnoTypeToDescriptor(
 
 SpecialType translateUnoTypeToDescriptor(
     rtl::Reference< TypeManager > const & manager, OUString const & type,
-    bool array, bool classType, Dependencies * dependencies,
+    bool array, bool classType, std::set<OUString> * dependencies,
     OStringBuffer * descriptor, OStringBuffer * signature,
     bool * needsSignature, PolymorphicUnoType * polymorphicUnoType)
 {
@@ -290,7 +288,7 @@ SpecialType translateUnoTypeToDescriptor(
 }
 
 SpecialType getFieldDescriptor(
-    rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
+    rtl::Reference< TypeManager > const & manager, std::set<OUString> * dependencies,
     OUString const & type, OString * descriptor, OString * signature,
     PolymorphicUnoType * polymorphicUnoType)
 {
@@ -316,7 +314,7 @@ class MethodDescriptor {
 public:
     MethodDescriptor(
         rtl::Reference< TypeManager > const & manager,
-        Dependencies * dependencies, OUString const & returnType,
+        std::set<OUString> * dependencies, OUString const & returnType,
         SpecialType * specialReturnType,
         PolymorphicUnoType * polymorphicUnoType);
 
@@ -332,7 +330,7 @@ public:
 
 private:
     rtl::Reference< TypeManager > m_manager;
-    Dependencies * m_dependencies;
+    std::set<OUString> * m_dependencies;
     OStringBuffer m_descriptorStart;
     OString m_descriptorEnd;
     OStringBuffer m_signatureStart;
@@ -341,7 +339,7 @@ private:
 };
 
 MethodDescriptor::MethodDescriptor(
-    rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
+    rtl::Reference< TypeManager > const & manager, std::set<OUString> * dependencies,
     OUString const & returnType, SpecialType * specialReturnType,
     PolymorphicUnoType * polymorphicUnoType):
     m_manager(manager), m_dependencies(dependencies), m_needsSignature(false)
@@ -412,11 +410,11 @@ public:
         bool inParameter, bool outParameter, OString const & methodName,
         sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType);
 
-    sal_uInt16 generateCode(ClassFile::Code & code, Dependencies * dependencies)
+    sal_uInt16 generateCode(ClassFile::Code & code, std::set<OUString> * dependencies)
         const;
 
     void generatePolymorphicUnoTypeCode(
-        ClassFile::Code & code, Dependencies * dependencies) const;
+        ClassFile::Code & code, std::set<OUString> * dependencies) const;
 
 private:
     Kind m_kind;
@@ -480,7 +478,7 @@ TypeInfo::TypeInfo(
 {}
 
 sal_uInt16 TypeInfo::generateCode(
-    ClassFile::Code & code, Dependencies * dependencies) const
+    ClassFile::Code & code, std::set<OUString> * dependencies) const
 {
     switch (m_kind) {
     case KIND_MEMBER:
@@ -572,7 +570,7 @@ sal_uInt16 TypeInfo::generateCode(
 }
 
 void TypeInfo::generatePolymorphicUnoTypeCode(
-    ClassFile::Code & code, Dependencies * dependencies) const
+    ClassFile::Code & code, std::set<OUString> * dependencies) const
 {
     assert(dependencies != nullptr);
     assert(m_polymorphicUnoType.kind != PolymorphicUnoType::KIND_NONE);
@@ -639,7 +637,7 @@ void writeClassFile(
 
 void addTypeInfo(
     OString const & className, std::vector< TypeInfo > const & typeInfo,
-    Dependencies * dependencies, ClassFile * classFile)
+    std::set<OUString> * dependencies, ClassFile * classFile)
 {
     assert(classFile != nullptr);
     std::vector< TypeInfo >::size_type typeInfos = typeInfo.size();
@@ -820,7 +818,7 @@ void handleEnumType(
 }
 
 void addField(
-    rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
+    rtl::Reference< TypeManager > const & manager, std::set<OUString> * dependencies,
     ClassFile * classFile, std::vector< TypeInfo > * typeInfo,
     sal_Int32 typeParameterIndex, OUString const & type, OUString const & name,
     sal_Int32 index)
@@ -853,7 +851,7 @@ void addField(
 sal_uInt16 addFieldInit(
     rtl::Reference< TypeManager > const & manager, OString const & className,
     OUString const & fieldName, bool typeParameter, OUString const & fieldType,
-    Dependencies * dependencies, ClassFile::Code * code)
+    std::set<OUString> * dependencies, ClassFile::Code * code)
 {
     assert(manager.is());
     assert(code != nullptr);
@@ -973,7 +971,7 @@ sal_uInt16 addFieldInit(
 sal_uInt16 addLoadLocal(
     rtl::Reference< TypeManager > const & manager, ClassFile::Code * code,
     sal_uInt16 * index, bool typeParameter, OUString const & type, bool any,
-    Dependencies * dependencies)
+    std::set<OUString> * dependencies)
 {
     assert(manager.is());
     assert(code != nullptr);
@@ -1314,7 +1312,7 @@ sal_uInt16 addLoadLocal(
 }
 
 sal_uInt16 addDirectArgument(
-    rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
+    rtl::Reference< TypeManager > const & manager, std::set<OUString> * dependencies,
     MethodDescriptor * methodDescriptor, ClassFile::Code * code,
     sal_uInt16 * index, OString const & className, OString const & fieldName,
     bool typeParameter, OUString const & fieldType)
@@ -1337,7 +1335,7 @@ sal_uInt16 addDirectArgument(
 }
 
 void addPlainStructBaseArguments(
-    rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
+    rtl::Reference< TypeManager > const & manager, std::set<OUString> * dependencies,
     MethodDescriptor * methodDescriptor, ClassFile::Code * code,
     OUString const & base, sal_uInt16 * index)
 {
@@ -1369,7 +1367,7 @@ void handlePlainStructType(
     const OUString& name,
     rtl::Reference< unoidl::PlainStructTypeEntity > const & entity,
     rtl::Reference< TypeManager > const & manager, JavaOptions const & options,
-    Dependencies * dependencies)
+    std::set<OUString> * dependencies)
 {
     assert(entity.is());
     assert(dependencies != nullptr);
@@ -1445,7 +1443,7 @@ void handlePolyStructType(
     rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > const &
         entity,
     rtl::Reference< TypeManager > const & manager, JavaOptions const & options,
-    Dependencies * dependencies)
+    std::set<OUString> * dependencies)
 {
     assert(entity.is());
     OString className(codemaker::convertString(name).replace('.', '/'));
@@ -1527,7 +1525,7 @@ void handlePolyStructType(
 }
 
 void addExceptionBaseArguments(
-    rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
+    rtl::Reference< TypeManager > const & manager, std::set<OUString> * dependencies,
     MethodDescriptor * methodDescriptor, ClassFile::Code * code,
     OUString const & base, sal_uInt16 * index)
 {
@@ -1563,7 +1561,7 @@ void addExceptionBaseArguments(
 void handleExceptionType(
     const OUString& name, rtl::Reference< unoidl::ExceptionTypeEntity > const & entity,
     rtl::Reference< TypeManager > const & manager, JavaOptions const & options,
-    Dependencies * dependencies)
+    std::set<OUString> * dependencies)
 {
     assert(entity.is());
     assert(dependencies != nullptr);
@@ -1835,7 +1833,7 @@ void handleExceptionType(
 void createExceptionsAttribute(
     rtl::Reference< TypeManager > const & manager,
     std::vector< OUString > const & exceptionTypes,
-    Dependencies * dependencies, std::vector< OString > * exceptions,
+    std::set<OUString> * dependencies, std::vector< OString > * exceptions,
     codemaker::ExceptionTree * tree)
 {
     assert(dependencies != nullptr);
@@ -1854,7 +1852,7 @@ void createExceptionsAttribute(
 void handleInterfaceType(
     const OUString& name, rtl::Reference< unoidl::InterfaceTypeEntity > const & entity,
     rtl::Reference< TypeManager > const & manager, JavaOptions const & options,
-    Dependencies * dependencies)
+    std::set<OUString> * dependencies)
 {
     assert(entity.is());
     assert(dependencies != nullptr);
@@ -1961,7 +1959,7 @@ void handleInterfaceType(
 
 void handleTypedef(
     rtl::Reference< unoidl::TypedefEntity > const & entity,
-    rtl::Reference< TypeManager > const & manager, Dependencies * dependencies)
+    rtl::Reference< TypeManager > const & manager, std::set<OUString> * dependencies)
 {
     assert(entity.is());
     assert(manager.is());
@@ -1998,7 +1996,7 @@ void handleTypedef(
 void handleConstantGroup(
     const OUString& name, rtl::Reference< unoidl::ConstantGroupEntity > const & entity,
     rtl::Reference< TypeManager > const & manager, JavaOptions const & options,
-    Dependencies * dependencies)
+    std::set<OUString> * dependencies)
 {
     assert(entity.is());
     OString className(codemaker::convertString(name).replace('.', '/'));
@@ -2090,7 +2088,7 @@ void addConstructor(
     OString const & realJavaBaseName, OString const & unoName,
     OString const & className,
     unoidl::SingleInterfaceBasedServiceEntity::Constructor const & constructor,
-    OUString const & returnType, Dependencies * dependencies,
+    OUString const & returnType, std::set<OUString> * dependencies,
     ClassFile * classFile)
 {
     assert(dependencies != nullptr);
@@ -2240,7 +2238,7 @@ void handleService(
     const OUString& name,
     rtl::Reference< unoidl::SingleInterfaceBasedServiceEntity > const & entity,
     rtl::Reference< TypeManager > const & manager, JavaOptions const & options,
-    Dependencies * dependencies)
+    std::set<OUString> * dependencies)
 {
     assert(entity.is());
     assert(dependencies != nullptr);
@@ -2333,7 +2331,7 @@ void handleSingleton(
     const OUString& name,
     rtl::Reference< unoidl::InterfaceBasedSingletonEntity > const & entity,
     rtl::Reference< TypeManager > const & manager, JavaOptions const & options,
-    Dependencies * dependencies)
+    std::set<OUString> * dependencies)
 {
     assert(entity.is());
     assert(dependencies != nullptr);
@@ -2458,7 +2456,7 @@ void produce(
     if (!manager->foundAtPrimaryProvider(name)) {
         return;
     }
-    Dependencies deps;
+    std::set<OUString> deps;
     rtl::Reference< unoidl::Entity > ent;
     rtl::Reference< unoidl::MapCursor > cur;
     switch (manager->getSort(name, &ent, &cur)) {
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index ca6e15ac6d43..e1c606bf5c67 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -141,7 +141,6 @@ typedef std::unordered_map<
     uno_Mapping *, MappingEntry *, FctPtrHash > t_Mapping2Entry;
 
 typedef set< uno_getMappingFunc > t_CallbackSet;
-typedef set< OUString > t_OUStringSet;
 
 
 struct MappingsData
@@ -154,7 +153,7 @@ struct MappingsData
     t_CallbackSet       aCallbacks;
 
     Mutex               aNegativeLibsMutex;
-    t_OUStringSet       aNegativeLibs;
+    set<OUString>       aNegativeLibs;
 };
 
 static MappingsData & getMappingsData()
@@ -351,7 +350,7 @@ static inline bool loadModule(osl::Module & rModule, const OUString & rBridgeNam
     {
     MappingsData & rData = getMappingsData();
     MutexGuard aGuard( rData.aNegativeLibsMutex );
-    const t_OUStringSet::const_iterator iFind( rData.aNegativeLibs.find( rBridgeName ) );
+    const auto iFind( rData.aNegativeLibs.find( rBridgeName ) );
     bNeg = (iFind != rData.aNegativeLibs.end());
     }
 
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index 84f2432b7db7..0c4898fb00df 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -104,17 +104,15 @@ protected:
         css::uno::Sequence< rtl::OUString > const & absentOptional,
         std::vector< rtl::OUString > * handleNames)
     {
-        TypeSet seen;
+        std::set<rtl::OUString> seen;
         initProperties(type, absentOptional, handleNames, &seen);
     }
 
 private:
-    typedef std::set< rtl::OUString > TypeSet;
-
     void initProperties(
         css::uno::Reference< css::reflection::XTypeDescription > const & type,
         css::uno::Sequence< rtl::OUString > const & absentOptional,
-        std::vector< rtl::OUString > * handleNames, TypeSet * seen);
+        std::vector< rtl::OUString > * handleNames, std::set<rtl::OUString> * seen);
 
     static css::uno::Reference< css::reflection::XTypeDescription >
     resolveTypedefs(
@@ -135,7 +133,7 @@ Data::PropertyMap::const_iterator Data::get(
 void Data::initProperties(
     css::uno::Reference< css::reflection::XTypeDescription > const & type,
     css::uno::Sequence< rtl::OUString > const & absentOptional,
-    std::vector< rtl::OUString > * handleNames, TypeSet * seen)
+    std::vector< rtl::OUString > * handleNames, std::set<rtl::OUString> * seen)
 {
     css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > ifc(
         resolveTypedefs(type), css::uno::UNO_QUERY_THROW);
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 7993d7f2c866..29d5816bc043 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -862,12 +862,11 @@ namespace
     void lcl_setPropertyValues_resetOrRemoveOther( const Reference< XPropertyBag >& _rxPropertyBag, const Sequence< PropertyValue >& _rAllNewPropertyValues )
     {
         // sequences are ugly to operate on
-        typedef std::set< OUString >   StringSet;
-        StringSet aToBeSetPropertyNames;
+        std::set<OUString> aToBeSetPropertyNames;
         std::transform(
             _rAllNewPropertyValues.begin(),
             _rAllNewPropertyValues.end(),
-            std::insert_iterator< StringSet >( aToBeSetPropertyNames, aToBeSetPropertyNames.end() ),
+            std::inserter( aToBeSetPropertyNames, aToBeSetPropertyNames.end() ),
             SelectPropertyName()
         );
 
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index d911c15f1a01..8a667865f4c0 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -428,7 +428,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature,
         lcl_notifyMultipleStates( *xListener.get(), aEvent, aStates );
     else
     {   // no -> iterate through all listeners responsible for the URL
-        StringBag aFeatureCommands;
+        std::set<OUString> aFeatureCommands;
         for( const auto& rFeature : m_aSupportedFeatures )
         {
             if( rFeature.second.nFeatureId == nFeat )
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index e78cde9de379..8de2b38f75d5 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -309,7 +309,7 @@ namespace dbaui
 
                 sal_Int32 count = list.getLength();
 
-                StringBag aProfiles;
+                std::set<OUString> aProfiles;
                 for (sal_Int32 index=0; index < count; index++)
                     aProfiles.insert(pArray[index]);
 
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index a0318b05d6be..f113f15f50ee 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -749,10 +749,10 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
         // These settings have to be removed: If they're not relevant, we have no UI for changing them.
 
         // for this, we need a string-controlled quick access to m_aIndirectPropTranslator
-        StringSet aIndirectProps;
+        std::set<OUString> aIndirectProps;
         std::transform(m_aIndirectPropTranslator.begin(),
                          m_aIndirectPropTranslator.end(),
-                         std::insert_iterator<StringSet>(aIndirectProps,aIndirectProps.begin()),
+                         std::inserter(aIndirectProps,aIndirectProps.begin()),
                          ::o3tl::select2nd< MapInt2String::value_type >());
 
         // now check the to-be-preserved props
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index 790a7b204649..2912619bdd5d 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -64,7 +64,6 @@ namespace dbaui
         css::uno::Reference< css::frame::XModel >         m_xModel;
 
         css::uno::Any              m_aDataSourceOrName;
-        typedef std::set< OUString >   StringSet;
 
         MapInt2String           m_aDirectPropTranslator;    /// translating property id's into names (direct properties of a data source)
         MapInt2String           m_aIndirectPropTranslator;  /// translating property id's into names (indirect properties of a data source)
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index f2129bd5acc8..31275fd1aa9d 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -123,7 +123,7 @@ namespace dbaui
     bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn, OUString const & _sCurr)
     {
         // collect all ODBC data source names
-        StringBag aOdbcDatasources;
+        std::set<OUString> aOdbcDatasources;
         OOdbcEnumeration aEnumeration;
         if (!aEnumeration.isLoaded())
         {
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 5b4ee249b4b1..2f049502c6e8 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::comphelper;
 
-ODatasourceSelectDialog::ODatasourceSelectDialog(vcl::Window* _pParent, const StringBag& _rDatasources)
+ODatasourceSelectDialog::ODatasourceSelectDialog(vcl::Window* _pParent, const std::set<OUString>& _rDatasources)
     : ModalDialog(_pParent, "ChooseDataSourceDialog",
         "dbaccess/ui/choosedatasourcedialog.ui")
 {
@@ -120,7 +120,7 @@ IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl, Button*, void)
 
 IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished, void*, void )
 {
-    StringBag aOdbcDatasources;
+    std::set<OUString> aOdbcDatasources;
     OOdbcEnumeration aEnumeration;
     aEnumeration.getDatasourceNames( aOdbcDatasources );
     fillListBox( aOdbcDatasources );
@@ -132,7 +132,7 @@ IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished, void*, void )
 }
 
 #endif
-void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources)
+void ODatasourceSelectDialog::fillListBox(const std::set<OUString>& _rDatasources)
 {
     OUString sSelected;
     if (m_pDatasource->GetEntryCount())
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx
index 43d4293f7da1..0ab598c8bcc9 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -50,7 +50,7 @@ class ODatasourceSelectDialog final : public ModalDialog
 #endif
 
 public:
-    ODatasourceSelectDialog( vcl::Window* _pParent, const StringBag& _rDatasources );
+    ODatasourceSelectDialog( vcl::Window* _pParent, const std::set<OUString>& _rDatasources );
     virtual ~ODatasourceSelectDialog() override;
     virtual void dispose() override;
     OUString GetSelected() const {
@@ -68,7 +68,7 @@ private:
     DECL_LINK(ManageClickHdl, Button*, void);
     DECL_LINK( ManageProcessFinished, void*, void );
 #endif
-    void fillListBox(const StringBag& _rDatasources);
+    void fillListBox(const std::set<OUString>& _rDatasources);
 };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 5cb07ab2ca2e..136a4d9adcc9 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -186,7 +186,7 @@ void OOdbcEnumeration::freeEnv()
 #endif
 }
 
-void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames)
+void OOdbcEnumeration::getDatasourceNames(std::set<OUString>& _rNames)
 {
     OSL_ENSURE(isLoaded(), "OOdbcEnumeration::getDatasourceNames: not loaded!");
     if (!isLoaded())
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index ae6abcc945d7..6ed5b6b5b93d 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -34,6 +34,7 @@
 #include <osl/module.h>
 
 #include <memory>
+#include <set>
 
 namespace dbaui
 {
@@ -68,7 +69,7 @@ public:
 #endif
     const OUString& getLibraryName() const { return m_sLibPath; }
 
-    void        getDatasourceNames(StringBag& _rNames);
+    void        getDatasourceNames(std::set<OUString>& _rNames);
 
 private:
     oslGenericFunction  loadSymbol(const sal_Char* _pFunctionName);
diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx
index 74402d59bcd7..40cd3c4fb1d3 100644
--- a/dbaccess/source/ui/inc/commontypes.hxx
+++ b/dbaccess/source/ui/inc/commontypes.hxx
@@ -22,8 +22,6 @@
 
 #include <sal/config.h>
 
-#include <set>
-
 #include <unotools/sharedunocomponent.hxx>
 
 namespace com { namespace sun { namespace star {
@@ -35,8 +33,6 @@ namespace com { namespace sun { namespace star {
 namespace dbaui
 {
 
-    typedef std::set<OUString> StringBag;
-
     typedef ::utl::SharedUNOComponent< css::sdbc::XConnection > SharedConnection;
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index abce427f98e7..68ffb367abb7 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -455,10 +455,9 @@ namespace
         }
         return BuildJoin(_xConnection, rRh, BuildTable(_xConnection,pLh), &data);
     }
-    typedef std::set<OUString> tableNames_t;
     void addConnectionTableNames( const Reference< XConnection>& _xConnection,
                                   const OQueryTableConnection* const pEntryConn,
-                                  tableNames_t &_rTableNames )
+                                  std::set<OUString> &_rTableNames )
     {
             // insert tables into table list to avoid double entries
             const OQueryTableWindow* const pEntryTabFrom = static_cast<OQueryTableWindow*>(pEntryConn->GetSourceWin());
@@ -470,7 +469,7 @@ namespace
                         OQueryTableConnection* pEntryConn,
                         OQueryTableWindow const * pEntryTabTo,
                         OUString &aJoin,
-                        tableNames_t &_rTableNames)
+                        std::set<OUString> &_rTableNames)
     {
         OQueryTableConnectionData* pEntryConnData = static_cast<OQueryTableConnectionData*>(pEntryConn->GetData().get());
         if ( pEntryConnData->GetJoinType() == INNER_JOIN && !pEntryConnData->isNatural() )
@@ -973,7 +972,7 @@ namespace
     }
     void searchAndAppendName(const Reference< XConnection>& _xConnection,
                              const OQueryTableWindow* _pTableWindow,
-                             tableNames_t& _rTableNames,
+                             std::set<OUString>& _rTableNames,
                              OUString& _rsTableListStr
                              )
     {
@@ -992,7 +991,7 @@ namespace
 
         OUString aTableListStr;
         // used to avoid putting a table twice in FROM clause
-        tableNames_t aTableNames;
+        std::set<OUString> aTableNames;
 
         // generate outer join clause in from
         if(!rConnList.empty())
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 26da83826b93..a56a59b61920 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -181,8 +181,7 @@ void PackageRegistryImpl::insertBackend(
     Reference<deployment::XPackageRegistry> const & xBackend )
 {
     m_allBackends.insert( xBackend );
-    typedef std::unordered_set<OUString> t_stringset;
-    t_stringset ambiguousFilters;
+    std::unordered_set<OUString> ambiguousFilters;
 
     const Sequence< Reference<deployment::XPackageTypeInfo> > packageTypes(
         xBackend->getSupportedPackageTypes() );