[Libreoffice-commits] core.git: include/codemaker svl/source xmloff/source

[Noel Grandin (via logerrit)]

 include/codemaker/global.hxx              |    1 -
 svl/source/passwordcontainer/syscreds.cxx |    4 ++--
 svl/source/passwordcontainer/syscreds.hxx |    6 ++----
 xmloff/source/forms/propertyexport.hxx    |    3 +--
 xmloff/source/forms/propertyimport.hxx    |    3 +--
 5 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit f9f52b918a3255521bd74cd88939c45381297e19
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Aug 26 19:29:14 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 27 09:56:16 2020 +0200

    expand out StringSet typedef
    
    Change-Id: If7791d51d055ad918b54a52bee3f13a79c5468f6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101435
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/codemaker/global.hxx b/include/codemaker/global.hxx
index 358db5da7eda..d865e5270aa4 100644
--- a/include/codemaker/global.hxx
+++ b/include/codemaker/global.hxx
@@ -29,7 +29,6 @@
 #include <rtl/strbuf.hxx>
 
 typedef ::std::vector< ::rtl::OString >             StringVector;
-typedef ::std::set< ::rtl::OString >    StringSet;
 
 
 // FileStream
diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index 73020ef60f2a..3db663d844b8 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -119,7 +119,7 @@ namespace
         return false;
     }
 
-    bool findURL( StringSet const & rContainer, OUString const & aURL, OUString & aResult )
+    bool findURL( std::set<OUString> const & rContainer, OUString const & aURL, OUString & aResult )
     {
         // TODO: This code is actually copied from svl/source/passwordcontainer.cxx
         if( !rContainer.empty() && !aURL.isEmpty() )
@@ -131,7 +131,7 @@ namespace
             do
             {
                 // first look for <url>/somename and then look for <url>/somename/...
-                StringSet::const_iterator aIter = rContainer.find( aUrl );
+                auto aIter = rContainer.find( aUrl );
                 if( aIter != rContainer.end() )
                 {
                     aResult = *aIter;
diff --git a/svl/source/passwordcontainer/syscreds.hxx b/svl/source/passwordcontainer/syscreds.hxx
index d3605c262506..4f2d6734788e 100644
--- a/svl/source/passwordcontainer/syscreds.hxx
+++ b/svl/source/passwordcontainer/syscreds.hxx
@@ -52,8 +52,6 @@ class SysCredentialsConfigItem : public utl::ConfigItem
         SysCredentialsConfig * m_pOwner;
 };
 
-typedef std::set< OUString > StringSet;
-
 class SysCredentialsConfig
 {
     public:
@@ -71,8 +69,8 @@ class SysCredentialsConfig
         void writeCfg();
 
         ::osl::Mutex m_aMutex;
-        StringSet    m_aMemContainer;
-        StringSet    m_aCfgContainer;
+        std::set< OUString >     m_aMemContainer;
+        std::set< OUString >     m_aCfgContainer;
         SysCredentialsConfigItem m_aConfigItem;
         bool         m_bCfgInited;
 };
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index fbf568880307..2a9a6d7e08d8 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -61,8 +61,7 @@ namespace xmloff
     class OPropertyExport
     {
     private:
-        typedef std::set<OUString> StringSet;
-        StringSet       m_aRemainingProps;
+        std::set<OUString>      m_aRemainingProps;
             // see examinePersistence
 
         void exportRelativeTargetLocation(const OUString& _sPropertyName, CCAFlags _nProperty,bool _bAddType);
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index f17501fc9f63..9ea8c1dd797a 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -80,8 +80,7 @@ namespace xmloff
         PropertyValueArray          m_aGenericValues;
             // the values which the instance collects between StartElement and EndElement
 
-        typedef std::set<OUString> StringSet;
-        StringSet                   m_aEncounteredAttributes;
+        std::set<OUString>          m_aEncounteredAttributes;
 
         OFormLayerXMLImport_Impl&       m_rContext;