diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-08 11:32:48 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-11-05 11:50:26 +0100 |
| commit | d7cb3d0b56fc3e28354bc4ce255a80f1c8527aa0 (patch) | |
| tree | cebd2ea7bf8a3018851615daa61efd2809a8b4d9 /svx/source | |
| parent | 22b00fdaaf775cbc37cb14a2116ccb5c2ec17279 (diff) | |
Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxx
Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab
(cherry picked from commit 3912e47044f753f82c63ac11e803be5fb756c14f)
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 5d0dab3384c7..18f5cc37dd79 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -81,7 +81,6 @@ #include <comphelper/evtmethodhelper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> -#include <comphelper/stl_types.hxx> #include <comphelper/string.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/servicefactory.hxx> @@ -101,6 +100,7 @@ #include <algorithm> #include <functional> +#include <map> #include <vector> // wird fuer Invalidate verwendet -> mitpflegen @@ -3310,11 +3310,9 @@ void FmXFormShell::CreateExternalView() sal_Int16 nAddedColumns = 0; // for radio buttons we need some special structures - DECLARE_STL_USTRINGACCESS_MAP(Sequence< ::rtl::OUString>, MapUString2UstringSeq); - DECLARE_STL_ITERATORS(MapUString2UstringSeq); - DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUString, FmMapUString2UString); - DECLARE_STL_USTRINGACCESS_MAP(sal_Int16, FmMapUString2Int16); - DECLARE_STL_ITERATORS(FmMapUString2Int16); + typedef std::map< OUString, Sequence< ::rtl::OUString> > MapUString2UstringSeq; + typedef std::map< OUString, OUString > FmMapUString2UString; + typedef std::map< OUString, sal_Int16 > FmMapUString2Int16; MapUString2UstringSeq aRadioValueLists; MapUString2UstringSeq aRadioListSources; @@ -3481,7 +3479,7 @@ void FmXFormShell::CreateExternalView() // properties describing the "direct" column properties const sal_Int16 nListBoxDescription = 6; Sequence< PropertyValue> aListBoxDescription(nListBoxDescription); - for ( ConstFmMapUString2UStringIterator aCtrlSource = aRadioControlSources.begin(); + for ( FmMapUString2UString::const_iterator aCtrlSource = aRadioControlSources.begin(); aCtrlSource != aRadioControlSources.end(); ++aCtrlSource, ++nOffset ) |