mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of DECLARE_STL_STDKEY_MAP

Browse Source 
Change-Id: I099f94922acba0bf9cde22fbbb3eefc230776868
This commit is contained in:
Stephan Bergmann
2013-12-06 09:10:09 +01:00
parent e68610de1c
commit 1a715d4d67
8 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dbaccess/source/core/api/RowSetCacheIterator.hxx
View File

@@ -19,8 +19,11 @@
#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHEITERATOR_HXX #ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHEITERATOR_HXX
#define INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHEITERATOR_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHEITERATOR_HXX
#include <sal/config.h>
#include <map>
#include "RowSetRow.hxx" #include "RowSetRow.hxx"
#include <comphelper/stl_types.hxx>
namespace dbaccess namespace dbaccess
{ {
@@ -32,7 +35,7 @@ namespace dbaccess
ORowSetBase* pRowSet; ORowSetBase* pRowSet;
} ORowSetCacheIterator_Helper; } ORowSetCacheIterator_Helper;
DECLARE_STL_STDKEY_MAP(sal_Int32,ORowSetCacheIterator_Helper,ORowSetCacheMap); typedef std::map<sal_Int32, ORowSetCacheIterator_Helper> ORowSetCacheMap;
class ORowSetCache; class ORowSetCache;
class ORowSetCacheIterator class ORowSetCacheIterator

2
dbaccess/source/ui/browser/sbagrid.cxx
View File

@@ -334,7 +334,7 @@ void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl,
aEvt.IsEnabled = !pGrid->IsReadOnlyDB(); aEvt.IsEnabled = !pGrid->IsReadOnlyDB();
aEvt.FeatureURL = _rUrl; aEvt.FeatureURL = _rUrl;
ConstMapDispatchToBoolIterator aURLStatePos = m_aDispatchStates.find( classifyDispatchURL( _rUrl ) ); MapDispatchToBool::const_iterator aURLStatePos = m_aDispatchStates.find( classifyDispatchURL( _rUrl ) );
if ( m_aDispatchStates.end() != aURLStatePos ) if ( m_aDispatchStates.end() != aURLStatePos )
aEvt.State <<= aURLStatePos->second; aEvt.State <<= aURLStatePos->second;
else else

3
dbaccess/source/ui/inc/sbagrid.hxx
View File

@@ -31,6 +31,7 @@
#include <comphelper/stl_types.hxx> #include <comphelper/stl_types.hxx>
#include "sbamultiplex.hxx" #include "sbamultiplex.hxx"
#include <svx/dataaccessdescriptor.hxx> #include <svx/dataaccessdescriptor.hxx>
#include <map>
#include <queue> #include <queue>
class SvNumberFormatter; class SvNumberFormatter;
@@ -163,7 +164,7 @@ namespace dbaui
}; };
DispatchType classifyDispatchURL( const ::com::sun::star::util::URL& _rURL ); DispatchType classifyDispatchURL( const ::com::sun::star::util::URL& _rURL );
DECLARE_STL_STDKEY_MAP( DispatchType, sal_Bool, MapDispatchToBool ); typedef std::map<DispatchType, sal_Bool> MapDispatchToBool;
MapDispatchToBool m_aDispatchStates; MapDispatchToBool m_aDispatchStates;
}; };

5
extensions/source/dbpilots/dbptypes.hxx
View File

@@ -22,11 +22,10 @@
#include <sal/config.h> #include <sal/config.h>
#include <map>
#include <set> #include <set>
#include <vector> #include <vector>
#include <comphelper/stl_types.hxx>
//......................................................................... //.........................................................................
namespace dbp namespace dbp
{ {
@@ -34,7 +33,7 @@ namespace dbp
typedef std::vector<OUString> StringArray; typedef std::vector<OUString> StringArray;
typedef std::set<OUString> StringBag; typedef std::set<OUString> StringBag;
DECLARE_STL_STDKEY_MAP( sal_uInt32, OUString, MapInt2String ); typedef std::map<sal_uInt32, OUString> MapInt2String;
//......................................................................... //.........................................................................
} // namespace dbp } // namespace dbp

3
include/comphelper/stl_types.hxx
View File

@@ -242,9 +242,6 @@ OutputIter intersperse(
typedef std::map< keytype, valuetype, comparefct > classname; \ typedef std::map< keytype, valuetype, comparefct > classname; \
DECLARE_STL_ITERATORS(classname) \ DECLARE_STL_ITERATORS(classname) \
#define DECLARE_STL_STDKEY_MAP(keytype, valuetype, classname) \
DECLARE_STL_MAP(keytype, valuetype, std::less< keytype >, classname) \
#endif // INCLUDED_COMPHELPER_STL_TYPES_HXX #endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
reportdesign/source/ui/report/ReportControllerObserver.cxx
View File

@@ -43,7 +43,7 @@ namespace rptui
using namespace ::com::sun::star; using namespace ::com::sun::star;
typedef std::map<OUString, bool> AllProperties; typedef std::map<OUString, bool> AllProperties;
DECLARE_STL_STDKEY_MAP(uno::Reference< beans::XPropertySet >, AllProperties, PropertySetInfoCache); typedef std::map<uno::Reference< beans::XPropertySet >, AllProperties> PropertySetInfoCache;
class OXReportControllerObserverImpl class OXReportControllerObserverImpl
{ {

8
sd/source/ui/unoidl/unoobj.cxx
View File

@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <sal/config.h>
#include <map>
#include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/presentation/ClickAction.hpp>
@@ -25,7 +28,6 @@
#include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/beans/PropertyValues.hpp>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <comphelper/stl_types.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <svl/itemprop.hxx> #include <svl/itemprop.hxx>
#include <svl/style.hxx> #include <svl/style.hxx>
@@ -86,11 +88,11 @@ extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
DECLARE_STL_STDKEY_MAP(sal_uIntPtr, SfxExtItemPropertySetInfo*, SdExtPropertySetInfoCache); typedef std::map<sal_uIntPtr, SfxExtItemPropertySetInfo*> SdExtPropertySetInfoCache;
static SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache; static SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache;
static SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache; static SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache;
DECLARE_STL_STDKEY_MAP(sal_uInt32, uno::Sequence< uno::Type >*, SdTypesCache); typedef std::map<sal_uInt32, uno::Sequence< uno::Type >*> SdTypesCache;
static SdTypesCache gImplTypesCache; static SdTypesCache gImplTypesCache;
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////

7
svx/source/form/fmundo.cxx
View File

@@ -55,7 +55,6 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <comphelper/property.hxx> #include <comphelper/property.hxx>
#include <comphelper/uno3.hxx> #include <comphelper/uno3.hxx>
#include <comphelper/stl_types.hxx>
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt; using namespace ::com::sun::star::awt;
@@ -167,7 +166,7 @@ sal_Bool operator < (const Reference< XPropertySet >& lhs,
return lhs.get() < rhs.get(); return lhs.get() < rhs.get();
} }
DECLARE_STL_STDKEY_MAP(Reference< XPropertySet >, PropertySetInfo, PropertySetInfoCache); typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCache;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -530,7 +529,7 @@ void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( Runtime
if (xSourceSet.is()) if (xSourceSet.is())
{ {
PropertySetInfoCache* pCache = static_cast<PropertySetInfoCache*>(m_pPropertySetCache); PropertySetInfoCache* pCache = static_cast<PropertySetInfoCache*>(m_pPropertySetCache);
PropertySetInfoCacheIterator aSetPos = pCache->find(xSourceSet); PropertySetInfoCache::iterator aSetPos = pCache->find(xSourceSet);
if (aSetPos != pCache->end()) if (aSetPos != pCache->end())
pCache->erase(aSetPos); pCache->erase(aSetPos);
} }
@@ -591,7 +590,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
PropertySetInfoCache* pCache = static_cast<PropertySetInfoCache*>(m_pPropertySetCache); PropertySetInfoCache* pCache = static_cast<PropertySetInfoCache*>(m_pPropertySetCache);
// let's see if we know something about the set // let's see if we know something about the set
PropertySetInfoCacheIterator aSetPos = pCache->find(xSet); PropertySetInfoCache::iterator aSetPos = pCache->find(xSet);
if (aSetPos == pCache->end()) if (aSetPos == pCache->end())
{ {
PropertySetInfo aNewEntry; PropertySetInfo aNewEntry;