summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-08 11:32:48 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-03-09 13:03:06 +0100
commit3912e47044f753f82c63ac11e803be5fb756c14f (patch)
tree87d9bb88027876ef0528218d712de5305e651f55 /svx
parent52c5eb20fd96d63e17cb9cd18912030131bcc787 (diff)
Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxx
Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/fmshimp.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 51babbcad8ef..f5dc1c5f1193 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 <osl/mutex.hxx>
@@ -100,6 +99,7 @@
#include <algorithm>
#include <functional>
+#include <map>
#include <vector>
// wird fuer Invalidate verwendet -> mitpflegen
@@ -3309,11 +3309,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;
@@ -3480,7 +3478,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
)