diff options
57 files changed, 225 insertions, 128 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> diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 61ff126ee849..66817f298c2b 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -25,15 +25,13 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <comphelper/stl_types.hxx> - #include <map> using namespace com::sun::star; -DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence<beans::PropertyValue>, NamedPropertyValues ); +typedef std::map< OUString, uno::Sequence<beans::PropertyValue> > NamedPropertyValues; class NamedPropertyValuesContainer : public cppu::WeakImplHelper2< container::XNameContainer, lang::XServiceInfo > { diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index f1ee4150e391..7d1905555aa4 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -17,13 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <map> + #include <comphelper/namecontainer.hxx> #include <cppuhelper/implbase1.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <comphelper/stl_types.hxx> -DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Any, SvGenericNameContainerMapImpl ); +typedef std::map<OUString, ::com::sun::star::uno::Any> SvGenericNameContainerMapImpl; namespace comphelper { diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index fd052bbf9105..1261db323f7e 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <map> + #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/weakagg.hxx> @@ -41,7 +45,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -DECLARE_STL_USTRINGACCESS_MAP( Any, GenericAnyMapImpl ); +typedef std::map<OUString, Any> GenericAnyMapImpl; namespace comphelper { diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index b6cc41b825b3..41062127d21a 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -19,6 +19,10 @@ #ifndef CONNECTIVITY_POOLCOLLECTION_HXX #define CONNECTIVITY_POOLCOLLECTION_HXX +#include <sal/config.h> + +#include <map> + #include <cppuhelper/implbase4.hxx> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/sdbc/XDriver.hpp> @@ -55,7 +59,7 @@ namespace connectivity //========================================================================== typedef ::comphelper::OInterfaceCompare< ::com::sun::star::sdbc::XDriver > ODriverCompare; - DECLARE_STL_USTRINGACCESS_MAP(OConnectionPool*, OConnectionPools); + typedef std::map<OUString, OConnectionPool*> OConnectionPools; DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >, diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx index 7c3aeef597c9..18b7d05d749f 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.cxx +++ b/connectivity/source/drivers/hsqldb/accesslog.cxx @@ -17,8 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #ifdef HSQLDB_DBG + +#include <map> + #include "accesslog.hxx" #include "hsqldb/HStorageMap.hxx" @@ -26,7 +30,7 @@ namespace connectivity { namespace hsqldb { - DECLARE_STL_USTRINGACCESS_MAP(FILE *,TDebugStreamMap); + typedef std::map<OUString, FILE *> TDebugStreamMap; TDebugStreamMap& getStreams() { static TDebugStreamMap streams; diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx index 19bdad5513cc..112cba701d83 100644 --- a/connectivity/source/inc/hsqldb/HStorageMap.hxx +++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx @@ -19,6 +19,10 @@ #ifndef CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX #define CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX +#include <sal/config.h> + +#include <map> + #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactionListener.hpp> #include <com/sun/star/io/XStream.hpp> @@ -26,7 +30,6 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <boost/shared_ptr.hpp> -#include <comphelper/stl_types.hxx> #include <jni.h> //........................................................................ namespace connectivity @@ -50,10 +53,10 @@ namespace connectivity }; - DECLARE_STL_USTRINGACCESS_MAP(::boost::shared_ptr<StreamHelper>,TStreamMap); + typedef std::map< OUString, ::boost::shared_ptr<StreamHelper> > TStreamMap; typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >, OUString > TStorageURLPair; typedef ::std::pair< TStorageURLPair, TStreamMap> TStoragePair; - DECLARE_STL_USTRINGACCESS_MAP(TStoragePair,TStorages); + typedef std::map<OUString, TStoragePair> TStorages; /** contains all storages so far accessed. */ class StorageContainer diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 38cb3b78175f..383dbc4ec779 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -19,13 +19,16 @@ #ifndef CONNECTIVITY_MYSQL_DRIVER_HXX #define CONNECTIVITY_MYSQL_DRIVER_HXX +#include <sal/config.h> + +#include <map> + #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase3.hxx> #include <comphelper/uno3.hxx> -#include <comphelper/stl_types.hxx> #include <comphelper/broadcasthelper.hxx> #include "connectivity/CommonTools.hxx" @@ -48,7 +51,7 @@ namespace connectivity typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,OMetaConnection*> TWeakConnectionPair; typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; typedef ::std::vector< TWeakPair > TWeakPairVector; - DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >,TJDBCDrivers); + typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > > TJDBCDrivers; /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer. diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index f40e433e50f9..20aec320242a 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -563,7 +563,7 @@ OUString SAL_CALL OSDBCDriverManager::getSingletonName_static( ) throw(RuntimeE Reference< XInterface > SAL_CALL OSDBCDriverManager::getRegisteredObject( const OUString& _rName ) throw(Exception, RuntimeException) { MutexGuard aGuard(m_aMutex); - ConstDriverCollectionIterator aSearch = m_aDriversRT.find(_rName); + DriverCollection::const_iterator aSearch = m_aDriversRT.find(_rName); if (aSearch == m_aDriversRT.end()) throwNoSuchElementException(); @@ -580,7 +580,7 @@ void SAL_CALL OSDBCDriverManager::registerObject( const OUString& _rName, const _rName ); - ConstDriverCollectionIterator aSearch = m_aDriversRT.find(_rName); + DriverCollection::const_iterator aSearch = m_aDriversRT.find(_rName); if (aSearch == m_aDriversRT.end()) { Reference< XDriver > xNewDriver(_rxObject, UNO_QUERY); @@ -608,7 +608,7 @@ void SAL_CALL OSDBCDriverManager::revokeObject( const OUString& _rName ) throw(E _rName ); - DriverCollectionIterator aSearch = m_aDriversRT.find(_rName); + DriverCollection::iterator aSearch = m_aDriversRT.find(_rName); if (aSearch == m_aDriversRT.end()) throwNoSuchElementException(); @@ -673,7 +673,7 @@ Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const OUString& _rU if ( !xReturn.is() ) { // no -> search the runtime drivers - DriverCollectionIterator aPos = ::std::find_if( + DriverCollection::iterator aPos = ::std::find_if( m_aDriversRT.begin(), // begin of search range m_aDriversRT.end(), // end of search range o3tl::unary_compose< AcceptsURL, ExtractDriverFromCollectionElement >( AcceptsURL( _rURL ), ExtractDriverFromCollectionElement() ) diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx index a311c0207218..85bfec4720c4 100644 --- a/connectivity/source/manager/mdrivermanager.hxx +++ b/connectivity/source/manager/mdrivermanager.hxx @@ -20,6 +20,10 @@ #ifndef _CONNECTIVITY_DRIVERMANAGER_HXX_ #define _CONNECTIVITY_DRIVERMANAGER_HXX_ +#include <sal/config.h> + +#include <map> + #include <com/sun/star/sdbc/XDriverManager2.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XNamingService.hpp> @@ -40,7 +44,7 @@ namespace drivermanager //====================================================================== //= various //====================================================================== - DECLARE_STL_USTRINGACCESS_MAP( css::uno::Reference< css::sdbc::XDriver >, DriverCollection ); + typedef std::map< OUString, css::uno::Reference< css::sdbc::XDriver > > DriverCollection; struct DriverAccess { @@ -70,7 +74,7 @@ namespace drivermanager // for drivers registered at runtime (not bootstrapped) we don't require an XServiceInfo interface, // so we have to remember their impl-name in another way - DECLARE_STL_USTRINGACCESS_MAP(css::uno::Reference< css::sdbc::XDriver >, DriverCollection); + typedef std::map< OUString, css::uno::Reference< css::sdbc::XDriver > > DriverCollection; DriverCollection m_aDriversRT; ::connectivity::DriversConfig m_aDriverConfig; diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 5e8aeabc0725..53239b3dd499 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -41,6 +41,7 @@ #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <list> +#include <map> #include <algorithm> #include <string.h> #include <com/sun/star/io/XInputStream.hpp> @@ -65,7 +66,7 @@ using namespace ::com::sun::star; using namespace ::cppu; using namespace ::osl; -DECLARE_STL_USTRINGACCESS_MAP(OUStringBuffer,TSQLStatements); +typedef std::map<OUString, OUStringBuffer> TSQLStatements; namespace { void lcl_fillKeyCondition(const OUString& i_sTableName,const OUString& i_sQuotedColumnName,const ORowSetValue& i_aValue,TSQLStatements& io_aKeyConditions) diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 9313d9357431..f3a72bcb20d1 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -296,7 +296,7 @@ void OBookmarkContainer::implRemove(const OUString& _rName) MutexGuard aGuard(m_rMutex); // look for the name in the index access vector - MapString2StringIterator aMapPos = m_aBookmarks.end(); + MapString2String::iterator aMapPos = m_aBookmarks.end(); for ( MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin(); aSearch != m_aBookmarksIndexed.end(); ++aSearch diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index bdd412ec67aa..60de25f2632d 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX +#include <sal/config.h> + +#include <map> + #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/implbase6.hxx> #include <comphelper/stl_types.hxx> @@ -52,8 +56,8 @@ class OBookmarkContainer :public OBookmarkContainer_Base { protected: - DECLARE_STL_USTRINGACCESS_MAP(OUString, MapString2String); - DECLARE_STL_VECTOR(MapString2StringIterator, MapIteratorVector); + typedef std::map<OUString, OUString> MapString2String; + DECLARE_STL_VECTOR(MapString2String::iterator, MapIteratorVector); MapString2String m_aBookmarks; // the bookmarks itself MapIteratorVector m_aBookmarksIndexed; // for index access to the diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 0d66be3bab03..79952694ab33 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -19,6 +19,10 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_CONNECTION_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_CONNECTION_HXX +#include <sal/config.h> + +#include <map> + #include "apitools.hxx" #include "querycontainer.hxx" #include "tablecontainer.hxx" @@ -43,7 +47,6 @@ #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 14 #include <comphelper/implbase_var.hxx> #endif -#include <comphelper/stl_types.hxx> #include <connectivity/ConnectionWrapper.hxx> #include <connectivity/warningscontainer.hxx> @@ -92,7 +95,7 @@ protected: // defines the helper services for example to query the command of a view // @ see com.sun.star.sdb.tools.XViewAccess - DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>, TSupportServices); + typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > TSupportServices; TSupportServices m_aSupportServices; OTableContainer* m_pTables; diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index d5a642f6a9df..f13e381f90ae 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -521,7 +521,7 @@ void ODatabaseContext::revokeObject(const OUString& _rName) throw( Exception, Ru } // check if URL is already loaded - ObjectCacheIterator aExistent = m_aDatabaseObjects.find( sURL ); + ObjectCache::iterator aExistent = m_aDatabaseObjects.find( sURL ); if ( aExistent != m_aDatabaseObjects.end() ) m_aDatabaseObjects.erase( aExistent ); @@ -666,7 +666,7 @@ sal_Bool ODatabaseContext::hasByName(const OUString& _rName) throw( RuntimeExcep Reference< XInterface > ODatabaseContext::getObject( const OUString& _rURL ) { - ObjectCacheIterator aFind = m_aDatabaseObjects.find( _rURL ); + ObjectCache::iterator aFind = m_aDatabaseObjects.find( _rURL ); Reference< XInterface > xExistent; if ( aFind != m_aDatabaseObjects.end() ) xExistent = aFind->second->getOrCreateDataSource(); diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx index 459b91802b07..a961168dd428 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.hxx +++ b/dbaccess/source/core/dataaccess/databasecontext.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX +#include <sal/config.h> + +#include <map> + #include "ModelImpl.hxx" #include <com/sun/star/container/ElementExistException.hpp> @@ -38,7 +42,6 @@ #include <com/sun/star/uno/XAggregation.hpp> #include <basic/basicmanagerrepository.hxx> -#include <comphelper/stl_types.hxx> #include <cppuhelper/compbase3.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -97,10 +100,10 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseRegistrations > m_xDatabaseRegistrations; - DECLARE_STL_USTRINGACCESS_MAP( ODatabaseModelImpl*, ObjectCache ); + typedef std::map<OUString, ODatabaseModelImpl*> ObjectCache; ObjectCache m_aDatabaseObjects; - DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >, PropertyCache ); + typedef std::map< OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > PropertyCache; PropertyCache m_aDatasourceProperties; // as we hold our data sources weak, we have to cache all properties on the data sources which are // transient but stored as long as the session lasts. The database context is the session (as it lives diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index 5c216d9f96ce..3740a57ef6ec 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -19,6 +19,10 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEDOCUMENT_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEDOCUMENT_HXX +#include <sal/config.h> + +#include <map> + #include "ModelImpl.hxx" #include "documenteventnotifier.hxx" @@ -165,7 +169,7 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe Initialized }; - DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers >,TNumberedController); + typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers > > TNumberedController; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2> m_xUIConfigurationManager; ::cppu::OInterfaceContainerHelper m_aModifyListeners; diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index 02f6c81c3a33..983f43f2fd6f 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCONTAINER_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCONTAINER_HXX +#include <sal/config.h> + +#include <map> + #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/implbase7.hxx> #include <comphelper/stl_types.hxx> @@ -91,7 +95,7 @@ class ODefinitionContainer ,public ODefinitionContainer_Base { protected: - DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::WeakReference< ::com::sun::star::ucb::XContent >, Documents); + typedef std::map< OUString, ::com::sun::star::uno::WeakReference< ::com::sun::star::ucb::XContent > > Documents; DECLARE_STL_VECTOR(Documents::iterator, DocumentsIndexAccess); enum ContainerOperation diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index e61a69f8aa02..0d083d0238d0 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -38,8 +38,8 @@ #include <unotools/ucbstreamhelper.hxx> #include <xmloff/xmlimp.hxx> #include "apitools.hxx" -#include <comphelper/stl_types.hxx> +#include <map> #include <memory> namespace dbaxml @@ -58,7 +58,7 @@ using namespace ::com::sun::star::xml::sax; class ODBFilter : public SvXMLImport { public: - DECLARE_STL_USTRINGACCESS_MAP(Sequence<PropertyValue>,TPropertyNameMap); + typedef std::map< OUString, Sequence<PropertyValue> > TPropertyNameMap; typedef ::std::vector< ::com::sun::star::beans::PropertyValue> TInfoSequence; private: TPropertyNameMap m_aQuerySettings; diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 95cf9fbb15f4..e8da81c3bbd1 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -25,10 +25,11 @@ #include <tools/rtti.hxx> #include <svtools/transfer.hxx> -#include <comphelper/stl_types.hxx> #include "callbacks.hxx" #include "TableConnectionData.hxx" #include "TableWindowData.hxx" + +#include <map> #include <memory> #include <vector> @@ -79,7 +80,7 @@ namespace dbaui friend class OJoinMoveTabWinUndoAct; public: - DECLARE_STL_USTRINGACCESS_MAP(OTableWindow*,OTableWindowMap); + typedef std::map<OUString, OTableWindow*> OTableWindowMap; private: OTableWindowMap m_aTableMap; diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 13aea774be4d..ccf4a77d4ca3 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -19,11 +19,14 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEGRANTCTRL_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEGRANTCTRL_HXX +#include <sal/config.h> + +#include <map> + #include <svtools/editbrowsebox.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XAuthorizable.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <comphelper/stl_types.hxx> #include "moduledbu.hxx" class Edit; @@ -38,7 +41,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox sal_Int32 nWithGrant; } TPrivileges; - DECLARE_STL_USTRINGACCESS_MAP(TPrivileges,TTablePrivilegeMap); + typedef std::map<OUString, TPrivileges> TTablePrivilegeMap; OModuleClient m_aModuleClient; diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index 4e6882d28c97..f1c525fd068f 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -20,11 +20,12 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX #include <svtools/toolboxcontroller.hxx> -#include <comphelper/stl_types.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase1.hxx> #include "apitools.hxx" #include "moduledbu.hxx" + +#include <map> #include <memory> class PopupMenu; @@ -35,7 +36,7 @@ namespace dbaui class OToolboxController : public ::svt::ToolboxController ,public TToolboxController_BASE { - DECLARE_STL_USTRINGACCESS_MAP(sal_Bool,TCommandState); + typedef std::map<OUString, sal_Bool> TCommandState; OModuleClient m_aModuleClient; TCommandState m_aStates; sal_uInt16 m_nToolBoxId; diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index d3c341b6ed06..0d412d3b092e 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -220,8 +220,8 @@ void OJoinTableView::Resize() // all ok return; - OTableWindowMapIterator aIter = m_aTableMap.begin(); - OTableWindowMapIterator aEnd = m_aTableMap.end(); + OTableWindowMap::iterator aIter = m_aTableMap.begin(); + OTableWindowMap::iterator aEnd = m_aTableMap.end(); for(;aIter != aEnd;++aIter) { OTableWindow* pCurrent = aIter->second; @@ -265,7 +265,7 @@ bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,sal_Bool _bDelet OTableWindow* OJoinTableView::GetTabWindow( const OUString& rName ) { DBG_CHKTHIS(OJoinTableView,NULL); - OTableWindowMapIterator aIter = m_aTableMap.find(rName); + OTableWindowMap::iterator aIter = m_aTableMap.find(rName); return aIter == m_aTableMap.end() ? NULL : aIter->second; } @@ -541,8 +541,8 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin ) // check occupied areas of this line OTableWindow* pOtherTabWin; - OTableWindowMapIterator aIter = m_aTableMap.begin(); - OTableWindowMapIterator aEnd = m_aTableMap.end(); + OTableWindowMap::iterator aIter = m_aTableMap.begin(); + OTableWindowMap::iterator aEnd = m_aTableMap.end(); for(;aIter != aEnd;++aIter) { pOtherTabWin = aIter->second; @@ -711,8 +711,8 @@ sal_Bool OJoinTableView::ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPai OTableWindow* pTabWin; Point aPos; - OTableWindowMapIterator aIter = m_aTableMap.begin(); - OTableWindowMapIterator aEnd = m_aTableMap.end(); + OTableWindowMap::iterator aIter = m_aTableMap.begin(); + OTableWindowMap::iterator aEnd = m_aTableMap.end(); for(;aIter != aEnd;++aIter) { pTabWin = aIter->second; @@ -1309,8 +1309,8 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) sal_Bool bForward = !pKeyEvent->GetKeyCode().IsShift(); // is there an active tab win ? - OTableWindowMapIterator aIter = m_aTableMap.begin(); - OTableWindowMapIterator aEnd = m_aTableMap.end(); + OTableWindowMap::iterator aIter = m_aTableMap.begin(); + OTableWindowMap::iterator aEnd = m_aTableMap.end(); for(;aIter != aEnd;++aIter) if (aIter->second && aIter->second->HasChildPathFocus()) break; @@ -1442,8 +1442,8 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) if (pSearchFor) { - OTableWindowMapIterator aIter = m_aTableMap.begin(); - OTableWindowMapIterator aEnd = m_aTableMap.end(); + OTableWindowMap::iterator aIter = m_aTableMap.begin(); + OTableWindowMap::iterator aEnd = m_aTableMap.end(); for(;aIter != aEnd;++aIter) { if (aIter->second == pSearchFor) @@ -1495,8 +1495,8 @@ void OJoinTableView::StateChanged( StateChangedType nType ) aFont.Merge( GetControlFont() ); SetZoomedPointFont( aFont ); - OTableWindowMapIterator aIter = m_aTableMap.begin(); - OTableWindowMapIterator aEnd = m_aTableMap.end(); + OTableWindowMap::iterator aIter = m_aTableMap.begin(); + OTableWindowMap::iterator aEnd = m_aTableMap.end(); for(;aIter != aEnd;++aIter) { aIter->second->SetZoom(GetZoom()); @@ -1552,8 +1552,8 @@ void OJoinTableView::clearLayoutInformation() m_pLastFocusTabWin = NULL; m_pSelectedConn = NULL; // delete lists - OTableWindowMapIterator aIter = m_aTableMap.begin(); - OTableWindowMapIterator aEnd = m_aTableMap.end(); + OTableWindowMap::iterator aIter = m_aTableMap.begin(); + OTableWindowMap::iterator aEnd = m_aTableMap.end(); for(;aIter != aEnd;++aIter) { if ( aIter->second ) diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 5c2ce8656886..08cb6a174367 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -240,7 +240,7 @@ sal_Int32 OQueryTableView::CountTableAlias(const OUString& rName, sal_Int32& rMa DBG_CHKTHIS(OQueryTableView,NULL); sal_Int32 nRet = 0; - OTableWindowMapIterator aIter = GetTabWinMap()->find(rName); + OTableWindowMap::iterator aIter = GetTabWinMap()->find(rName); while(aIter != GetTabWinMap()->end()) { OUString aNewName = OUString(rName) + "_" + OUString::number(++nRet); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 3506285993a4..30655c924c3a 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1002,7 +1002,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() OJoinTableView::OTableWindowMap* pTabWinList = getDesignView()->getTableView()->GetTabWinMap(); if (pTabWinList) { - OJoinTableView::OTableWindowMapIterator aIter = pTabWinList->find(aAliasName); + OJoinTableView::OTableWindowMap::iterator aIter = pTabWinList->find(aAliasName); if(aIter != pTabWinList->end()) { OQueryTableWindow* pEntryTab = static_cast<OQueryTableWindow*>(aIter->second); @@ -2674,7 +2674,7 @@ sal_Bool OSelectionBrowseBox::fillEntryTable(OTableFieldDescRef& _pEntry,const O OJoinTableView::OTableWindowMap* pTabWinList = getDesignView()->getTableView()->GetTabWinMap(); if (pTabWinList) { - OJoinTableView::OTableWindowMapIterator aIter = pTabWinList->find(_sTableName); + OJoinTableView::OTableWindowMap::iterator aIter = pTabWinList->find(_sTableName); if(aIter != pTabWinList->end()) { OQueryTableWindow* pEntryTab = static_cast<OQueryTableWindow*>(aIter->second); diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx index 435ef5ad77a6..1cb4abf6fd78 100644 --- a/extensions/source/abpilot/abptypes.hxx +++ b/extensions/source/abpilot/abptypes.hxx @@ -22,9 +22,9 @@ #include <sal/config.h> +#include <map> #include <set> -#include <comphelper/stl_types.hxx> #include <rtl/ustring.hxx> //......................................................................... @@ -34,7 +34,7 @@ namespace abp typedef std::set<OUString> StringBag; - DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String ); + typedef std::map<OUString, OUString> MapString2String; //......................................................................... } // namespace abp diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index f220fd0b078c..497a7d293d63 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -251,7 +251,7 @@ namespace abp // there should be a redundancy in the config data .... if this asserts, there isn't anymore! // do we have a new alias for the programmatic? - MapString2StringIterator aPos = aFieldAssignment.find( *pExistentFields ); + MapString2String::iterator aPos = aFieldAssignment.find( *pExistentFields ); if ( aFieldAssignment.end() != aPos ) { // yes // -> set a new value @@ -269,7 +269,7 @@ namespace abp // now everything remaining in aFieldAssignment marks a mapping entry which was not present // in the config before - for ( ConstMapString2StringIterator aNewMapping = aFieldAssignment.begin(); + for ( MapString2String::const_iterator aNewMapping = aFieldAssignment.begin(); aNewMapping != aFieldAssignment.end(); ++aNewMapping ) diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx index 19f76fdd087c..6f23877f4468 100644 --- a/extensions/source/dbpilots/wizardcontext.hxx +++ b/extensions/source/dbpilots/wizardcontext.hxx @@ -20,6 +20,10 @@ #ifndef _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_ #define _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_ +#include <sal/config.h> + +#include <map> + #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdb/XDatabaseContext.hpp> @@ -28,7 +32,6 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <comphelper/stl_types.hxx> //......................................................................... namespace dbp @@ -68,7 +71,7 @@ namespace dbp ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xObjectContainer; // the column types container of the object the form is bound to (table, query or SQL statement) - DECLARE_STL_USTRINGACCESS_MAP(sal_Int32,TNameTypeMap); + typedef std::map<OUString, sal_Int32> TNameTypeMap; TNameTypeMap aTypes; // the column names of the object the form is bound to (table, query or SQL statement) ::com::sun::star::uno::Sequence< OUString > diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index c4a138fd73f0..273df2b68c90 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -24,10 +24,10 @@ #include <com/sun/star/io/XInputStream.hpp> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <comphelper/stl_types.hxx> #include "xmlfilterjar.hxx" +#include <map> #include <vector> #include <stack> @@ -48,7 +48,7 @@ enum ImportState e_Unknown }; -DECLARE_STL_USTRINGACCESS_MAP( OUString, PropertyMap ); +typedef std::map<OUString, OUString> PropertyMap; struct Node { diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index 7747c41f6221..05f0936c2c69 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -31,6 +31,7 @@ #include <comphelper/types.hxx> #include <algorithm> +#include <map> using namespace comphelper; @@ -172,7 +173,7 @@ public: { return m_aCompArray[nP].GetComponent(); } }; -DECLARE_STL_USTRINGACCESS_MAP(OGroup, OGroupArr); +typedef std::map<OUString, OGroup> OGroupArr; DECLARE_STL_VECTOR(OGroupArr::iterator, OActiveGroups); //======================================================================== diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx index bc2b8a4ac64f..34b12e109b1a 100644 --- a/include/comphelper/propertysetinfo.hxx +++ b/include/comphelper/propertysetinfo.hxx @@ -20,9 +20,12 @@ #ifndef INCLUDED_COMPHELPER_PROPERTYSETINFO_HXX #define INCLUDED_COMPHELPER_PROPERTYSETINFO_HXX +#include <sal/config.h> + +#include <map> + #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <cppuhelper/implbase1.hxx> -#include <comphelper/stl_types.hxx> #include <comphelper/comphelperdllapi.h> //========================================================================= @@ -44,7 +47,7 @@ struct PropertyMapEntry sal_uInt8 mnMemberId; }; -DECLARE_STL_USTRINGACCESS_MAP( PropertyMapEntry*, PropertyMap ); +typedef std::map<OUString, PropertyMapEntry*> PropertyMap; class PropertyMapImpl; diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index 228da5b443a6..9223be9e5078 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -250,10 +250,6 @@ OutputIter intersperse( typedef std::vector< valuetyp > classname; \ DECLARE_STL_ITERATORS(classname) \ -#define DECLARE_STL_USTRINGACCESS_MAP(valuetype, classname) \ - typedef std::map< OUString, valuetype > classname; \ - DECLARE_STL_ITERATORS(classname) - #endif // INCLUDED_COMPHELPER_STL_TYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx index c976de9f6602..b2f2c7631e57 100644 --- a/include/connectivity/DriversConfig.hxx +++ b/include/connectivity/DriversConfig.hxx @@ -19,7 +19,10 @@ #ifndef INCLUDED_CONNECTIVITY_DRIVERSCONFIG_HXX #define INCLUDED_CONNECTIVITY_DRIVERSCONFIG_HXX -#include <comphelper/stl_types.hxx> +#include <sal/config.h> + +#include <map> + #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/uno/Sequence.h> #include <connectivity/dbtoolsdllapi.hxx> @@ -37,7 +40,7 @@ namespace connectivity OUString sDriverFactory; OUString sDriverTypeDisplayName; } TInstalledDriver; - DECLARE_STL_USTRINGACCESS_MAP( TInstalledDriver, TInstalledDrivers); + typedef std::map<OUString, TInstalledDriver> TInstalledDrivers; class DriversConfigImpl { diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx index 9a1a1abc9c07..3298bf9b0f94 100644 --- a/include/connectivity/PColumn.hxx +++ b/include/connectivity/PColumn.hxx @@ -19,6 +19,10 @@ #ifndef INCLUDED_CONNECTIVITY_PCOLUMN_HXX #define INCLUDED_CONNECTIVITY_PCOLUMN_HXX +#include <sal/config.h> + +#include <map> + #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/VColumn.hxx> #include <connectivity/CommonTools.hxx> @@ -95,7 +99,7 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns ); - DECLARE_STL_USTRINGACCESS_MAP(int,StringMap); + typedef std::map<OUString, int> StringMap; /** creates a single OParseColumn, as described by a result set meta data instance. The column names are unique. */ diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index c87cae1fe94f..421419773483 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -20,11 +20,14 @@ #ifndef INCLUDED_CONNECTIVITY_TTABLEHELPER_HXX #define INCLUDED_CONNECTIVITY_TTABLEHELPER_HXX +#include <sal/config.h> + +#include <map> + #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/VTable.hxx> #include <connectivity/sdbcx/VKey.hxx> #include <connectivity/StdTypeDefs.hxx> -#include <comphelper/stl_types.hxx> #include <com/sun/star/sdb/tools/XTableRename.hpp> #include <com/sun/star/sdb/tools/XTableAlteration.hpp> #include <com/sun/star/sdb/tools/XKeyAlteration.hpp> @@ -72,7 +75,7 @@ namespace connectivity OOO_DLLPUBLIC_DBTOOLS OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); - DECLARE_STL_USTRINGACCESS_MAP( sdbcx::TKeyProperties , TKeyMap); + typedef std::map<OUString, sdbcx::TKeyProperties> TKeyMap; struct OTableHelperImpl; diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index f633259f631b..860e9025c40a 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -20,10 +20,13 @@ #ifndef _REPORT_RPTUIDEF_HXX #define _REPORT_RPTUIDEF_HXX +#include <sal/config.h> + +#include <map> + #include "dllapi.h" #include <tools/solar.h> #include <svx/svdobj.hxx> -#include <comphelper/stl_types.hxx> #include <comphelper/uno3.hxx> #include <svx/fmglob.hxx> #include <boost/shared_ptr.hpp> @@ -92,7 +95,7 @@ public: */ REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); typedef ::std::pair< OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter; -DECLARE_STL_USTRINGACCESS_MAP(TPropertyConverter , TPropertyNamePair); +typedef std::map<OUString, TPropertyConverter> TPropertyNamePair; /** returns the property name map for the givern property id @param _nObjectId the object id */ diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index b31940d074ab..c41078481024 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -37,9 +37,9 @@ #include <unotools/localfilehelper.hxx> #include <unotools/ucbstreamhelper.hxx> #include <xmloff/xmlimp.hxx> -#include <comphelper/stl_types.hxx> #include <comphelper/sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> +#include <map> #include <memory> #include <boost/shared_ptr.hpp> #include <xmloff/prhdlfac.hxx> @@ -68,8 +68,8 @@ using namespace ::com::sun::star::xml::sax; class ORptFilter : public SvXMLImport { public: - DECLARE_STL_USTRINGACCESS_MAP(Sequence<PropertyValue>,TPropertyNameMap); - DECLARE_STL_USTRINGACCESS_MAP( Reference<XFunction> ,TGroupFunctionMap); + typedef std::map< OUString, Sequence<PropertyValue> > TPropertyNameMap; + typedef std::map< OUString, Reference<XFunction> > TGroupFunctionMap; private: TGroupFunctionMap m_aFunctions; diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index bb9cb8531d05..2aba9c75a890 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -24,10 +24,9 @@ #include <com/sun/star/report/meta/XFunctionManager.hpp> #include <com/sun/star/report/meta/XFunctionCategory.hpp> #include <com/sun/star/report/meta/XFunctionDescription.hpp> +#include <map> #include <vector> #include <boost/shared_ptr.hpp> -#include <comphelper/stl_types.hxx> - namespace rptui { @@ -37,8 +36,8 @@ class FunctionDescription; //============================================================================ class FunctionManager : public formula::IFunctionManager { - DECLARE_STL_USTRINGACCESS_MAP( ::boost::shared_ptr< FunctionDescription >, TFunctionsMap); - DECLARE_STL_USTRINGACCESS_MAP( ::boost::shared_ptr< FunctionCategory > , TCategoriesMap); + typedef std::map< OUString, ::boost::shared_ptr< FunctionDescription > > TFunctionsMap; + typedef std::map< OUString, ::boost::shared_ptr< FunctionCategory > > TCategoriesMap; ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionManager> m_xMgr; mutable TCategoriesMap m_aCategories; mutable ::std::vector< TCategoriesMap::iterator > m_aCategoryIndex; diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index b58aea237dec..da962468ad7a 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx @@ -19,8 +19,11 @@ #ifndef RPTUI_TOOLBOXCONTROLLER_HXX #define RPTUI_TOOLBOXCONTROLLER_HXX +#include <sal/config.h> + +#include <map> + #include <svtools/toolboxcontroller.hxx> -#include <comphelper/stl_types.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XSubToolbarController.hpp> @@ -37,7 +40,7 @@ namespace rptui class OToolboxController : public ::svt::ToolboxController ,public TToolboxController_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/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index cc9890eecb9c..a9688e45073f 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <map> #include <ReportControllerObserver.hxx> #include <ReportController.hxx> @@ -39,7 +42,7 @@ namespace rptui using namespace ::com::sun::star; -DECLARE_STL_USTRINGACCESS_MAP(bool, AllProperties); +typedef std::map<OUString, bool> AllProperties; DECLARE_STL_STDKEY_MAP(uno::Reference< beans::XPropertySet >, AllProperties, PropertySetInfoCache); class OXReportControllerObserverImpl diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 0c4608e4a00f..b84ab2712a0b 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -17,9 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <map> #include <comphelper/uno3.hxx> -#include <comphelper/stl_types.hxx> #include <svtools/unoevent.hxx> #include <svtools/unoimap.hxx> #include <svx/svdobj.hxx> @@ -47,7 +49,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------ -DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence< sal_Int8 > *, ScShapeImplementationIdMap ); +typedef std::map<OUString, uno::Sequence< sal_Int8 > *> ScShapeImplementationIdMap; static ScShapeImplementationIdMap aImplementationIdMap; diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 1e1612671565..8b03e4bf51cc 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <map> + #include <svtools/extcolorcfg.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -34,8 +38,6 @@ #include <vcl/event.hxx> #include <rtl/instance.hxx> #include <rtl/strbuf.hxx> -#include <comphelper/stl_types.hxx> - //----------------------------------------------------------------------------- using namespace utl; @@ -56,11 +58,11 @@ ExtendedColorConfig_Impl* ExtendedColorConfig::m_pImpl = NULL; class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster { - DECLARE_STL_USTRINGACCESS_MAP( OUString, TDisplayNames); - DECLARE_STL_USTRINGACCESS_MAP(ExtendedColorConfigValue,TConfigValues); + typedef std::map<OUString, OUString> TDisplayNames; + typedef std::map<OUString, ExtendedColorConfigValue> TConfigValues; typedef ::std::vector<TConfigValues::iterator> TMapPos; typedef ::std::pair< TConfigValues, TMapPos > TComponentMapping; - DECLARE_STL_USTRINGACCESS_MAP(TComponentMapping,TComponents); + typedef std::map<OUString, TComponentMapping> TComponents; TComponents m_aConfigValues; TDisplayNames m_aComponentDisplayNames; ::std::vector<TComponents::iterator> m_aConfigValuesPos; diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index d9f0d3d8db0e..c3839a81fdbd 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <map> #include <svtools/helpopt.hxx> #include <unotools/configmgr.hxx> @@ -26,7 +29,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <vcl/help.hxx> #include <osl/mutex.hxx> -#include <comphelper/stl_types.hxx> #include "itemholder2.hxx" @@ -53,7 +55,7 @@ class SvtHelpOptions_Impl : public utl::ConfigItem OUString aSystem; OUString sHelpStyleSheet; - DECLARE_STL_USTRINGACCESS_MAP( sal_Int32, MapString2Int ); + typedef std::map <OUString, sal_Int32> MapString2Int; MapString2Int aURLIgnoreCounters; ::osl::Mutex aIgnoreCounterSafety; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index fc4a4810f463..bcf1eb455c8f 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -28,7 +28,6 @@ #include <comphelper/extract.hxx> #include <comphelper/interaction.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/stl_types.hxx> #include <comphelper/string.hxx> #include <vcl/stdtext.hxx> #include <vcl/waitobj.hxx> @@ -51,6 +50,7 @@ #include "svl/filenotation.hxx" #include <tools/urlobj.hxx> #include <algorithm> +#include <map> // ....................................................................... namespace svt @@ -72,7 +72,7 @@ namespace svt typedef std::vector<OUString> StringArray; typedef std::set<OUString> StringBag; - DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String ); + typedef std::map<OUString, OUString> MapString2String; namespace { @@ -224,7 +224,7 @@ public: // ------------------------------------------------------------------- sal_Bool AssigmentTransientData::hasFieldAssignment(const OUString& _rLogicalName) { - ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); + MapString2String::const_iterator aPos = m_aAliases.find( _rLogicalName ); return ( m_aAliases.end() != aPos ) && ( !aPos->second.isEmpty() ); } @@ -233,7 +233,7 @@ public: OUString AssigmentTransientData::getFieldAssignment(const OUString& _rLogicalName) { OUString sReturn; - ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); + MapString2String::const_iterator aPos = m_aAliases.find( _rLogicalName ); if ( m_aAliases.end() != aPos ) sReturn = aPos->second; @@ -249,7 +249,7 @@ public: // ------------------------------------------------------------------- void AssigmentTransientData::clearFieldAssignment(const OUString& _rLogicalName) { - MapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); + MapString2String::iterator aPos = m_aAliases.find( _rLogicalName ); if ( m_aAliases.end() != aPos ) m_aAliases.erase( aPos ); } diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 313757217c61..3d7a94441fc2 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <map> #include <sal/macros.h> #include "fmundo.hxx" @@ -151,7 +154,7 @@ struct PropertyInfo struct PropertySetInfo { - DECLARE_STL_USTRINGACCESS_MAP(PropertyInfo, AllProperties); + typedef std::map<OUString, PropertyInfo> AllProperties; AllProperties aProps; // all properties of this set which we know so far sal_Bool bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string @@ -622,7 +625,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // now we have access to the cached info about the set // let's see what we know about the property PropertySetInfo::AllProperties& rPropInfos = aSetPos->second.aProps; - PropertySetInfo::AllPropertiesIterator aPropertyPos = rPropInfos.find(evt.PropertyName); + PropertySetInfo::AllProperties::iterator aPropertyPos = rPropInfos.find(evt.PropertyName); if (aPropertyPos == rPropInfos.end()) { // nothing 'til now ... have to change this .... PropertyInfo aNewEntry; diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index de178deb59e6..e832d0887edd 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <map> #include <cmdid.h> @@ -51,7 +54,6 @@ #include <svx/shapepropertynotifier.hxx> #include <crstate.hxx> #include <comphelper/extract.hxx> -#include <comphelper/stl_types.hxx> #include <comphelper/makesequence.hxx> #include <svx/scene3d.hxx> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> @@ -63,7 +65,7 @@ using namespace ::com::sun::star; -DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence< sal_Int8 > *, SwShapeImplementationIdMap ); +typedef std::map<OUString, uno::Sequence< sal_Int8 > *> SwShapeImplementationIdMap; static SwShapeImplementationIdMap aImplementationIdMap; diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 3459747cdf4b..68811c168672 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -17,10 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> - #include <sal/config.h> +#include <stack> +#include <string.h> + #include <officecfg/Office/Common.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <osl/mutex.hxx> diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 4d50c63a64c5..884ca77e16f5 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -25,8 +25,8 @@ #include <com/sun/star/task/XStatusIndicator.hpp> #include <xmloff/xmltkmap.hxx> #include <com/sun/star/container/XNameAccess.hpp> -#include <comphelper/stl_types.hxx> +#include <map> #include <vector> #include <xmloff/xmlimp.hxx> @@ -166,8 +166,8 @@ struct DateTimeDeclContextImpl DateTimeDeclContextImpl() : mbFixed(sal_True) {} }; -DECLARE_STL_USTRINGACCESS_MAP( OUString, HeaderFooterDeclMap ); -DECLARE_STL_USTRINGACCESS_MAP( DateTimeDeclContextImpl, DateTimeDeclMap ); +typedef std::map<OUString, OUString> HeaderFooterDeclMap; +typedef std::map<OUString, DateTimeDeclContextImpl> DateTimeDeclMap; class SdXMLImport: public SvXMLImport { diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 0e47e7c91421..171070d53eab 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -120,7 +120,7 @@ namespace xmloff for (ElementType eType=(ElementType)0; eType<UNKNOWN; ++eType) s_sElementTranslations[OUString::createFromAscii(getElementName(eType))] = eType; } - ConstMapString2ElementIterator aPos = s_sElementTranslations.find(_rName); + MapString2Element::const_iterator aPos = s_sElementTranslations.find(_rName); if (s_sElementTranslations.end() != aPos) return aPos->second; diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index 6e8ffbbaa377..8c4d2e557693 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTIMPORT_HXX #define INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTIMPORT_HXX +#include <sal/config.h> + +#include <map> + #include "propertyimport.hxx" #include "controlelement.hxx" #include "valueproperties.hxx" @@ -33,8 +37,6 @@ #include <com/sun/star/form/XGridColumnFactory.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> -#include <comphelper/stl_types.hxx> - class XMLTextStyleContext; namespace xmloff { @@ -49,7 +51,7 @@ namespace xmloff class OElementNameMap : public OControlElement { protected: - DECLARE_STL_USTRINGACCESS_MAP( ElementType, MapString2Element ); + typedef std::map<OUString, ElementType> MapString2Element; static MapString2Element s_sElementTranslations; protected: diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx index 6ec70d6009bf..cebb790daa9a 100644 --- a/xmloff/source/forms/eventexport.cxx +++ b/xmloff/source/forms/eventexport.cxx @@ -95,7 +95,7 @@ namespace xmloff Any SAL_CALL OEventDescriptorMapper::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); + MapString2PropertyValueSequence::const_iterator aPos = m_aMappedEvents.find(_rName); if (m_aMappedEvents.end() == aPos) throw NoSuchElementException( OUString("There is no element named ") += _rName, @@ -108,7 +108,7 @@ namespace xmloff { Sequence< OUString > aReturn(m_aMappedEvents.size()); OUString* pReturn = aReturn.getArray(); - for ( ConstMapString2PropertyValueSequenceIterator aCollect = m_aMappedEvents.begin(); + for ( MapString2PropertyValueSequence::const_iterator aCollect = m_aMappedEvents.begin(); aCollect != m_aMappedEvents.end(); ++aCollect, ++pReturn ) @@ -119,7 +119,7 @@ namespace xmloff sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const OUString& _rName ) throw(RuntimeException) { - ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); + MapString2PropertyValueSequence::const_iterator aPos = m_aMappedEvents.find(_rName); return m_aMappedEvents.end() != aPos; } diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx index 7c40297c9d0e..1886acfef101 100644 --- a/xmloff/source/forms/eventexport.hxx +++ b/xmloff/source/forms/eventexport.hxx @@ -20,12 +20,15 @@ #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_EVENTEXPORT_HXX #define INCLUDED_XMLOFF_SOURCE_FORMS_EVENTEXPORT_HXX +#include <sal/config.h> + +#include <map> + #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <cppuhelper/implbase1.hxx> -#include <comphelper/stl_types.hxx> namespace xmloff { @@ -45,7 +48,7 @@ namespace xmloff class OEventDescriptorMapper : public OEventDescriptorMapper_Base { protected: - DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >, MapString2PropertyValueSequence ); + typedef std::map< OUString, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > MapString2PropertyValueSequence; MapString2PropertyValueSequence m_aMappedEvents; public: diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 126aeee12bb3..78b7920d4132 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -229,7 +229,7 @@ namespace xmloff const OAttribute2Property::AttributeAssignment* OAttribute2Property::getAttributeTranslation( const OUString& _rAttribName) { - ConstAttributeAssignmentsIterator aPos = m_aKnownProperties.find(_rAttribName); + AttributeAssignments::const_iterator aPos = m_aKnownProperties.find(_rAttribName); if (m_aKnownProperties.end() != aPos) return &aPos->second; return NULL; diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index 3136eb9faefa..a710ee0b889e 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -20,10 +20,13 @@ #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_FORMATTRIBUTES_HXX #define INCLUDED_XMLOFF_SOURCE_FORMS_FORMATTRIBUTES_HXX +#include <sal/config.h> + +#include <map> + #include <com/sun/star/beans/XPropertySet.hpp> #include <sal/types.h> #include <salhelper/simplereferenceobject.hxx> -#include <comphelper/stl_types.hxx> struct SvXMLEnumMapEntry; @@ -244,7 +247,7 @@ namespace xmloff }; protected: - DECLARE_STL_USTRINGACCESS_MAP( AttributeAssignment, AttributeAssignments ); + typedef std::map<OUString, AttributeAssignment> AttributeAssignments; AttributeAssignments m_aKnownProperties; public: diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index adc7998d4c67..26c22c34187b 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -463,7 +463,7 @@ Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const OUStri Reference< XPropertySet > xReturn; if (m_aCurrentPageIds != m_aControlIds.end()) { - ConstMapString2PropertySetIterator aPos = m_aCurrentPageIds->second.find(_rControlId); + MapString2PropertySet::const_iterator aPos = m_aCurrentPageIds->second.find(_rControlId); if (m_aCurrentPageIds->second.end() != aPos) xReturn = aPos->second; else diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx index b2341b340d2b..207c99671bea 100644 --- a/xmloff/source/forms/layerimport.hxx +++ b/xmloff/source/forms/layerimport.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_LAYERIMPORT_HXX #define INCLUDED_XMLOFF_SOURCE_FORMS_LAYERIMPORT_HXX +#include <sal/config.h> + +#include <map> + #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/form/XFormsSupplier2.hpp> #include <rtl/ref.hxx> @@ -57,7 +61,7 @@ namespace xmloff SvXMLStylesContext* m_pAutoStyles; protected: - DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, MapString2PropertySet ); + typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > MapString2PropertySet; DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >, MapString2PropertySet, ODrawPageCompare, MapDrawPage2Map); MapDrawPage2Map m_aControlIds; // ids of the controls on all known page |