connectivity/source/drivers/ado/AColumn.cxx |
2
connectivity/source/drivers/ado/AColumns.cxx |
2
connectivity/source/drivers/ado/AConnection.cxx |
2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx |
5 -
dbaccess/source/ui/control/tabletree.cxx |
2
dbaccess/source/ui/dlg/adtabdlg.cxx |
2
dbaccess/source/ui/inc/WColumnSelect.hxx |
6 +-
dbaccess/source/ui/inc/WCopyTable.hxx |
4 -
dbaccess/source/ui/misc/UITools.cxx |
2
dbaccess/source/ui/misc/WColumnSelect.cxx |
10 +--
forms/source/inc/InterfaceContainer.hxx |
3 -
include/comphelper/stl_types.hxx |
30 ----------
include/svx/ShapeTypeHandler.hxx |
4 -
oox/source/drawingml/customshapegeometry.cxx |
3 -
sd/inc/CustomAnimationPreset.hxx |
7 +-
sd/inc/TransitionPreset.hxx |
4 -
sd/source/filter/eppt/epptooxml.hxx |
3 -
sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx |
4 -
sd/source/ui/framework/configuration/ResourceFactoryManager.hxx |
4 -
sd/source/ui/framework/module/ModuleController.cxx |
7 --
sd/source/ui/framework/tools/FrameworkHelper.cxx |
4 -
sd/source/ui/unoidl/facreg.cxx |
3 -
xmloff/source/transform/EventOOoTContext.cxx |
4 -
xmloff/source/transform/TransformerTokenMap.hxx |
3 -
24 files changed, 36 insertions(+), 84 deletions(-)
New commits:
commit f51877b147c456ecd8533b6958bfa798842e5c6b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 14:27:53 2013 +0100
Combine comphelper::UStringMixEqual, comphelper::TStringMixEqualFunctor
Change-Id: I3ab3777a65fd68f8cbaf17a8e2a989dc4ad7b1cc
diff --git a/connectivity/source/drivers/ado/AColumn.cxx
b/connectivity/source/drivers/ado/AColumn.cxx
index 2706f08..1e6ab61 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -214,7 +214,7 @@ void OAdoColumn::fillPropertyValues()
m_TypeName = pTypeInfo->aSimpleType.aTypeName;
else if ( eType == adVarBinary &&
ADOS::isJetEngine(m_pConnection->getEngineType()) )
{
- ::comphelper::TStringMixEqualFunctor aCase(sal_False);
+ ::comphelper::UStringMixEqual aCase(sal_False);
OTypeInfoMap::const_iterator aFind =
::std::find_if(pTypeInfoMap->begin(),
pTypeInfoMap->end(),
::o3tl::compose1(
diff --git a/connectivity/source/drivers/ado/AColumns.cxx
b/connectivity/source/drivers/ado/AColumns.cxx
index 1dad74a..c7db779 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -86,7 +86,7 @@ sdbcx::ObjectType OColumns::appendObject( const OUString&,
const Reference< XPro
pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))
>>= sTypeName;
const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo();
- ::comphelper::TStringMixEqualFunctor aCase(sal_False);
+ ::comphelper::UStringMixEqual aCase(sal_False);
// search for typeinfo where the typename is equal sTypeName
OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(),
pTypeInfoMap->end(),
diff --git a/connectivity/source/drivers/ado/AConnection.cxx
b/connectivity/source/drivers/ado/AConnection.cxx
index 3c39006..a32ad71 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -596,7 +596,7 @@ const OExtendedTypeInfo*
OConnection::getTypeInfoFromType(const OTypeInfoMap& _r
}
else if ( _sTypeName.getLength() )
{
- ::comphelper::TStringMixEqualFunctor aCase(sal_False);
+ ::comphelper::UStringMixEqual aCase(sal_False);
// search for typeinfo where the typename is equal _sTypeName
OTypeInfoMap::const_iterator aFind = ::std::find_if(_rTypeInfo.begin(),
_rTypeInfo.end(),
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index a658e2d..9142e2f 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -871,7 +871,6 @@ Reference< XNameAccess > SAL_CALL
OSingleSelectQueryComposer::getColumns( ) thr
}
const ::comphelper::UStringMixEqual aCaseCompare( bCase );
- const ::comphelper::TStringMixEqualFunctor aCaseCompareFunctor( bCase
);
typedef ::std::set< size_t > SizeTSet;
SizeTSet aUsedSelectColumns;
::connectivity::parse::OParseColumn::StringMap aColumnNames;
@@ -947,12 +946,12 @@ Reference< XNameAccess > SAL_CALL
OSingleSelectQueryComposer::getColumns( ) thr
if ( sColumnName.isEmpty() )
xProp->getPropertyValue(PROPERTY_NAME) >>= sColumnName;
- aFindName =
::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompareFunctor,sColumnName));
+ aFindName =
::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompare,sColumnName));
sal_Int32 j = 0;
while ( aFindName != aNames.end() )
{
sColumnName += OUString::number(++j);
- aFindName =
::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompareFunctor,sColumnName));
+ aFindName =
::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompare,sColumnName));
}
pColumn->setName(sColumnName);
diff --git a/dbaccess/source/ui/control/tabletree.cxx
b/dbaccess/source/ui/control/tabletree.cxx
index 8b11852..57aae83 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -193,7 +193,7 @@ namespace
struct OViewSetter : public ::std::unary_function<
OTableTreeListBox::TNames::value_type, bool>
{
const Sequence< OUString> m_aViews;
- ::comphelper::TStringMixEqualFunctor m_aEqualFunctor;
+ ::comphelper::UStringMixEqual m_aEqualFunctor;
OViewSetter(const Sequence< OUString>& _rViews,sal_Bool _bCase) :
m_aViews(_rViews),m_aEqualFunctor(_bCase){}
OTableTreeListBox::TNames::value_type operator() (const OUString& lhs)
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx
b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 23cecb5..90674e9 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -189,7 +189,7 @@ void TableListFacade::updateTableObjectList( bool
_bAllowViews )
const OUString* pViewBegin = sViews.getConstArray();
const OUString* pViewEnd = pViewBegin + sViews.getLength();
- ::comphelper::TStringMixEqualFunctor aEqualFunctor;
+ ::comphelper::UStringMixEqual aEqualFunctor;
for(;pViewBegin != pViewEnd;++pViewBegin)
aTables.erase(::std::remove_if(aTables.begin(),aTables.end(),::std::bind2nd(aEqualFunctor,*pViewBegin)),aTables.end());
OUString* pTables = aTables.empty() ? 0 : &aTables[0];
diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx
b/dbaccess/source/ui/inc/WColumnSelect.hxx
index 6944c19..1f56014 100644
--- a/dbaccess/source/ui/inc/WColumnSelect.hxx
+++ b/dbaccess/source/ui/inc/WColumnSelect.hxx
@@ -57,7 +57,7 @@ namespace dbaui
const OUString& _sColumnName,
const OUString& _sExtraChars,
sal_Int32 _nMaxNameLen,
- const ::comphelper::TStringMixEqualFunctor&
_aCase);
+ const ::comphelper::UStringMixEqual& _aCase);
void moveColumn( ListBox* _pRight,
ListBox* _pLeft,
@@ -65,14 +65,14 @@ namespace dbaui
const OUString& _sColumnName,
const OUString& _sExtraChars,
sal_Int32 _nMaxNameLen,
- const ::comphelper::TStringMixEqualFunctor&
_aCase);
+ const ::comphelper::UStringMixEqual& _aCase);
void enableButtons();
sal_uInt16 adjustColumnPosition(ListBox* _pLeft,
const OUString& _sColumnName,
ODatabaseExport::TColumnVector::size_type
nCurrentPos,
- const
::comphelper::TStringMixEqualFunctor& _aCase);
+ const ::comphelper::UStringMixEqual&
_aCase);
public:
virtual void Reset ( );
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx
b/dbaccess/source/ui/inc/WCopyTable.hxx
index ec5a918..5ae5b46 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -73,11 +73,11 @@ namespace dbaui
class TMultiListBoxEntryFindFunctor : public TColumnFindFunctor
{
- ::comphelper::TStringMixEqualFunctor m_aCase;
+ ::comphelper::UStringMixEqual m_aCase;
::std::vector< OUString>* m_pVector;
public:
TMultiListBoxEntryFindFunctor(::std::vector< OUString>* _pVector,
- const
::comphelper::TStringMixEqualFunctor& _aCase)
+ const ::comphelper::UStringMixEqual&
_aCase)
:m_aCase(_aCase)
,m_pVector(_pVector)
{
diff --git a/dbaccess/source/ui/misc/UITools.cxx
b/dbaccess/source/ui/misc/UITools.cxx
index 2a74895..9d67f8a 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -407,7 +407,7 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap&
_rTypeInfo,
}
else
{
- ::comphelper::TStringMixEqualFunctor aCase(sal_False);
+ ::comphelper::UStringMixEqual aCase(sal_False);
// search for typeinfo where the typename is equal _sTypeName
OTypeInfoMap::const_iterator typeInfoLoop = _rTypeInfo.begin();
OTypeInfoMap::const_iterator typeInfoEnd = _rTypeInfo.end();
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx
b/dbaccess/source/ui/misc/WColumnSelect.cxx
index abd4cc0..ff4a6eb 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -198,7 +198,7 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *,
pButton )
OUString sExtraChars = xMetaData->getExtraNameCharacters();
sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength();
- ::comphelper::TStringMixEqualFunctor
aCase(xMetaData->supportsMixedCaseQuotedIdentifiers());
+ ::comphelper::UStringMixEqual
aCase(xMetaData->supportsMixedCaseQuotedIdentifiers());
::std::vector< OUString> aRightColumns;
fillColumns(pRight,aRightColumns);
@@ -246,7 +246,7 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl,
MultiListBox *, pListBox )
OUString sExtraChars = xMetaData->getExtraNameCharacters();
sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength();
- ::comphelper::TStringMixEqualFunctor
aCase(xMetaData->supportsMixedCaseQuotedIdentifiers());
+ ::comphelper::UStringMixEqual
aCase(xMetaData->supportsMixedCaseQuotedIdentifiers());
::std::vector< OUString> aRightColumns;
fillColumns(pRight,aRightColumns);
@@ -280,7 +280,7 @@ void OWizColumnSelect::createNewColumn( ListBox* _pListbox,
const OUString& _sColumnName,
const OUString& _sExtraChars,
sal_Int32 _nMaxNameLen,
- const
::comphelper::TStringMixEqualFunctor& _aCase)
+ const ::comphelper::UStringMixEqual&
_aCase)
{
OUString sConvertedName =
m_pParent->convertColumnName(TMultiListBoxEntryFindFunctor(&_rRightColumns,_aCase),
_sColumnName,
@@ -306,7 +306,7 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight,
const OUString& _sColumnName,
const OUString& _sExtraChars,
sal_Int32 _nMaxNameLen,
- const
::comphelper::TStringMixEqualFunctor& _aCase)
+ const ::comphelper::UStringMixEqual&
_aCase)
{
if(_pRight == &m_lbNewColumnNames)
{
@@ -350,7 +350,7 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight,
sal_uInt16 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft,
const OUString& _sColumnName,
ODatabaseExport::TColumnVector::size_type nCurrentPos,
- const
::comphelper::TStringMixEqualFunctor& _aCase)
+ const
::comphelper::UStringMixEqual& _aCase)
{
sal_uInt16 nAdjustedPos = 0;
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 10bcc2c..52a5587 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -58,30 +58,15 @@ public:
};
//------------------------------------------------------------------------
-class UStringMixEqual
+class UStringMixEqual: public std::binary_function<OUString, OUString, bool>
{
sal_Bool m_bCaseSensitive;
public:
UStringMixEqual(sal_Bool bCaseSensitive =
sal_True):m_bCaseSensitive(bCaseSensitive){}
- sal_Bool operator() (const OUString& lhs, const OUString& rhs) const
- {
- return m_bCaseSensitive ? lhs.equals( rhs ) :
lhs.equalsIgnoreAsciiCase( rhs );
- }
- sal_Bool isCaseSensitive() const {return m_bCaseSensitive;}
-};
-//------------------------------------------------------------------------
-class TStringMixEqualFunctor : public ::std::binary_function<
OUString,OUString,bool>
-{
- sal_Bool m_bCaseSensitive;
-
-public:
- TStringMixEqualFunctor(sal_Bool bCaseSensitive = sal_True)
- :m_bCaseSensitive(bCaseSensitive)
- {}
bool operator() (const OUString& lhs, const OUString& rhs) const
{
- return !!(m_bCaseSensitive ? lhs.equals( rhs ) :
lhs.equalsIgnoreAsciiCase( rhs ));
+ return m_bCaseSensitive ? lhs.equals( rhs ) :
lhs.equalsIgnoreAsciiCase( rhs );
}
sal_Bool isCaseSensitive() const {return m_bCaseSensitive;}
};
commit 02f9f422c79be3896d407f06e9cf8043d7e148f9
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 13:37:06 2013 +0100
Remove unused comphelper::UStringIEqual
Change-Id: I3baedaed5bbc942657b1083fc3769cf87622e21c
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 134564c..10bcc2c 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -58,12 +58,6 @@ public:
};
//------------------------------------------------------------------------
-struct UStringIEqual
-{
- sal_Bool operator() (const OUString& lhs, const OUString& rhs) const {
return lhs.equalsIgnoreAsciiCase( rhs );}
-};
-
-//------------------------------------------------------------------------
class UStringMixEqual
{
sal_Bool m_bCaseSensitive;
commit e9c62a2d9cdca2c42badb468712d1c5be8326444
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 13:34:16 2013 +0100
Get rid of unnecessary comphelper::UStringEqual
Change-Id: Ia8718e49f21ccec239b2769eafa6bef90e0e9e40
diff --git a/forms/source/inc/InterfaceContainer.hxx
b/forms/source/inc/InterfaceContainer.hxx
index 695e518..b8548d4 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX
#include <boost/unordered_map.hpp>
-#include <comphelper/stl_types.hxx>
#include <comphelper/types.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/container/XNameReplace.hpp>
@@ -74,7 +73,7 @@ namespace frm
};
typedef ::std::vector<InterfaceRef> OInterfaceArray;
-typedef ::boost::unordered_multimap< OUString, InterfaceRef, OUStringHash,
::comphelper::UStringEqual> OInterfaceMap;
+typedef ::boost::unordered_multimap< OUString, InterfaceRef, OUStringHash >
OInterfaceMap;
//==================================================================
// OInterfaceContainer
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 8ed702a..134564c 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -56,11 +56,6 @@ public:
bool isCaseSensitive() const {return m_bCaseSensitive;}
};
-//------------------------------------------------------------------------
-struct UStringEqual
-{
- sal_Bool operator() (const OUString& lhs, const OUString& rhs) const {
return lhs.equals( rhs );}
-};
//------------------------------------------------------------------------
struct UStringIEqual
diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx
index 0b5e300..7a37297 100644
--- a/include/svx/ShapeTypeHandler.hxx
+++ b/include/svx/ShapeTypeHandler.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/drawing/XShape.hpp>
-#include <comphelper/stl_types.hxx>
#include <com/sun/star/document/XEventBroadcaster.hpp>
#include <svx/svxdllapi.h>
@@ -187,8 +186,7 @@ private:
*/
typedef ::boost::unordered_map<
OUString,ShapeTypeId,
- OUStringHash,
- ::comphelper::UStringEqual> tServiceNameToSlotId;
+ OUStringHash> tServiceNameToSlotId;
mutable tServiceNameToSlotId maServiceNameToSlotId;
/** Determine the slot id of the specified shape type. With this id
diff --git a/oox/source/drawingml/customshapegeometry.cxx
b/oox/source/drawingml/customshapegeometry.cxx
index d4f5e18..e3b5313 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -20,7 +20,6 @@
#include "oox/drawingml/customshapegeometry.hxx"
#include <com/sun/star/xml/sax/FastToken.hpp>
-#include <comphelper/stl_types.hxx>
#include <boost/unordered_map.hpp>
#include "oox/helper/helper.hxx"
#include "oox/helper/attributelist.hxx"
@@ -83,7 +82,7 @@ static const FormularCommandNameTable
pFormularCommandNameTable[] =
{ "val", FC_VAL }
};
-typedef boost::unordered_map< OUString, FormularCommand, OUStringHash,
comphelper::UStringEqual > FormulaCommandHMap;
+typedef boost::unordered_map< OUString, FormularCommand, OUStringHash >
FormulaCommandHMap;
static const FormulaCommandHMap* pCommandHashMap;
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 4617e13..1d8b98d 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -24,15 +24,14 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/animations/AnimationNodeType.hpp>
-#include <comphelper/stl_types.hxx>
#include <CustomAnimationEffect.hxx>
#include <boost/unordered_map.hpp>
namespace sd {
-typedef boost::unordered_map< OUString, CustomAnimationEffectPtr,
OUStringHash, comphelper::UStringEqual > EffectsSubTypeMap;
-typedef boost::unordered_map< OUString, OUString, OUStringHash,
comphelper::UStringEqual > UStringMap;
+typedef boost::unordered_map< OUString, CustomAnimationEffectPtr, OUStringHash
> EffectsSubTypeMap;
+typedef boost::unordered_map< OUString, OUString, OUStringHash > UStringMap;
typedef std::vector< OUString > UStringList;
class CustomAnimationPreset
@@ -71,7 +70,7 @@ private:
};
typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
-typedef boost::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash,
comphelper::UStringEqual> EffectDescriptorMap;
+typedef boost::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash>
EffectDescriptorMap;
typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList;
struct PresetCategory
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 6769dc9..a095040 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -23,8 +23,6 @@
#include <boost/shared_ptr.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/stl_types.hxx>
-
#include <list>
#include <boost/unordered_map.hpp>
@@ -40,7 +38,7 @@ namespace sd {
class TransitionPreset;
typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr;
typedef std::list< TransitionPresetPtr > TransitionPresetList;
-typedef boost::unordered_map< OUString, OUString, OUStringHash,
comphelper::UStringEqual > UStringMap;
+typedef boost::unordered_map< OUString, OUString, OUStringHash > UStringMap;
class TransitionPreset
{
diff --git a/sd/source/filter/eppt/epptooxml.hxx
b/sd/source/filter/eppt/epptooxml.hxx
index 3392bc96..4efbd3b 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -24,7 +24,6 @@
#include <oox/helper/zipstorage.hxx>
#include <oox/vml/vmldrawing.hxx>
#include <oox/export/shapes.hxx>
-#include <comphelper/stl_types.hxx>
#include "epptbase.hxx"
namespace com { namespace sun { namespace star {
@@ -156,7 +155,7 @@ private:
sal_Int32 nId;
sal_Int32 nLastIndex;
};
- typedef ::boost::unordered_map< OUString, struct AuthorComments,
OUStringHash, comphelper::UStringEqual > AuthorsMap;
+ typedef ::boost::unordered_map< OUString, struct AuthorComments,
OUStringHash > AuthorsMap;
AuthorsMap maAuthors;
void WriteAuthors();
diff --git
a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
index 49bdfef..ec2886e 100644
---
a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
+++
b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
-#include <comphelper/stl_types.hxx>
#include <vector>
#include <boost/unordered_map.hpp>
@@ -119,8 +118,7 @@ private:
typedef ::boost::unordered_map
<OUString,
ListenerList,
- OUStringHash,
- ::comphelper::UStringEqual> ListenerMap;
+ OUStringHash> ListenerMap;
ListenerMap maListenerMap;
/** Broadcast the given event to all listeners in the given list.
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
index 2f9f8fa..2c22df2 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/drawing/framework/XResourceFactoryManager.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <osl/mutex.hxx>
-#include <comphelper/stl_types.hxx>
#include <boost/unordered_map.hpp>
namespace sd { namespace framework {
@@ -86,8 +85,7 @@ private:
typedef ::boost::unordered_map<
OUString,
css::uno::Reference<css::drawing::framework::XResourceFactory>,
- OUStringHash,
- ::comphelper::UStringEqual> FactoryMap;
+ OUStringHash> FactoryMap;
FactoryMap maFactoryMap;
typedef ::std::vector<
diff --git a/sd/source/ui/framework/module/ModuleController.cxx
b/sd/source/ui/framework/module/ModuleController.cxx
index 1406d6e..983c93d 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -22,7 +22,6 @@
#include "tools/ConfigurationAccess.hxx"
#include <comphelper/processfactory.hxx>
-#include <comphelper/stl_types.hxx>
#include <boost/bind.hpp>
#include <boost/unordered_map.hpp>
@@ -45,8 +44,7 @@ class ModuleController::ResourceToFactoryMap
: public ::boost::unordered_map<
OUString,
OUString,
- OUStringHash,
- ::comphelper::UStringEqual>
+ OUStringHash>
{
public:
ResourceToFactoryMap (void) {}
@@ -57,8 +55,7 @@ class ModuleController::LoadedFactoryContainer
: public ::boost::unordered_map<
OUString,
WeakReference<XInterface>,
- OUStringHash,
- ::comphelper::UStringEqual>
+ OUStringHash>
{
public:
LoadedFactoryContainer (void) {}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index f2680b2..5596e49 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -35,7 +35,6 @@
#include <cppuhelper/compbase1.hxx>
#include <svl/lstner.hxx>
-#include <comphelper/stl_types.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
@@ -291,8 +290,7 @@ class FrameworkHelper::ViewURLMap
: public ::boost::unordered_map<
OUString,
ViewShell::ShellType,
- OUStringHash,
- ::comphelper::UStringEqual>
+ OUStringHash>
{
public:
ViewURLMap (void) {}
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index df50159..9b533ea 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -29,7 +29,6 @@
#include <string.h>
-#include <comphelper/stl_types.hxx>
#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
@@ -232,7 +231,7 @@ enum FactoryId
SlideLayoutControllerFactoryId,
InsertSlideControllerFactoryId,
};
-typedef ::boost::unordered_map<OUString, FactoryId, OUStringHash,
comphelper::UStringEqual> FactoryMap;
+typedef ::boost::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap;
namespace {
diff --git a/xmloff/source/transform/EventOOoTContext.cxx
b/xmloff/source/transform/EventOOoTContext.cxx
index f793ce9..3c2a026 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -25,7 +25,6 @@
#include "AttrTransformerAction.hxx"
#include "TransformerActions.hxx"
#include "TransformerBase.hxx"
-#include <comphelper/stl_types.hxx>
#include <rtl/ustrbuf.hxx>
#include <boost/unordered_map.hpp>
@@ -35,8 +34,7 @@ using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
class XMLTransformerOOoEventMap_Impl:
- public ::boost::unordered_map< OUString, NameKey_Impl,
- OUStringHash, ::comphelper::UStringEqual >
+ public ::boost::unordered_map< OUString, NameKey_Impl, OUStringHash >
{
public:
diff --git a/xmloff/source/transform/TransformerTokenMap.hxx
b/xmloff/source/transform/TransformerTokenMap.hxx
index ca8c43c..ec4cf09 100644
--- a/xmloff/source/transform/TransformerTokenMap.hxx
+++ b/xmloff/source/transform/TransformerTokenMap.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERTOKENMAP_HXX
#include <rtl/ustring.hxx>
-#include <comphelper/stl_types.hxx>
#include <boost/unordered_map.hpp>
#include <xmloff/xmltoken.hxx>
#include "TransformerTokenMap.hxx"
@@ -30,7 +29,7 @@
class XMLTransformerTokenMap :
public ::boost::unordered_map< OUString, ::xmloff::token::XMLTokenEnum,
- OUStringHash, ::comphelper::UStringEqual >
+ OUStringHash >
{
public:
XMLTransformerTokenMap( ::xmloff::token::XMLTokenEnum *pInit );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
