diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 22:41:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-06 08:04:22 +0100 |
| commit | 4a8175ebeb58555e5d48df134cfaf128293888f1 (patch) | |
| tree | 316963d1842bcf5ea16f489dc1c6d076fe9bb3c9 /chart2 | |
| parent | 0b5e5783d8b15b0415c9fd5043932882904aece8 (diff) | |
Get rid of DECLARE_STL_USTRINGACCESS_MAP
Change-Id: I00d02eaeff3eaa5f49550eb9c1d4e4e7e0b2203c
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ShapeToolbarController.hxx | 7 | ||||
| -rw-r--r-- | chart2/source/model/filter/XMLFilter.cxx | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 7d8472d6b2cc..63ff304e959a 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -19,13 +19,16 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_SHAPETOOLBARCONTROLLER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_SHAPETOOLBARCONTROLLER_HXX +#include <sal/config.h> + +#include <map> + #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XSubToolbarController.hpp> #include <cppuhelper/implbase2.hxx> #include <comphelper/implementationreference.hxx> -#include <comphelper/stl_types.hxx> #include <svtools/toolboxcontroller.hxx> class SfxToolBoxControl; @@ -41,7 +44,7 @@ typedef ::comphelper::ImplementationReference< SfxToolBoxControl, ::com::sun::st class ShapeToolbarController : public ::svt::ToolboxController ,public ShapeToolbarController_Base { - DECLARE_STL_USTRINGACCESS_MAP( sal_Bool, TCommandState ); + typedef std::map<OUString, sal_Bool> TCommandState; TCommandState m_aStates; TToolbarHelper m_pToolbarController; sal_uInt16 m_nToolBoxId; diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index cee36faa2378..8c563b1f1f0a 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -34,6 +34,7 @@ // header for class SotStorage #include <sot/storage.hxx> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/Writer.hpp> |