summaryrefslogtreecommitdiff
path: root/shell/source/tools
diff options
context:
space:
mode:
authorArkadiy Illarionov <qarkai@gmail.com>2018-06-20 22:40:45 +0300
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-06-23 13:13:14 +0200
commit6441c2f2e20bc424c6a4cd1c2d704710e4d80346 (patch)
tree83859a71b3f28a6305030e369c88a7f22b0918da /shell/source/tools
parent849d5d9903e54c92682227dfad545664e4bbda53 (diff)
tdf#96099 Remove trivial std::vector typedefs in sd, sfx2, shell
Change-Id: Ib3708c9650f273de4a2f549d2ce9f2465bd37d6c Reviewed-on: https://gerrit.libreoffice.org/56206 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'shell/source/tools')
-rw-r--r--shell/source/tools/lngconvex/lngconvex.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 9146f6e46be5..802cafb6a08b 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -146,8 +146,6 @@ private:
std::ios::iostate m_OldIos;
};
-typedef std::vector<std::string> string_container_t;
-
class iso_lang_identifier
{
public:
@@ -371,7 +369,7 @@ void read_ulf_file(const std::string& FileName, Substitutor& Substitutor)
void read_file(
const std::string& fname,
- string_container_t& string_container)
+ std::vector<std::string>& string_container)
{
std::ifstream file(fname.c_str());
StreamExceptionsEnabler sexc(file);
@@ -459,7 +457,7 @@ void start_language_section(
replace the all placeholder and append the
result to the output file */
void inflate_rc_template_to_file(
- std::ostream& os, const string_container_t& rctmpl, Substitutor& substitutor)
+ std::ostream& os, const std::vector<std::string>& rctmpl, Substitutor& substitutor)
{
StreamExceptionsEnabler sexc(os);
@@ -472,8 +470,8 @@ void inflate_rc_template_to_file(
{
substitutor.set_language(iso_lang_identifier(iter->first));
- string_container_t::const_iterator rct_iter = rctmpl.begin();
- string_container_t::const_iterator rct_iter_end = rctmpl.end();
+ auto rct_iter = rctmpl.cbegin();
+ auto rct_iter_end = rctmpl.cend();
if (!rctmpl.empty())
start_language_section(oi, iso_lang_identifier(iter->first));
@@ -535,7 +533,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
Substitutor substitutor;
read_ulf_file(ULF_FILE(cmdline), substitutor);
- string_container_t rc_tmpl;
+ std::vector<std::string> rc_tmpl;
read_file(RC_TEMPLATE(cmdline), rc_tmpl);
std::ofstream rc_file(RC_FILE(cmdline));