tdf#96099 Remove some trivial std::vector typedefs

Cleanup package, reportdesign, sal.

Change-Id: I8622465886f7ec97700b00740ea37d40767ec98e
Reviewed-on: https://gerrit.libreoffice.org/55616
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>

3 files changed, 34 insertions, 43 deletions

diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 3534b9a828c4..ea46777dc640 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -29,12 +29,10 @@
 
 namespace {
 
-typedef std::vector<rtl::OString> OStringVec;
-
 struct StaticDebugBaseAddressFilter
-    : rtl::StaticWithInit<OStringVec, StaticDebugBaseAddressFilter> {
-    OStringVec operator()() const {
-        OStringVec vec;
+    : rtl::StaticWithInit<std::vector<OString>, StaticDebugBaseAddressFilter> {
+    std::vector<OString> operator()() const {
+        std::vector<OString> vec;
         rtl_uString * pStr = nullptr;
         rtl::OUString const name(
             "OSL_DEBUGBASE_STORE_ADDRESSES" );
@@ -83,14 +81,14 @@ osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex()
 bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char const* pName )
     SAL_THROW_EXTERN_C()
 {
-    OStringVec const& rVec = StaticDebugBaseAddressFilter::get();
+    std::vector<OString> const& rVec = StaticDebugBaseAddressFilter::get();
     if (rVec.empty())
         return false;
     // check for "all":
     rtl::OString const& rFirst = rVec[0];
     if ( rFirst == "all" )
         return true;
-    OStringVec::const_iterator const iEnd( rVec.end() );
+    auto const iEnd( rVec.cend() );
     return std::find_if( rVec.begin(), iEnd,
         [pName] (OString const& it) { return isSubStr(pName, it); }) != iEnd;
 }
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 967fbd359d62..c4e2390f94b6 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -36,11 +36,6 @@
 
 namespace /* private */
 {
-    typedef std::vector<rtl::OUString> string_container_t;
-    typedef string_container_t::iterator string_container_iterator_t;
-    typedef string_container_t::const_iterator string_container_const_iterator_t;
-    typedef std::vector<sal_Unicode> environment_container_t;
-
     /* Function object that compares two strings that are
        expected to be environment variables in the form
        "name=value". Only the 'name' part will be compared.
@@ -91,13 +86,13 @@ namespace /* private */
         size_t sum_;
     };
 
-    inline size_t calc_sum_of_string_lengths(const string_container_t& string_cont)
+    inline size_t calc_sum_of_string_lengths(const std::vector<OUString>& string_cont)
     {
         return std::for_each(
             string_cont.begin(), string_cont.end(), sum_of_string_lengths());
     }
 
-    void read_environment(/*out*/ string_container_t* environment)
+    void read_environment(/*out*/ std::vector<OUString>* environment)
     {
         // GetEnvironmentStrings returns a sorted list, Windows
         // sorts environment variables upper case
@@ -124,7 +119,7 @@ namespace /* private */
     bool create_merged_environment(
         rtl_uString* env_vars[],
         sal_uInt32 env_vars_count,
-        /*in|out*/ string_container_t* merged_env)
+        /*in|out*/ std::vector<OUString>* merged_env)
     {
         OSL_ASSERT(env_vars && env_vars_count > 0 && merged_env);
 
@@ -162,9 +157,9 @@ namespace /* private */
     bool setup_process_environment(
         rtl_uString* environment_vars[],
         sal_uInt32 n_environment_vars,
-        /*in|out*/ environment_container_t& environment)
+        /*in|out*/ std::vector<sal_Unicode>& environment)
     {
-        string_container_t merged_env;
+        std::vector<OUString> merged_env;
         if (!create_merged_environment(environment_vars, n_environment_vars, &merged_env))
             return false;
 
@@ -172,8 +167,8 @@ namespace /* private */
         // a final '\0'
         environment.resize(calc_sum_of_string_lengths(merged_env) + 1);
 
-        string_container_const_iterator_t iter = merged_env.begin();
-        string_container_const_iterator_t iter_end = merged_env.end();
+        auto iter = merged_env.cbegin();
+        auto iter_end = merged_env.cend();
 
         sal_uInt32 pos = 0;
         for (/**/; iter != iter_end; ++iter)
@@ -445,7 +440,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
             command_line.append(ustrArguments[n]);
     }
 
-    environment_container_t environment;
+    std::vector<sal_Unicode> environment;
     LPVOID p_environment = nullptr;
 
     if (nEnvironmentVars && ustrEnvironmentVars)
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index b7997209bd09..317682238e49 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -84,18 +84,16 @@ inline ::rtl::OUString getExecutablePath()
 
 //rtl::OUString CWD = getExecutablePath();
 
-typedef std::vector<OString> string_container_t;
-
 #if !defined _WIN32
 
 class exclude
 {
 public:
 
-    explicit exclude(const string_container_t& exclude_list)
+    explicit exclude(const std::vector<OString>& exclude_list)
     {
-        string_container_t::const_iterator iter     = exclude_list.begin();
-        string_container_t::const_iterator iter_end = exclude_list.end();
+        auto iter     = exclude_list.cbegin();
+        auto iter_end = exclude_list.cend();
         for (/**/; iter != iter_end; ++iter)
             exclude_list_.push_back(env_var_name(*iter));
     }
@@ -125,12 +123,12 @@ private:
     }
 
 private:
-    string_container_t exclude_list_;
+    std::vector<OString> exclude_list_;
 };
 
 namespace
 {
-    void tidy_container(string_container_t &env_container)
+    void tidy_container(std::vector<OString> &env_container)
     {
         //sort them because there are no guarantees to ordering
         std::sort(env_container.begin(), env_container.end());
@@ -147,7 +145,7 @@ namespace
     }
 }
 
-    void read_parent_environment(string_container_t* env_container)
+    void read_parent_environment(std::vector<OString>* env_container)
     {
         for (int i = 0; environ[i] != nullptr; i++)
             env_container->push_back(OString(environ[i]));
@@ -208,7 +206,7 @@ public:
 
 #if !defined _WIN32
 
-    void read_child_environment(string_container_t* env_container)
+    void read_child_environment(std::vector<OString>* env_container)
     {
         OString temp_file_name = OUStringToOString(OUString(
             parameters_[1]), osl_getThreadTextEncoding());
@@ -232,10 +230,10 @@ public:
     // environment into a file
     void compare_environments()
     {
-        string_container_t parent_env;
+        std::vector<OString> parent_env;
         read_parent_environment(&parent_env);
 
-        string_container_t child_env;
+        std::vector<OString> child_env;
         read_child_environment(&child_env);
 
         OString msg(
@@ -256,12 +254,12 @@ public:
 
     // compare the equal environment parts and the
     // different part of the child environment
-    bool compare_merged_environments(const string_container_t& different_env_vars)
+    bool compare_merged_environments(const std::vector<OString>& different_env_vars)
     {
-        string_container_t parent_env;
+        std::vector<OString> parent_env;
         read_parent_environment(&parent_env);
 
-        for (string_container_t::const_iterator iter = parent_env.begin(), end = parent_env.end(); iter != end; ++iter)
+        for (auto iter = parent_env.cbegin(), end = parent_env.cend(); iter != end; ++iter)
             std::cout << "initially parent env: " << *iter << "\n";
 
         //remove the environment variables that we have changed
@@ -270,36 +268,36 @@ public:
             std::remove_if(parent_env.begin(), parent_env.end(), exclude(different_env_vars)),
             parent_env.end());
 
-        for (string_container_t::const_iterator iter = parent_env.begin(), end = parent_env.end(); iter != end; ++iter)
+        for (auto iter = parent_env.cbegin(), end = parent_env.cend(); iter != end; ++iter)
             std::cout << "stripped parent env: " << *iter << "\n";
 
         //read the child environment and exclude the variables that
         //are different
-        string_container_t child_env;
+        std::vector<OString> child_env;
         read_child_environment(&child_env);
 
-        for (string_container_t::const_iterator iter = child_env.begin(), end = child_env.end(); iter != end; ++iter)
+        for (auto iter = child_env.cbegin(), end = child_env.cend(); iter != end; ++iter)
             std::cout << "initial child env: " << *iter << "\n";
         //partition the child environment into the variables that
         //are different to the parent environment (they come first)
         //and the variables that should be equal between parent
         //and child environment
-        string_container_t::iterator iter_logical_end =
+        auto iter_logical_end =
             std::stable_partition(child_env.begin(), child_env.end(), exclude(different_env_vars));
 
-        string_container_t different_child_env_vars(child_env.begin(), iter_logical_end);
+        std::vector<OString> different_child_env_vars(child_env.begin(), iter_logical_end);
         child_env.erase(child_env.begin(), iter_logical_end);
 
-        for (string_container_t::const_iterator iter = child_env.begin(), end = child_env.end(); iter != end; ++iter)
+        for (auto iter = child_env.cbegin(), end = child_env.cend(); iter != end; ++iter)
             std::cout << "stripped child env: " << *iter << "\n";
 
         bool common_env_size_equals    = (parent_env.size() == child_env.size());
         bool common_env_content_equals = std::equal(child_env.begin(), child_env.end(), parent_env.begin());
 
-        for (string_container_t::const_iterator iter = different_env_vars.begin(), end = different_env_vars.end(); iter != end; ++iter)
+        for (auto iter = different_env_vars.cbegin(), end = different_env_vars.cend(); iter != end; ++iter)
             std::cout << "different should be: " << *iter << "\n";
 
-        for (string_container_t::const_iterator iter = different_child_env_vars.begin(), end = different_child_env_vars.end(); iter != end; ++iter)
+        for (auto iter = different_child_env_vars.cbegin(), end = different_child_env_vars.cend(); iter != end; ++iter)
             std::cout << "different are: " << *iter << "\n";
 
         bool different_env_size_equals    = (different_child_env_vars.size() == different_env_vars.size());
@@ -393,7 +391,7 @@ public:
 
         osl_freeProcessHandle(process);
 
-        string_container_t different_child_env_vars;
+        std::vector<OString> different_child_env_vars;
         different_child_env_vars.push_back(ENV1);
         different_child_env_vars.push_back(ENV2);
         different_child_env_vars.push_back(ENV4);