diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-05-30 10:36:27 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-01 12:30:35 +0200 |
| commit | bea47ebdb4bb634ad647e3b653fa7e31d7c4b6ab (patch) | |
| tree | d6fbea611d3a7405d9fa05bb92081001d6a4b8e3 /extensions/source | |
| parent | bdf5a7b5792cc93cd0a8984cfd8528dfe67b3e70 (diff) | |
tdf#96099 Remove some trivial typedef std::vector
Change-Id: Iaba48932dde059c88401ee60f7aac0048a79e9eb
Reviewed-on: https://gerrit.libreoffice.org/55045
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/dbpilots/dbptypes.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/dbpilots/groupboxwiz.hxx | 6 | ||||
| -rw-r--r-- | extensions/source/dbpilots/optiongrouplayouter.cxx | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx index e8e68452edc0..0f0630e6eace 100644 --- a/extensions/source/dbpilots/dbptypes.hxx +++ b/extensions/source/dbpilots/dbptypes.hxx @@ -24,14 +24,12 @@ #include <map> #include <set> -#include <vector> namespace dbp { - typedef std::vector<OUString> StringArray; typedef std::set<OUString> StringBag; typedef std::map<sal_uInt32, OUString> MapInt2String; diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index 1d15d6b71a58..f00320e21c68 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -29,8 +29,8 @@ namespace dbp struct OOptionGroupSettings : public OControlWizardSettings { - StringArray aLabels; - StringArray aValues; + std::vector<OUString> aLabels; + std::vector<OUString> aValues; OUString sDefaultField; OUString sDBField; }; @@ -125,7 +125,7 @@ namespace dbp VclPtr<Edit> m_pValue; VclPtr<ListBox> m_pOptions; - StringArray m_aUncommittedValues; + std::vector<OUString> m_aUncommittedValues; ::svt::WizardTypes::WizardState m_nLastSelection; diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index c506f9ec5f0c..cc052dc95151 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -106,8 +106,8 @@ namespace dbp OUString sElementsName("RadioGroup"); disambiguateName(Reference< XNameAccess >(_rContext.xForm, UNO_QUERY), sElementsName); - StringArray::const_iterator aLabelIter = _rSettings.aLabels.begin(); - StringArray::const_iterator aValueIter = _rSettings.aValues.begin(); + auto aLabelIter = _rSettings.aLabels.cbegin(); + auto aValueIter = _rSettings.aValues.cbegin(); for (sal_Int32 i=0; i<nRadioButtons; ++i, ++aLabelIter, ++aValueIter) { aButtonPosition.Y = aShapePosition.Y + (i+1) * nTempHeight; |