diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 23:42:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-06 08:04:23 +0100 |
| commit | 07ab0d43b58cf7ee16c36016d6b9b70c0ebbb9b1 (patch) | |
| tree | ac80d5449c42f832c14eb3fb3030208ae752b282 /svx/source/inc | |
| parent | Get rid of DECLARE_STL_USTRINGACCESS_MAP (diff) | |
| download | core-07ab0d43b58cf7ee16c36016d6b9b70c0ebbb9b1.tar.gz core-07ab0d43b58cf7ee16c36016d6b9b70c0ebbb9b1.zip | |
Get rid of DECLARE_STL_VECTOR
Change-Id: If4588034fc09e4663b5217669c71f26c0a3b8c8a
Diffstat (limited to 'svx/source/inc')
| -rw-r--r-- | svx/source/inc/fmshimp.hxx | 3 | ||||
| -rw-r--r-- | svx/source/inc/formcontroller.hxx | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index ff78efbb733e..2eb41e98b962 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -51,7 +51,6 @@ #include "svx/fmsrccfg.hxx" #include <osl/mutex.hxx> #include <cppuhelper/component.hxx> -#include <comphelper/stl_types.hxx> #include <comphelper/container.hxx> #include <cppuhelper/compbase4.hxx> #include <cppuhelper/compbase6.hxx> @@ -66,7 +65,7 @@ #include <boost/ptr_container/ptr_vector.hpp> typedef std::vector<SdrObject*> SdrObjArray; -DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > ,FmFormArray); +typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > > FmFormArray; // catch database exceptions if they occur #define DO_SAFE(statement) try { statement; } catch( const Exception& ) { OSL_FAIL("unhandled exception (I tried to move a cursor (or something like that).)"); } diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 61acc3448ba9..c74d7e537793 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -19,6 +19,10 @@ #ifndef INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX #define INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX +#include <sal/config.h> + +#include <vector> + #include "delayedevent.hxx" #include "formdispatchinterceptor.hxx" #include "sqlparserclient.hxx" @@ -69,7 +73,6 @@ #include <comphelper/broadcasthelper.hxx> #include <comphelper/proparrhlp.hxx> -#include <comphelper/stl_types.hxx> #include <cppuhelper/propshlp.hxx> #include <vcl/timer.hxx> @@ -205,7 +208,7 @@ namespace svxform // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class - DECLARE_STL_VECTOR(DispatchInterceptionMultiplexer*, Interceptors); + typedef std::vector<DispatchInterceptionMultiplexer*> Interceptors; Interceptors m_aControlDispatchInterceptors; public: |