connectivity/source/cpool/ZPoolCollection.cxx | 6 +--
connectivity/source/cpool/ZPoolCollection.hxx | 6 +--
connectivity/source/parse/sqliterator.cxx | 12 +++----
dbaccess/source/core/api/RowSetCacheIterator.hxx | 7 ++--
dbaccess/source/core/dataaccess/connection.cxx | 8 ++--
dbaccess/source/core/dataaccess/connection.hxx | 5 +-
dbaccess/source/inc/apitools.hxx | 7 ----
dbaccess/source/ui/browser/genericcontroller.cxx | 2 -
dbaccess/source/ui/browser/sbagrid.cxx | 2 -
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 14 ++++----
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 4 +-
dbaccess/source/ui/dlg/dbadmin.cxx | 2 -
dbaccess/source/ui/dlg/dbfindex.cxx | 22 ++++++-------
dbaccess/source/ui/dlg/dbfindex.hxx | 5 --
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2 -
dbaccess/source/ui/inc/DExport.hxx | 3 +
dbaccess/source/ui/inc/WCopyTable.hxx | 3 +
dbaccess/source/ui/inc/sbagrid.hxx | 6 +--
dbaccess/source/ui/relationdesign/RelationController.cxx | 6 ++-
extensions/source/dbpilots/dbptypes.hxx | 5 +-
include/comphelper/IdPropArrayHelper.hxx | 4 ++
include/comphelper/accessiblewrapper.hxx | 4 ++
include/comphelper/stl_types.hxx | 17 ----------
include/connectivity/CommonTools.hxx | 5 ++
include/dbaccess/genericcontroller.hxx | 5 +-
include/unotools/idhelper.hxx | 13 +++----
reportdesign/source/core/inc/ReportEngineJFree.hxx | 4 ++
reportdesign/source/ui/inspection/GeometryHandler.cxx | 5 ++
reportdesign/source/ui/report/ReportControllerObserver.cxx | 2 -
sd/source/ui/unoidl/unoobj.cxx | 8 ++--
sfx2/source/sidebar/SidebarController.hxx | 4 ++
svx/source/fmcomp/gridctrl.cxx | 10 ++---
svx/source/form/fmundo.cxx | 7 +---
svx/source/inc/fmvwimp.hxx | 4 ++
toolkit/source/controls/unocontrol.cxx | 1
xmloff/source/forms/eventimport.cxx | 2 -
xmloff/source/forms/eventimport.hxx | 14 +++++---
xmloff/source/forms/layerexport.cxx | 2 -
xmloff/source/forms/layerexport.hxx | 3 +
xmloff/source/forms/layerimport.cxx | 2 -
xmloff/source/forms/layerimport.hxx | 4 +-
41 files changed, 132 insertions(+), 115 deletions(-)
New commits:
commit e413521e0bd402530ff0308d9e05331e6bdc0c25
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 10:37:32 2013 +0100
Avoid ambiguities among different OWeakRefArray declarations
Change-Id: I61e3e9cdda17b6b23b33159d89904cce8f2e2ba0
diff --git a/dbaccess/source/core/dataaccess/connection.cxx
b/dbaccess/source/core/dataaccess/connection.cxx
index 8863b10..e5c170f 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -487,8 +487,8 @@ void OConnection::disposing()
OSubComponent::disposing();
OConnectionWrapper::disposing();
- OWeakRefArray::iterator aEnd = m_aStatements.end();
- for (OWeakRefArray::iterator i = m_aStatements.begin(); aEnd != i; ++i)
+ connectivity::OWeakRefArray::iterator aEnd = m_aStatements.end();
+ for (connectivity::OWeakRefArray::iterator i = m_aStatements.begin(); aEnd
!= i; ++i)
{
Reference<XComponent> xComp(i->get(),UNO_QUERY);
::comphelper::disposeComponent(xComp);
@@ -503,8 +503,8 @@ void OConnection::disposing()
::comphelper::disposeComponent(m_xQueries);
- OWeakRefArray::iterator aComposerEnd = m_aComposers.end();
- for (OWeakRefArray::iterator j = m_aComposers.begin(); aComposerEnd != j;
++j)
+ connectivity::OWeakRefArray::iterator aComposerEnd = m_aComposers.end();
+ for (connectivity::OWeakRefArray::iterator j = m_aComposers.begin();
aComposerEnd != j; ++j)
{
Reference<XComponent> xComp(j->get(),UNO_QUERY);
::comphelper::disposeComponent(xComp);
diff --git a/dbaccess/source/core/dataaccess/connection.hxx
b/dbaccess/source/core/dataaccess/connection.hxx
index 7995269..4ae7e7e 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -48,6 +48,7 @@
#include <comphelper/implbase_var.hxx>
#endif
#include <connectivity/ConnectionWrapper.hxx>
+#include <connectivity/CommonTools.hxx>
#include <connectivity/warningscontainer.hxx>
namespace dbaccess
@@ -80,10 +81,10 @@ class OConnection :public ::comphelper::OBaseMutex
protected:
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier
>
m_xMasterTables; // just to avoid the recreation
of the catalog
- OWeakRefArray m_aStatements;
+ connectivity::OWeakRefArray m_aStatements;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess
>
m_xQueries;
- OWeakRefArray m_aComposers;
+ connectivity::OWeakRefArray m_aComposers;
// the filter as set on the parent data link at construction of the
connection
::com::sun::star::uno::Sequence< OUString > m_aTableFilter;
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index eb6db2a..0890b09 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -22,8 +22,6 @@
#include <sal/config.h>
-#include <vector>
-
#include <cppuhelper/component.hxx>
#include <osl/mutex.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -31,11 +29,6 @@
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/sequence.hxx>
-// various typedefs
-namespace {
-typedef std::vector<css::uno::WeakReferenceHelper> OWeakRefArray;
-}
-
// OSubComponent - a component which holds a hard ref to it's parent
// and is been hold itself (by the parent) with a weak ref
class OSubComponent : public ::cppu::OComponentHelper
commit e35b4eab8246eec4acc266b99a5e623bb9a79968
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 10:29:56 2013 +0100
Get rid of DECLARE_STL_ITERATORS
Change-Id: I22148aa5336907939b37945e513c25a05b2b3776
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx
b/dbaccess/source/ui/dlg/dbfindex.cxx
index b71b56e..4522ad0 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -85,7 +85,7 @@ ODbaseIndexDialog::~ODbaseIndexDialog()
DBG_DTOR(ODbaseIndexDialog,NULL);
}
-sal_Bool ODbaseIndexDialog::GetTable(const OUString& _rName,
TableInfoListIterator& _rPosition)
+sal_Bool ODbaseIndexDialog::GetTable(const OUString& _rName,
TableInfoList::iterator& _rPosition)
{
for ( _rPosition = m_aTableInfoList.begin();
_rPosition != m_aTableInfoList.end();
@@ -121,7 +121,7 @@ OTableIndex ODbaseIndexDialog::implRemoveIndex(const
OUString& _rName, TableInde
sal_Int32 nPos = 0;
- TableIndexListIterator aSearch;
+ TableIndexList::iterator aSearch;
for ( aSearch = _rList.begin();
aSearch != _rList.end();
++aSearch, ++nPos
@@ -161,7 +161,7 @@ OTableIndex ODbaseIndexDialog::RemoveTableIndex( const
OUString& _rTableName, co
OTableIndex aReturn;
// does the table exist ?
- TableInfoListIterator aTablePos;
+ TableInfoList::iterator aTablePos;
if (!GetTable(_rTableName, aTablePos))
return aReturn;
@@ -170,7 +170,7 @@ OTableIndex ODbaseIndexDialog::RemoveTableIndex( const
OUString& _rTableName, co
void ODbaseIndexDialog::InsertTableIndex( const OUString& _rTableName, const
OTableIndex& _rIndex)
{
- TableInfoListIterator aTablePos;
+ TableInfoList::iterator aTablePos;
if (!GetTable(_rTableName, aTablePos))
return;
@@ -181,7 +181,7 @@ IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*,
/*pButton*/ )
{
// let all tables write their INF file
- for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin();
+ for ( TableInfoList::const_iterator aLoop = m_aTableInfoList.begin();
aLoop != m_aTableInfoList.end();
++aLoop
)
@@ -246,13 +246,13 @@ IMPL_LINK( ODbaseIndexDialog, OnListEntrySelected,
ListBox*, /*NOTINTERESTEDIN*/
IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox*, pComboBox )
{
// search the table
- TableInfoListIterator aTablePos;
+ TableInfoList::iterator aTablePos;
if (!GetTable(pComboBox->GetText(), aTablePos))
return 0L;
// fill the listbox for the indexes
aLB_TableIndexes.Clear();
- for ( ConstTableIndexListIterator aLoop = aTablePos->aIndexList.begin();
+ for ( TableIndexList::const_iterator aLoop =
aTablePos->aIndexList.begin();
aLoop != aTablePos->aIndexList.end();
++aLoop
)
@@ -388,7 +388,7 @@ void ODbaseIndexDialog::Init()
void ODbaseIndexDialog::SetCtrls()
{
// ComboBox tables
- for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin();
+ for ( TableInfoList::const_iterator aLoop = m_aTableInfoList.begin();
aLoop != m_aTableInfoList.end();
++aLoop
)
@@ -401,7 +401,7 @@ void ODbaseIndexDialog::SetCtrls()
aCB_Tables.SetText( rTabInfo.aTableName );
// build ListBox of the table indices
- for ( ConstTableIndexListIterator aIndex =
rTabInfo.aIndexList.begin();
+ for ( TableIndexList::const_iterator aIndex =
rTabInfo.aIndexList.begin();
aIndex != rTabInfo.aIndexList.end();
++aIndex
)
@@ -412,7 +412,7 @@ void ODbaseIndexDialog::SetCtrls()
}
// ListBox of the free indices
- for ( ConstTableIndexListIterator aFree = m_aFreeIndexList.begin();
+ for ( TableIndexList::const_iterator aFree = m_aFreeIndexList.begin();
aFree != m_aFreeIndexList.end();
++aFree
)
@@ -467,7 +467,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const
// now add all saved indices
sal_uInt16 nPos = 0;
- for ( ConstTableIndexListIterator aIndex = aIndexList.begin();
+ for ( TableIndexList::const_iterator aIndex = aIndexList.begin();
aIndex != aIndexList.end();
++aIndex, ++nPos
)
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx
b/dbaccess/source/ui/dlg/dbfindex.hxx
index 74cb062..6b4e045 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -26,7 +26,6 @@
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
#include <list>
-#include <comphelper/stl_types.hxx>
namespace dbaui
{
@@ -48,7 +47,6 @@ public:
};
typedef ::std::list< OTableIndex > TableIndexList;
-DECLARE_STL_ITERATORS(TableIndexList);
// OTableInfo
class ODbaseIndexDialog;
@@ -69,7 +67,6 @@ public:
};
typedef ::std::list< OTableInfo > TableInfoList;
-DECLARE_STL_ITERATORS(TableInfoList);
// IndexDialog
class ODbaseIndexDialog : public ModalDialog
@@ -110,7 +107,7 @@ protected:
void Init();
void SetCtrls();
- sal_Bool GetTable(const OUString& rName, TableInfoListIterator&
_rPosition);
+ sal_Bool GetTable(const OUString& rName, TableInfoList::iterator&
_rPosition);
OTableIndex implRemoveIndex(const OUString& _rName, TableIndexList&
_rList, ListBox& _rDisplay, sal_Bool _bMustExist);
void implInsertIndex(const OTableIndex& _rIndex, TableIndexList&
_rList, ListBox& _rDisplay);
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 08d4242..5ab7230 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -228,14 +228,6 @@ OutputIter intersperse(
}
//... namespace comphelper ................................................
-//==================================================================
-// consistently defining stl-types
-//==================================================================
-
-#define DECLARE_STL_ITERATORS(classname) \
- typedef classname::iterator classname##Iterator; \
- typedef classname::const_iterator Const##classname##Iterator \
-
#endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c78f7d85ab72a447cabbeebcc76706b796c7308a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 10:17:37 2013 +0100
Get rid of DECLARE_STL_MAP
Change-Id: Ifbda934a89087fcc1c031978d3e5b5783722b328
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx
b/connectivity/source/cpool/ZPoolCollection.cxx
index 57ce183..03eb49e 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -187,7 +187,7 @@ Reference< XDriver > SAL_CALL
OPoolCollection::getDriverByURL( const OUString& _
{
Reference< XDriver > xExistentProxy;
// look if we already have a proxy for this driver
- for ( ConstMapDriver2DriverRefIterator aLookup =
m_aDriverProxies.begin();
+ for ( MapDriver2DriverRef::const_iterator aLookup =
m_aDriverProxies.begin();
aLookup != m_aDriverProxies.end();
++aLookup
)
@@ -474,10 +474,10 @@ void SAL_CALL OPoolCollection::propertyChange( const
::com::sun::star::beans::Pr
getNodeValue(getDriverNameNodeName(),evt.Source) >>=
sThisDriverName;
// 1nd relase the driver
// look if we already have a proxy for this driver
- MapDriver2DriverRefIterator aLookup = m_aDriverProxies.begin();
+ MapDriver2DriverRef::iterator aLookup = m_aDriverProxies.begin();
while( aLookup != m_aDriverProxies.end())
{
- MapDriver2DriverRefIterator aFind = aLookup;
+ MapDriver2DriverRef::iterator aFind = aLookup;
Reference<XServiceInfo> xInfo(aLookup->first,UNO_QUERY);
++aLookup;
if(xInfo.is() && xInfo->getImplementationName() ==
sThisDriverName)
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx
b/connectivity/source/cpool/ZPoolCollection.hxx
index 4106212..60fe2b4 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -61,11 +61,11 @@ namespace connectivity
typedef ::comphelper::OInterfaceCompare<
::com::sun::star::sdbc::XDriver > ODriverCompare;
typedef std::map<OUString, OConnectionPool*> OConnectionPools;
- DECLARE_STL_MAP(
+ typedef std::map<
::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XDriver >,
::com::sun::star::uno::WeakReference<
::com::sun::star::sdbc::XDriver >,
- ODriverCompare,
- MapDriver2DriverRef );
+ ODriverCompare>
+ MapDriver2DriverRef;
MapDriver2DriverRef
m_aDriverProxies;
::osl::Mutex
m_aMutex;
diff --git a/connectivity/source/parse/sqliterator.cxx
b/connectivity/source/parse/sqliterator.cxx
index e388676..06b07ca 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -825,7 +825,7 @@ bool OSQLParseTreeIterator::impl_getColumnTableRange(const
OSQLParseNode* pNode,
if (aTableRange.isEmpty()) // None found
{
// Look for the columns in the tables
- for (ConstOSQLTablesIterator aIter = m_pImpl->m_pTables->begin();
aIter != m_pImpl->m_pTables->end(); ++aIter)
+ for (OSQLTables::const_iterator aIter =
m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter)
{
if (aIter->second.is())
{
@@ -1697,13 +1697,13 @@ void
OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
if(rColumnName.toChar() == '*' && rTableRange.isEmpty())
{ // SELECT * ...
OSL_ENSURE(_rColumns == m_aSelectColumns,"Invalid columns used here!");
- for(ConstOSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter
!= m_pImpl->m_pTables->end();++aIter)
+ for(OSQLTables::const_iterator aIter = m_pImpl->m_pTables->begin();
aIter != m_pImpl->m_pTables->end();++aIter)
appendColumns(_rColumns,aIter->first,aIter->second);
}
else if( rColumnName.toChar() == '*' && !rTableRange.isEmpty() )
{ // SELECT <table>.*
OSL_ENSURE(_rColumns == m_aSelectColumns,"Invalid columns used here!");
- ConstOSQLTablesIterator aFind = m_pImpl->m_pTables->find(rTableRange);
+ OSQLTables::const_iterator aFind =
m_pImpl->m_pTables->find(rTableRange);
if(aFind != m_pImpl->m_pTables->end())
appendColumns(_rColumns,rTableRange,aFind->second);
@@ -1715,7 +1715,7 @@ void
OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
{
Reference< XPropertySet> xNewColumn;
- for ( OSQLTablesIterator aIter = m_pImpl->m_pTables->begin();
aIter != m_pImpl->m_pTables->end(); ++aIter )
+ for ( OSQLTables::iterator aIter = m_pImpl->m_pTables->begin();
aIter != m_pImpl->m_pTables->end(); ++aIter )
{
if ( !aIter->second.is() )
continue;
@@ -1786,7 +1786,7 @@ void
OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
}
else // ColumnName and TableName exist
{
- ConstOSQLTablesIterator aFind = m_pImpl->m_pTables->find(rTableRange);
+ OSQLTables::const_iterator aFind =
m_pImpl->m_pTables->find(rTableRange);
sal_Bool bError = sal_False;
if (aFind != m_pImpl->m_pTables->end() && aFind->second.is())
@@ -2095,7 +2095,7 @@ Reference< XPropertySet >
OSQLParseTreeIterator::findColumn(const OSQLTables& _r
Reference< XPropertySet > xColumn;
if ( !rTableRange.isEmpty() )
{
- ConstOSQLTablesIterator aFind = _rTables.find(rTableRange);
+ OSQLTables::const_iterator aFind = _rTables.find(rTableRange);
if ( aFind != _rTables.end()
&& aFind->second.is()
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 3ac25d0..d356093 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -776,7 +776,7 @@ void OGenericUnoController::removeStatusListener(const
Reference< XStatusListene
SupportedFeatures::const_iterator aIter =
m_aSupportedFeatures.find(_rURL.Complete);
if (aIter != m_aSupportedFeatures.end())
{ // clear the cache for that feature
- StateCacheIterator aCachePos = m_aStateCache.find(
aIter->second.nFeatureId );
+ StateCache::iterator aCachePos = m_aStateCache.find(
aIter->second.nFeatureId );
if ( aCachePos != m_aStateCache.end() )
m_aStateCache.erase( aCachePos );
}
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index be221ab..6919c73 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -563,7 +563,7 @@ void
ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
{
if (_rxSource.is())
{
- for ( ConstMapInt2StringIterator aDirect =
m_aDirectPropTranslator.begin();
+ for ( MapInt2String::const_iterator aDirect =
m_aDirectPropTranslator.begin();
aDirect != m_aDirectPropTranslator.end();
++aDirect
)
@@ -614,8 +614,8 @@ void
ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
if ( !aInfos.empty() )
{
PropertyValue aSearchFor;
- ConstMapInt2StringIterator aEnd = m_aIndirectPropTranslator.end();
- for ( ConstMapInt2StringIterator aIndirect =
m_aIndirectPropTranslator.begin();
+ MapInt2String::const_iterator aEnd =
m_aIndirectPropTranslator.end();
+ for ( MapInt2String::const_iterator aIndirect =
m_aIndirectPropTranslator.begin();
aIndirect != aEnd;
++aIndirect)
{
@@ -656,7 +656,7 @@ void
ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r
const OUString sUrlProp("URL");
// transfer the direct properties
- for ( ConstMapInt2StringIterator aDirect =
m_aDirectPropTranslator.begin();
+ for ( MapInt2String::const_iterator aDirect =
m_aDirectPropTranslator.begin();
aDirect != m_aDirectPropTranslator.end();
++aDirect
)
@@ -713,7 +713,7 @@ void
ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
// collect the translated property values for the relevant items
PropertyValueSet aRelevantSettings;
- ConstMapInt2StringIterator aTranslation;
+ MapInt2String::const_iterator aTranslation;
::std::vector< sal_Int32>::iterator aDetailsEnd = aDetailIds.end();
for (::std::vector< sal_Int32>::iterator aIter = aDetailIds.begin();aIter
!= aDetailsEnd ; ++aIter)
{
@@ -778,8 +778,8 @@ void
ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
// now check the to-be-preserved props
::std::vector< sal_Int32 > aRemoveIndexes;
sal_Int32 nPositionCorrector = 0;
- ConstMapInt2StringIterator aPreservedEnd = aPreservedSettings.end();
- for ( ConstMapInt2StringIterator aPreserved =
aPreservedSettings.begin();
+ MapInt2String::const_iterator aPreservedEnd = aPreservedSettings.end();
+ for ( MapInt2String::const_iterator aPreserved =
aPreservedSettings.begin();
aPreserved != aPreservedEnd;
++aPreserved
)
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index 59bc3d2..c303443 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -22,6 +22,7 @@
#include <sal/config.h>
+#include <map>
#include <set>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -30,7 +31,6 @@
#include <com/sun/star/sdb/XDatabaseContext.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XDriver.hpp>
-#include <comphelper/stl_types.hxx>
#include "dsntypes.hxx"
#include <svl/itemset.hxx>
#include <com/sun/star/frame/XModel.hpp>
@@ -52,7 +52,7 @@ namespace dbaui
class ODbDataSourceAdministrationHelper
{
public:
- DECLARE_STL_MAP(sal_Int32, OUString, ::std::less< sal_Int32 >,
MapInt2String);
+ typedef std::map<sal_Int32, OUString> MapInt2String;
private:
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx
b/dbaccess/source/ui/dlg/dbadmin.cxx
index 609cc9a..b8bdd51 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -193,7 +193,7 @@ void ODbAdminDialog::impl_resetPages(const Reference<
XPropertySet >& _rxDatasou
// are set. Select another data source of the same type, where the
indirect props are not set (yet). Then,
// the indirect property values of the first ds are shown in the second ds
...)
const ODbDataSourceAdministrationHelper::MapInt2String& rMap =
m_pImpl->getIndirectProperties();
- for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator
aIndirect = rMap.begin();
+ for ( ODbDataSourceAdministrationHelper::MapInt2String::const_iterator
aIndirect = rMap.begin();
aIndirect != rMap.end();
++aIndirect
)
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index b02ae27..32b00df 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -394,7 +394,7 @@ void ODbTypeWizDialogSetup::resetPages(const Reference<
XPropertySet >& _rxDatas
// are set. Select another data source of the same type, where the
indirect props are not set (yet). Then,
// the indirect property values of the first ds are shown in the second ds
...)
const ODbDataSourceAdministrationHelper::MapInt2String& rMap =
m_pImpl->getIndirectProperties();
- for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator
aIndirect = rMap.begin();
+ for ( ODbDataSourceAdministrationHelper::MapInt2String::const_iterator
aIndirect = rMap.begin();
aIndirect != rMap.end();
++aIndirect
)
diff --git a/dbaccess/source/ui/inc/DExport.hxx
b/dbaccess/source/ui/inc/DExport.hxx
index 5b1f4ab..aef6c7d 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/Date.hpp>
+#include <map>
#include <vector>
#include <comphelper/stl_types.hxx>
#include "TypeInfo.hxx"
@@ -54,7 +55,7 @@ namespace dbaui
class ODatabaseExport
{
public:
-
DECLARE_STL_MAP(OUString,OFieldDescription*,::comphelper::UStringMixLess,TColumns);
+ typedef std::map<OUString, OFieldDescription*,
::comphelper::UStringMixLess> TColumns;
typedef ::std::vector<TColumns::const_iterator>
TColumnVector;
typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> > TPositions;
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx
b/dbaccess/source/ui/inc/WCopyTable.hxx
index 8fd2991..ec5a918 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -39,6 +39,7 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <vcl/lstbox.hxx>
#include <functional>
+#include <map>
namespace dbaui
{
@@ -220,7 +221,7 @@ namespace dbaui
friend class OWizNameMatching;
public:
-
DECLARE_STL_MAP(OUString,OUString,::comphelper::UStringMixLess,TNameMapping);
+ typedef std::map<OUString, OUString, ::comphelper::UStringMixLess>
TNameMapping;
enum Wizard_Button_Style
{
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx
b/dbaccess/source/ui/inc/sbagrid.hxx
index 0eaaca9..593e055 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/util/URL.hpp>
#include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
#include "sbamultiplex.hxx"
#include <svx/dataaccessdescriptor.hxx>
#include <map>
@@ -60,7 +59,7 @@ namespace dbaui
:public FmXGridControl
,public ::com::sun::star::frame::XDispatch
{
- DECLARE_STL_MAP(::com::sun::star::util::URL, SbaXStatusMultiplexer*,
SbaURLCompare,StatusMultiplexerArray);
+ typedef std::map<css::util::URL, SbaXStatusMultiplexer*,
SbaURLCompare> StatusMultiplexerArray;
StatusMultiplexerArray m_aStatusMultiplexer;
public:
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx
b/dbaccess/source/ui/relationdesign/RelationController.cxx
index aaf4362..27d8303 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <map>
+
#include "dbu_reghelper.hxx"
#include <sfx2/sfxsids.hrc>
#include "dbu_rel.hrc"
@@ -272,7 +276,7 @@ namespace
{
class RelationLoader : public ::osl::Thread
{
-
DECLARE_STL_MAP(OUString,::boost::shared_ptr<OTableWindowData>,::comphelper::UStringMixLess,TTableDataHelper);
+ typedef std::map<OUString, ::boost::shared_ptr<OTableWindowData>,
::comphelper::UStringMixLess> TTableDataHelper;
TTableDataHelper m_aTableData;
TTableConnectionData m_vTableConnectionData;
const Sequence< OUString> m_aTableList;
diff --git a/include/comphelper/IdPropArrayHelper.hxx
b/include/comphelper/IdPropArrayHelper.hxx
index 251236f..fb16be9 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_COMPHELPER_IDPROPARRAYHELPER_HXX
#define INCLUDED_COMPHELPER_IDPROPARRAYHELPER_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include <cppuhelper/component.hxx>
#include <osl/mutex.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/include/comphelper/accessiblewrapper.hxx
b/include/comphelper/accessiblewrapper.hxx
index f97dc430..8bcb914 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX
#define INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include <comphelper/proxyaggregation.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 6ab7f45..08d4242 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -21,8 +21,6 @@
#include <sal/config.h>
-#include <map>
-
#include <stack>
#include <math.h>
@@ -238,10 +236,6 @@ OutputIter intersperse(
typedef classname::iterator classname##Iterator; \
typedef classname::const_iterator Const##classname##Iterator \
-#define DECLARE_STL_MAP(keytype, valuetype, comparefct, classname) \
- typedef std::map< keytype, valuetype, comparefct > classname; \
- DECLARE_STL_ITERATORS(classname) \
-
#endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/CommonTools.hxx
b/include/connectivity/CommonTools.hxx
index fb19abf..0fca51e 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -19,8 +19,11 @@
#ifndef INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX
#define INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX
+#include <sal/config.h>
#include <config_features.h>
+#include <map>
+
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
@@ -57,7 +60,7 @@ namespace connectivity
typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper >
OWeakRefArray;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::sdbcx::XColumnsSupplier> OSQLTable;
- DECLARE_STL_MAP(OUString,OSQLTable,comphelper::UStringMixLess,
OSQLTables);
+ typedef std::map<OUString,OSQLTable,comphelper::UStringMixLess> OSQLTables;
//
-------------------------------------------------------------------------
// class ORefVector allows reference counting on a std::vector
diff --git a/include/dbaccess/genericcontroller.hxx
b/include/dbaccess/genericcontroller.hxx
index 3e86a2a..e5af457 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -22,6 +22,8 @@
#include <sal/config.h>
+#include <deque>
+#include <map>
#include <vector>
#include <dbaccess/AsyncronousLink.hxx>
@@ -51,7 +53,6 @@
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/sharedmutex.hxx>
#include <comphelper/namedvaluecollection.hxx>
-#include <comphelper/stl_types.hxx>
#include <connectivity/dbexception.hxx>
#include <cppuhelper/compbase11.hxx>
#include <cppuhelper/interfacecontainer.h>
@@ -229,7 +230,7 @@ namespace dbaui
DispatchTarget(const ::com::sun::star::util::URL& rURL, const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >
xRef) : aURL(rURL), xListener(xRef) { }
};
- DECLARE_STL_MAP( sal_uInt16, FeatureState, ::std::less< sal_uInt16 >,
StateCache );
+ typedef std::map<sal_uInt16, FeatureState> StateCache;
typedef std::vector<DispatchTarget> Dispatch;
FeatureListeners m_aFeaturesToInvalidate;
diff --git a/include/unotools/idhelper.hxx b/include/unotools/idhelper.hxx
index e0f8fd3..80698a6 100644
--- a/include/unotools/idhelper.hxx
+++ b/include/unotools/idhelper.hxx
@@ -20,10 +20,13 @@
#ifndef INCLUDED_UNOTOOLS_IDHELPER_HXX
#define INCLUDED_UNOTOOLS_IDHELPER_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <osl/mutex.hxx>
-#include <comphelper/stl_types.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <tools/debug.hxx>
@@ -68,12 +71,8 @@ public:
}
};
-// declare the map
-DECLARE_STL_MAP ( TypeSequence,
- ::cppu::OImplementationId,
- TypeSequenceLess,
- MapType2Id
- );
+typedef std::map<TypeSequence, ::cppu::OImplementationId, TypeSequenceLess>
+MapType2Id;
//.........................................................................
} // namespace utl
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx
b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 7dc478d..8b57b1a 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -19,6 +19,10 @@
#ifndef REPORTDESIGN_API_REPORTENGINEJFREE_HXX
#define REPORTDESIGN_API_REPORTENGINEJFREE_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include <com/sun/star/report/XReportEngine.hpp>
#include <cppuhelper/compbase2.hxx>
#include <comphelper/broadcasthelper.hxx>
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 36329fe..1ab4f29 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -16,6 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
+#include <sal/config.h>
+
+#include <map>
+
#include "GeometryHandler.hxx"
#include <comphelper/types.hxx>
diff --git a/sfx2/source/sidebar/SidebarController.hxx
b/sfx2/source/sidebar/SidebarController.hxx
index 9059582..135fcd7 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARCONTROLLER_HXX
#define INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARCONTROLLER_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include "AsynchronousCall.hxx"
#include "Context.hxx"
#include "FocusManager.hxx"
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index ef267c0..957d7b4 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -53,10 +53,10 @@
#include "fmservs.hxx"
#include "sdbdatacolumn.hxx"
-#include <comphelper/stl_types.hxx>
#include <comphelper/property.hxx>
#include <algorithm>
+#include <map>
using namespace ::svxform;
using namespace ::svt;
@@ -117,7 +117,7 @@ private:
};
class GridFieldValueListener;
-DECLARE_STL_MAP(sal_uInt16, GridFieldValueListener*, ::std::less<sal_uInt16>,
ColumnFieldValueListeners);
+typedef std::map<sal_uInt16, GridFieldValueListener*>
ColumnFieldValueListeners;
DBG_NAME(GridFieldValueListener)
class GridFieldValueListener : protected ::comphelper::OPropertyChangeListener
@@ -3464,7 +3464,7 @@ void DbGridControl::BeginCursorAction()
if (m_pFieldListeners)
{
ColumnFieldValueListeners* pListeners =
(ColumnFieldValueListeners*)m_pFieldListeners;
- ConstColumnFieldValueListenersIterator aIter = pListeners->begin();
+ ColumnFieldValueListeners::const_iterator aIter = pListeners->begin();
while (aIter != pListeners->end())
{
GridFieldValueListener* pCurrent = (*aIter).second;
@@ -3483,7 +3483,7 @@ void DbGridControl::EndCursorAction()
if (m_pFieldListeners)
{
ColumnFieldValueListeners* pListeners =
(ColumnFieldValueListeners*)m_pFieldListeners;
- ConstColumnFieldValueListenersIterator aIter = pListeners->begin();
+ ColumnFieldValueListeners::const_iterator aIter = pListeners->begin();
while (aIter != pListeners->end())
{
GridFieldValueListener* pCurrent = (*aIter).second;
@@ -3590,7 +3590,7 @@ void DbGridControl::FieldListenerDisposing(sal_uInt16
_nId)
return;
}
- ColumnFieldValueListenersIterator aPos = pListeners->find(_nId);
+ ColumnFieldValueListeners::iterator aPos = pListeners->find(_nId);
if (aPos == pListeners->end())
{
OSL_FAIL("DbGridControl::FieldListenerDisposing : invalid call (did
not find the listener) !");
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 5133709..c589c23 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX
#define INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include "svx/svdmark.hxx"
#include "fmdocumentclassification.hxx"
diff --git a/toolkit/source/controls/unocontrol.cxx
b/toolkit/source/controls/unocontrol.cxx
index bf34bec..f93a4cd 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -43,6 +43,7 @@
#include <comphelper/container.hxx>
#include <algorithm>
+#include <map>
#include <set>
#include <vector>
diff --git a/xmloff/source/forms/eventimport.cxx
b/xmloff/source/forms/eventimport.cxx
index 8a6a99e..87f490f 100644
--- a/xmloff/source/forms/eventimport.cxx
+++ b/xmloff/source/forms/eventimport.cxx
@@ -123,7 +123,7 @@ namespace xmloff
// loop through all elements
sal_Int32 nCount = _rxContainer->getCount();
Reference< XPropertySet > xCurrent;
- ConstMapPropertySet2ScriptSequenceIterator aRegisteredEventsPos;
+ MapPropertySet2ScriptSequence::const_iterator aRegisteredEventsPos;
for (sal_Int32 i=0; i<nCount; ++i)
{
::cppu::extractInterface(xCurrent, _rxContainer->getByIndex(i));
diff --git a/xmloff/source/forms/eventimport.hxx
b/xmloff/source/forms/eventimport.hxx
index a7a56cb..8f38159 100644
--- a/xmloff/source/forms/eventimport.hxx
+++ b/xmloff/source/forms/eventimport.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_EVENTIMPORT_HXX
#define INCLUDED_XMLOFF_SOURCE_FORMS_EVENTIMPORT_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include <xmloff/XMLEventsImportContext.hxx>
#include "callbacks.hxx"
#include "ifacecompare.hxx"
@@ -47,11 +51,11 @@ namespace xmloff
class ODefaultEventAttacherManager : public IEventAttacherManager
{
protected:
- DECLARE_STL_MAP(
- ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >, // map from
- ::com::sun::star::uno::Sequence<
::com::sun::star::script::ScriptEventDescriptor >, // map to
- OPropertySetCompare,
// compare method
- MapPropertySet2ScriptSequence);
// class name
+ typedef std::map<
+ ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >,
+ ::com::sun::star::uno::Sequence<
::com::sun::star::script::ScriptEventDescriptor >,
+ OPropertySetCompare>
+ MapPropertySet2ScriptSequence;
// usually an event attacher manager will need to collect all script
events registered, 'cause
// the _real_ XEventAttacherManager handles it's events by index, but
out indicies are not fixed
// until _all_ controls have been inserted.
diff --git a/xmloff/source/forms/layerexport.cxx
b/xmloff/source/forms/layerexport.cxx
index 3738aa5..3ff18db 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -391,7 +391,7 @@ namespace xmloff
{
OUString sNumberStyle;
- ConstMapPropertySet2IntIterator aControlFormatPos =
m_aControlNumberFormats.find(_rxControl);
+ MapPropertySet2Int::const_iterator aControlFormatPos =
m_aControlNumberFormats.find(_rxControl);
if (m_aControlNumberFormats.end() != aControlFormatPos)
{
OSL_ENSURE(m_pControlNumberStyles,
"OFormLayerXMLExport_Impl::getControlNumberStyle: have a control which has a
format style, but no style exporter!");
diff --git a/xmloff/source/forms/layerexport.hxx
b/xmloff/source/forms/layerexport.hxx
index 2089d3b..3a64231 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -22,6 +22,7 @@
#include <sal/config.h>
+#include <map>
#include <set>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -111,7 +112,7 @@ namespace xmloff
// TODO: To avoid this construct above, and to have a cleaner
implementation, an class encapsulating the
// export of a single page should be introduced.
- DECLARE_STL_MAP( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >, sal_Int32, OPropertySetCompare,
MapPropertySet2Int);
+ typedef std::map<css::uno::Reference<css::beans::XPropertySet>,
sal_Int32, OPropertySetCompare> MapPropertySet2Int;
MapPropertySet2Int m_aControlNumberFormats;
// maps controls to format keys, which are relative to our own
formats supplier
diff --git a/xmloff/source/forms/layerimport.cxx
b/xmloff/source/forms/layerimport.cxx
index 26c22c3..4779b4e 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -392,7 +392,7 @@ void OFormLayerXMLImport_Impl::startPage(const Reference<
XDrawPage >& _rxDrawPa
return;
// add a new entry to our page map
- ::std::pair< MapDrawPage2MapIterator, bool > aPagePosition;
+ ::std::pair< MapDrawPage2Map::iterator, bool > aPagePosition;
aPagePosition =
m_aControlIds.insert(MapDrawPage2Map::value_type(_rxDrawPage,
MapString2PropertySet()));
OSL_ENSURE(aPagePosition.second, "OFormLayerXMLImport_Impl::startPage:
already imported this page!");
diff --git a/xmloff/source/forms/layerimport.hxx
b/xmloff/source/forms/layerimport.hxx
index 207c996..86beb9e 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -62,10 +62,10 @@ namespace xmloff
protected:
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);
+ typedef std::map<css::uno::Reference<css::drawing::XDrawPage>,
MapString2PropertySet, ODrawPageCompare> MapDrawPage2Map;
MapDrawPage2Map m_aControlIds; // ids of the controls
on all known page
- MapDrawPage2MapIterator m_aCurrentPageIds; // ifs of the controls
on the current page
+ MapDrawPage2Map::iterator m_aCurrentPageIds; // ifs of the
controls on the current page
typedef ::std::pair< ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >, OUString >
ModelStringPair;
commit 1a715d4d67ca398d59a8f7e8b41bdfeeabdd4b74
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 09:10:09 2013 +0100
Get rid of DECLARE_STL_STDKEY_MAP
Change-Id: I099f94922acba0bf9cde22fbbb3eefc230776868
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx
b/dbaccess/source/core/api/RowSetCacheIterator.hxx
index 11d0d8f..8a52eb0 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.hxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx
@@ -19,8 +19,11 @@
#ifndef 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 <comphelper/stl_types.hxx>
namespace dbaccess
{
@@ -32,7 +35,7 @@ namespace dbaccess
ORowSetBase* pRowSet;
} ORowSetCacheIterator_Helper;
-
DECLARE_STL_STDKEY_MAP(sal_Int32,ORowSetCacheIterator_Helper,ORowSetCacheMap);
+ typedef std::map<sal_Int32, ORowSetCacheIterator_Helper> ORowSetCacheMap;
class ORowSetCache;
class ORowSetCacheIterator
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx
b/dbaccess/source/ui/browser/sbagrid.cxx
index a98fd40..96b50f2 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -334,7 +334,7 @@ void SbaXGridPeer::NotifyStatusChanged(const
::com::sun::star::util::URL& _rUrl,
aEvt.IsEnabled = !pGrid->IsReadOnlyDB();
aEvt.FeatureURL = _rUrl;
- ConstMapDispatchToBoolIterator aURLStatePos = m_aDispatchStates.find(
classifyDispatchURL( _rUrl ) );
+ MapDispatchToBool::const_iterator aURLStatePos = m_aDispatchStates.find(
classifyDispatchURL( _rUrl ) );
if ( m_aDispatchStates.end() != aURLStatePos )
aEvt.State <<= aURLStatePos->second;
else
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx
b/dbaccess/source/ui/inc/sbagrid.hxx
index 2d482a3..0eaaca9 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -31,6 +31,7 @@
#include <comphelper/stl_types.hxx>
#include "sbamultiplex.hxx"
#include <svx/dataaccessdescriptor.hxx>
+#include <map>
#include <queue>
class SvNumberFormatter;
@@ -163,7 +164,7 @@ namespace dbaui
};
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;
};
diff --git a/extensions/source/dbpilots/dbptypes.hxx
b/extensions/source/dbpilots/dbptypes.hxx
index 4ac0eb2..4071169 100644
--- a/extensions/source/dbpilots/dbptypes.hxx
+++ b/extensions/source/dbpilots/dbptypes.hxx
@@ -22,11 +22,10 @@
#include <sal/config.h>
+#include <map>
#include <set>
#include <vector>
-#include <comphelper/stl_types.hxx>
-
//.........................................................................
namespace dbp
{
@@ -34,7 +33,7 @@ namespace dbp
typedef std::vector<OUString> StringArray;
typedef std::set<OUString> StringBag;
- DECLARE_STL_STDKEY_MAP( sal_uInt32, OUString, MapInt2String );
+ typedef std::map<sal_uInt32, OUString> MapInt2String;
//.........................................................................
} // namespace dbp
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 3795ffb..6ab7f45 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -242,9 +242,6 @@ OutputIter intersperse(
typedef std::map< keytype, valuetype, comparefct > 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
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx
b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index a9688e4..096ddcf 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -43,7 +43,7 @@ namespace rptui
using namespace ::com::sun::star;
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
{
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 04e8920..49c6176 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -17,6 +17,9 @@
* 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/presentation/ClickAction.hpp>
@@ -25,7 +28,6 @@
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/PropertyValues.hpp>
#include <rtl/ustrbuf.hxx>
-#include <comphelper/stl_types.hxx>
#include <osl/mutex.hxx>
#include <svl/itemprop.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 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;
///////////////////////////////////////////////////////////////////////
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 3d7a944..e0cbe0a 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -55,7 +55,6 @@
#include <osl/mutex.hxx>
#include <comphelper/property.hxx>
#include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
@@ -167,7 +166,7 @@ sal_Bool operator < (const Reference< XPropertySet >& lhs,
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())
{
PropertySetInfoCache* pCache =
static_cast<PropertySetInfoCache*>(m_pPropertySetCache);
- PropertySetInfoCacheIterator aSetPos = pCache->find(xSourceSet);
+ PropertySetInfoCache::iterator aSetPos = pCache->find(xSourceSet);
if (aSetPos != pCache->end())
pCache->erase(aSetPos);
}
@@ -591,7 +590,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const
PropertyChangeEvent& evt)
PropertySetInfoCache* pCache =
static_cast<PropertySetInfoCache*>(m_pPropertySetCache);
// 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())
{
PropertySetInfo aNewEntry;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
