[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdetc.hxx | 46 +--
svx/source/dialog/swframeexample.cxx | 28 ++---
svx/source/svdraw/svdetc.cxx | 24 +-
svx/source/svdraw/svdglev.cxx|8 +++---
4 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit d2e4753c3f511cfc6b2932ce60d0bc2e09296f9f
Author: tymyjan
Date: Tue Jul 19 22:40:29 2016 +0200
tdf#75280 Cleaning up of sal_uIntPtr usage #4a
Change-Id: I488baed0ffc3fea9c42bad1647a034cd5e9b28bb
Reviewed-on: https://gerrit.libreoffice.org/27325
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 9beca6f..20750c6 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -65,7 +65,7 @@ class SVX_DLLPUBLIC SdrEngineDefaults
{
friend class SdrAttrObj;
ColoraFontColor;
-sal_uIntPtr nFontHeight;
+size_t nFontHeight;
Fraction aMapFraction;
private:
@@ -81,7 +81,7 @@ public:
// see below for further details). The default setting 847/100mm
corresponds to about
// 24 Point. If e.g. one would use Twips (SetMapUnit(MAP_TWIP)) (20 Twip =
1 Point)
// instead, one would need to set the font height to 480, in order to get
a 24 Point height.
-static sal_uIntPtr GetFontHeight() { return
GetDefaults().nFontHeight; }
+static size_t GetFontHeight() { return
GetDefaults().nFontHeight; }
// The MapMode is needed for the global Outliner.
// Incidentally, every newly instantiated SdrModel is assigned this
MapMode by default.
@@ -127,44 +127,44 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16*
pOldWhichTable, sal_uInt16 nRange
class SVX_DLLPUBLIC SvdProgressInfo
{
private:
-sal_uIntPtr m_nSumActionCount; // Sum of all Actions
-sal_uIntPtr m_nSumCurAction; // Sum of all handled Actions
+size_t m_nSumActionCount; // Sum of all Actions
+size_t m_nSumCurAction; // Sum of all handled Actions
-sal_uIntPtr m_nActionCount; // Count of Actions in the current object
-sal_uIntPtr m_nCurAction; // Count of handled Actions in the current
object
+size_t m_nActionCount; // Count of Actions in the current object
+size_t m_nCurAction; // Count of handled Actions in the current
object
-sal_uIntPtr m_nInsertCount; // Count of to-be-inserted Actions in the
current object
-sal_uIntPtr m_nCurInsert; // Count of already inserted Actions
+size_t m_nInsertCount; // Count of to-be-inserted Actions in the
current object
+size_t m_nCurInsert; // Count of already inserted Actions
-sal_uIntPtr m_nObjCount; // Count of selected objects
-sal_uIntPtr m_nCurObj;// Current object
+size_t m_nObjCount; // Count of selected objects
+size_t m_nCurObj;// Current object
Link maLink;
public:
SvdProgressInfo( const Link& _pLink );
-void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount );
+void Init( size_t _nSumActionCount, size_t _nObjCount );
void SetNextObject();
-void SetActionCount( sal_uIntPtr _nActionCount );
-void SetInsertCount( sal_uIntPtr _nInsertCount );
+void SetActionCount( size_t _nActionCount );
+void SetInsertCount( size_t _nInsertCount );
-bool ReportActions( sal_uIntPtr nActionCount );
-void ReportInserts( sal_uIntPtr nInsertCount );
+bool ReportActions( size_t nActionCount );
+void ReportInserts( size_t nInsertCount );
-sal_uIntPtr GetSumCurAction() const { return m_nSumCurAction; };
-sal_uIntPtr GetObjCount() const { return m_nObjCount; };
-sal_uIntPtr GetCurObj() const { return m_nCurObj; };
+size_t GetSumCurAction() const { return m_nSumCurAction; };
+size_t GetObjCount() const { return m_nObjCount; };
+size_t GetCurObj() const { return m_nCurObj; };
-sal_uIntPtr GetActionCount() const { return m_nActionCount; };
-sal_uIntPtr GetCurAction() const { return m_nCurAction; };
+size_t GetActionCount() const { return m_nActionCount; };
+size_t GetCurAction() const { return m_nCurAction; };
-sal_uIntPtr GetInsertCount() const { return m_nInsertCount; };
-sal_uIntPtr GetCurInsert() const { return m_nCurInsert; };
+size_t GetInsertCount() const { return m_nInsertCount; };
+size_t GetCurInsert() const { return m_nCurInsert; };
-void ReportRescales( sal_uIntPtr nRescaleCount );
+void ReportRescales( size_t nRescaleCount );
};
diff --git a/svx/source/dialog/swframeexample.cxx
b/svx/source/dialog/swframeexample.cxx
index 5c4fc1b..25d4d22 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -102,19 +102,19 @@ void
SvxSwFrameExample::InitAllRects_Impl(vcl::RenderContext& rRende
[Libreoffice-commits] core.git: include/tools tools/source
include/tools/zcodec.hxx | 23 +++
tools/source/zcodec/zcodec.cxx | 20 ++--
2 files changed, 21 insertions(+), 22 deletions(-)
New commits:
commit 08fc0da4033b8ea2b3ae67aa06175e839771396b
Author: tymyjan
Date: Sat Jun 4 23:54:47 2016 +0200
tdf#75280 Cleaning up of sal_uIntPtr usage #1a
Change-Id: Ief2cc6ab03316c2530d386d662db21ca1c9ddb30
Reviewed-on: https://gerrit.libreoffice.org/25898
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index 0238115..7cce2a4 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -40,13 +40,13 @@ class TOOLS_DLLPUBLIC ZCodec
boolmbStatus;
boolmbFinish;
sal_uInt8* mpInBuf;
-sal_uIntPtr mnInBufSize;
-sal_uIntPtr mnInToRead;
+size_t mnInBufSize;
+size_t mnInToRead;
SvStream* mpOStm;
sal_uInt8* mpOutBuf;
-sal_uIntPtr mnOutBufSize;
+size_t mnOutBufSize;
-sal_uIntPtr mnCRC;
+sal_uInt32 mnCRC;
int mnCompressLevel;
boolmbUpdateCrc;
boolmbGzLib;
@@ -55,7 +55,6 @@ class TOOLS_DLLPUBLIC ZCodec
voidInitCompress();
voidInitDecompress(SvStream & inStream);
voidImplWriteBack();
-
voidUpdateCRC( sal_uInt8* pSource, long nDatSize );
public:
@@ -69,14 +68,14 @@ public:
longDecompress( SvStream& rIStm, SvStream& rOStm );
boolAttemptDecompression( SvStream& rIStm, SvStream& rOStm );
-voidWrite( SvStream& rOStm, const sal_uInt8* pData,
sal_uIntPtr nSize );
-longRead( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize
);
-longReadAsynchron( SvStream& rIStm, sal_uInt8* pData,
sal_uIntPtr nSize );
+voidWrite( SvStream& rOStm, const sal_uInt8* pData, sal_uInt32
nSize );
+longRead( SvStream& rIStm, sal_uInt8* pData, sal_uInt32 nSize
);
+longReadAsynchron( SvStream& rIStm, sal_uInt8* pData,
sal_uInt32 nSize );
-voidSetBreak( sal_uIntPtr );
-sal_uIntPtr GetBreak();
-voidSetCRC( sal_uIntPtr nCurrentCRC );
-sal_uIntPtr GetCRC() { return mnCRC;}
+voidSetBreak( size_t );
+size_t GetBreak();
+voidSetCRC( sal_uInt32 nCurrentCRC );
+sal_uInt32 GetCRC() { return mnCRC;}
};
#endif
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index e841888..839ef4c 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -134,7 +134,7 @@ void ZCodec::Compress( SvStream& rIStm, SvStream& rOStm )
long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
{
int err;
-sal_uIntPtr nInToRead;
+size_t nInToRead;
longnOldTotal_Out = PZSTREAM->total_out;
assert(meState == STATE_INIT);
@@ -169,7 +169,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
return ( mbStatus ) ? (long)(PZSTREAM->total_out - nOldTotal_Out) : -1;
}
-void ZCodec::Write( SvStream& rOStm, const sal_uInt8* pData, sal_uIntPtr nSize
)
+void ZCodec::Write( SvStream& rOStm, const sal_uInt8* pData, sal_uInt32 nSize )
{
if (meState == STATE_INIT)
{
@@ -194,10 +194,10 @@ void ZCodec::Write( SvStream& rOStm, const sal_uInt8*
pData, sal_uIntPtr nSize )
}
}
-long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize )
+long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, sal_uInt32 nSize )
{
int err;
-sal_uIntPtr nInToRead;
+size_t nInToRead;
if ( mbFinish )
return 0; // PZSTREAM->total_out;
@@ -238,10 +238,10 @@ long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData,
sal_uIntPtr nSize )
return (mbStatus ? (long)(nSize - PZSTREAM->avail_out) : -1);
}
-long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr
nSize )
+long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* pData, sal_uInt32
nSize )
{
int err = 0;
-sal_uIntPtr nInToRead;
+size_t nInToRead;
if ( mbFinish )
return 0; // PZSTREAM->total_out;
@@ -258,7 +258,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8*
pData, sal_uIntPtr nSize
{
nInToRead = (mnInBufSize > mnInToRead) ? mnInToRead : mnInBufSize;
-sal_uInt64 const nRemaining = rIStm.remainingSize();
+sal_uInt32 const nRemaining = rIStm.remainingSize();
if (nRemaining < nInToRead)
{
rIStm.SetError( ERRCODE_IO_PENDING );
@@ -305,17 +305,17 @@ void ZCodec::ImplWriteBack()
}
}
-void ZCodec::SetBreak( sal_uIntPtr nInToR
[Libreoffice-commits] core.git: cppu/source framework/inc
cppu/source/uno/lbmap.cxx |2 +-
framework/inc/uifactory/configurationaccessfactorymanager.hxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3acbc64869877868d30f7e1b8e5254282aed27f7
Author: tymyjan
Date: Fri Apr 29 21:51:16 2016 +0200
tdf#97499 Fixed containers parameters clearing #8
Change-Id: I82ca89ac483e9742be0d38a3c6882a240c7c38d8
Reviewed-on: https://gerrit.libreoffice.org/24499
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 8a87c7f..e5c3568 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -129,7 +129,7 @@ struct FctPtrHash : public std::unary_function< uno_Mapping
*, size_t >
typedef std::unordered_map<
OUString, MappingEntry *, OUStringHash > t_OUString2Entry;
typedef std::unordered_map<
-uno_Mapping *, MappingEntry *, FctPtrHash, equal_to< uno_Mapping * > >
t_Mapping2Entry;
+uno_Mapping *, MappingEntry *, FctPtrHash > t_Mapping2Entry;
typedef set< uno_getMappingFunc > t_CallbackSet;
typedef set< OUString > t_OUStringSet;
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index 24e6127..917d3d4 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -59,8 +59,8 @@ namespace framework {
private:
class FactoryManagerMap : public std::unordered_map >
+OUStringHash
+>
{
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: stoc/source
stoc/source/invocation_adapterfactory/iafactory.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8e4ee4bc68be0fd75636466864b3f6e2716b2748
Author: tymyjan
Date: Sat Apr 30 16:20:31 2016 +0200
tdf#97499 Fixed containers parameters clearing #9
Change-Id: I097106e1887be283320fc518ddafda76608b46ee
Reviewed-on: https://gerrit.libreoffice.org/24521
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 8c57f65..d66afab 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -75,8 +75,8 @@ struct hash_ptr
inline size_t operator() ( void * p ) const
{ return reinterpret_cast(p); }
};
-typedef std::unordered_set< void *, hash_ptr, equal_to< void * > > t_ptr_set;
-typedef std::unordered_map< void *, t_ptr_set, hash_ptr, equal_to< void * > >
t_ptr_map;
+typedef std::unordered_set< void *, hash_ptr > t_ptr_set;
+typedef std::unordered_map< void *, t_ptr_set, hash_ptr > t_ptr_map;
class FactoryImpl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 12694155608762056d5cbf0f89dd1675a7aefb45 Author: tymyjan Date: Wed Apr 27 21:09:28 2016 +0200 tdf#97499 Fixed containers parameters clearing #7 Change-Id: Ieb9ab0f9c011a24ba329cfb063e3d7733dd1afcb Reviewed-on: https://gerrit.libreoffice.org/24440 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index f16e0d4..9d8056d 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -309,7 +309,7 @@ static inline OUString toRTTIname( //RTTI simulation -typedef std::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap; +typedef std::unordered_map< OUString, void *, OUStringHash > t_string2PtrMap; class __type_info_descriptor; class RTTInfos ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/msvc_win32_intel/except.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6dbcebab6d6b82bed03dae2aedf774b7a4e9841e
Author: tymyjan
Date: Wed Apr 27 19:06:00 2016 +0200
tdf#97499 Fixed containers parameters clearing #6
Change-Id: I89ad45eacfffd3783687b158a45f3eda0b95dece
Reviewed-on: https://gerrit.libreoffice.org/24433
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index ec40be7..f8c4ff6 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -83,7 +83,7 @@ static inline OUString toRTTIname( OUString const & rUNOname
) throw ()
// RTTI simulation
#
-typedef std::unordered_map< OUString, void *, OUStringHash, equal_to< OUString
> > t_string2PtrMap;
+typedef std::unordered_map< OUString, void *, OUStringHash > t_string2PtrMap;
class RTTInfos
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc
sc/inc/dpgroup.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e2e35d56abc29f86b5f77e195a06a93caa3c60b0
Author: tymyjan
Date: Tue Apr 12 20:04:58 2016 +0200
tdf#97499 Fixed containers parameters clearing #5
Change-Id: If9868734b255605f2376c30e66ca144e6fd8b803
Reviewed-on: https://gerrit.libreoffice.org/24034
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 5ef91a5..07b25a7 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -119,7 +119,7 @@ public:
class ScDPGroupTableData : public ScDPTableData
{
-typedef std::unordered_set< OUString, OUStringHash, ::std::equal_to<
OUString > > StringHashSet;
+typedef std::unordered_set< OUString, OUStringHash > StringHashSet;
std::shared_ptr pSourceData;
longnSourceCount;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc basic/source connectivity/source cppu/source cui/source extensions/source framework/inc framework/source include/comphelper include/formula include/sv
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx |3 +--
basic/source/classes/sb.cxx |2 +-
basic/source/inc/sbunoobj.hxx|2 +-
connectivity/source/drivers/postgresql/pq_connection.hxx |4
+---
connectivity/source/drivers/postgresql/pq_tools.hxx |4
+---
connectivity/source/drivers/postgresql/pq_xcontainer.hxx |3 +--
cppu/source/uno/lbenv.cxx|3 +--
cui/source/customize/cfg.cxx |6
+++---
cui/source/inc/scriptdlg.hxx |2 +-
extensions/source/bibliography/framectr.cxx |2 +-
framework/inc/uielement/menubarmanager.hxx |2 +-
framework/inc/xml/toolboxdocumenthandler.hxx |3 +--
framework/source/fwe/classes/addonsoptions.cxx |6
+++---
framework/source/inc/accelerators/storageholder.hxx |3 +--
framework/source/services/tabwindowservice.cxx |3 +--
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx|4
++--
framework/source/uiconfiguration/uicategorydescription.cxx |3 +--
framework/source/uiconfiguration/uiconfigurationmanager.cxx |4
++--
framework/source/uiconfiguration/windowstateconfiguration.cxx|9
+++--
framework/source/uielement/controlmenucontroller.cxx |3 +--
framework/source/uielement/toolbarsmenucontroller.cxx|2 +-
framework/source/uielement/uicommanddescription.cxx |3 +--
include/comphelper/sequenceashashmap.hxx |3 +--
include/formula/FormulaCompiler.hxx |4
++--
include/svtools/toolboxcontroller.hxx|3 +--
sal/rtl/bootstrap.cxx|2 +-
sax/source/fastparser/fastparser.cxx |2 +-
sc/source/core/tool/formulaparserpool.cxx|2 +-
sc/source/filter/excel/excimp8.cxx |3 +--
sc/source/ui/vba/vbawindow.cxx |3 +--
sc/source/ui/vba/vbawindows.cxx |3 +--
scripting/source/provider/BrowseNodeFactoryImpl.cxx |2 +-
scripting/source/vbaevents/eventhelper.cxx |6
++
svgio/source/svgreader/svgtoken.cxx |2 +-
svgio/source/svgreader/svgtools.cxx |4
+---
sw/source/core/access/accpara.hxx|3 +--
sw/source/ui/vba/vbadocumentproperties.cxx |2 +-
toolkit/source/controls/dialogcontrol.cxx|3 +--
unotools/source/config/eventcfg.cxx |2 +-
vbahelper/source/msforms/vbacontrols.cxx |3 +--
vbahelper/source/vbahelper/vbaapplicationbase.cxx|2 +-
vbahelper/source/vbahelper/vbadocumentsbase.cxx |3 +--
42 files changed, 52 insertions(+), 81 deletions(-)
New commits:
commit c20cc7e79b3b3d8bcf9136bfdc2bab6dd6a4be06
Author: tymyjan
Date: Sun Apr 3 17:42:53 2016 +0200
tdf#97499 Fixed containers parameters clearing #4
Change-Id: I7c96181399f4d7e62d4aceca404b22d68f903513
Reviewed-on: https://gerrit.libreoffice.org/23754
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git
a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 01e8e3c..ace9adc 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -384,8 +384,7 @@ private:
typedef std::unordered_map< OUString,
css::beans::PropertyValue,
- OUStringHash,
- ::std::equal_to< OUString > > tPropValMap;
+ OUStringHash > tPropValMap;
class Document: public ::VCLXAccessibleComponent, public ::SfxListener
{
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 40d1bc4..7e4323a 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1148,7 +1148,7 @@ struct ClassModuleRunInitItem
// to allow forward declaration in sbmod.hxx
class ModuleInitDependencyMap : public
std::unordered_map< OUString, ClassModuleRunInitItem,
- OUStringHash, ::std::equal_to< OUString > >
+
[Libreoffice-commits] core.git: desktop/source filter/source framework/inc framework/source include/osl include/svtools include/vcl pyuno/source sc/inc scripting/source sc/source sfx2/source svgio/inc
desktop/source/migration/migration_impl.hxx |2 +-
filter/source/config/cache/cacheitem.hxx |6 ++
filter/source/config/cache/querytokenizer.hxx|3 +--
framework/inc/classes/filtercachedata.hxx|6 ++
framework/inc/stdtypes.h |3 +--
framework/inc/uiconfiguration/imagetype.hxx |6 ++
framework/inc/uielement/uicommanddescription.hxx |6 ++
framework/inc/uifactory/factoryconfiguration.hxx |3 +--
framework/inc/xml/imagesdocumenthandler.hxx |3 +--
framework/inc/xml/statusbardocumenthandler.hxx |3 +--
framework/source/inc/accelerators/keymapping.hxx |3 +--
framework/source/uiconfiguration/imagemanagerimpl.hxx|3 +--
framework/source/uiconfiguration/moduleuicfgsupplier.cxx |2 +-
include/osl/diagnose.hxx |2 +-
include/svtools/framestatuslistener.hxx |3 +--
include/svtools/statusbarcontroller.hxx |3 +--
include/vcl/CommandImageResolver.hxx |2 +-
pyuno/source/module/pyuno_impl.hxx | 11 ---
sc/inc/formulaparserpool.hxx |3 +--
sc/inc/lookupcache.hxx |4 ++--
sc/inc/macromgr.hxx |2 +-
sc/source/ui/view/dbfunc3.cxx|2 +-
scripting/source/dlgprov/dlgevtatt.hxx |3 +--
scripting/source/provider/ActiveMSPList.hxx |2 +-
scripting/source/provider/ProviderCache.hxx |3 +--
sfx2/source/appl/imagemgr.cxx|3 +--
svgio/inc/svgio/svgreader/svgdocument.hxx|5 ++---
svx/source/table/propertyset.hxx |2 +-
sw/source/core/doc/swstylemanager.cxx|3 +--
unotools/source/config/optionsdlg.cxx|2 +-
30 files changed, 39 insertions(+), 65 deletions(-)
New commits:
commit bfb9612226314cd037c8eda30cc6ebbb46dc8512
Author: tymyjan
Date: Sun Apr 3 15:53:23 2016 +0200
tdf#97499 Fixed containers parameters clearing #3
Change-Id: I1c105de7e1df251533179fba77e3797ef1c4e2d4
Reviewed-on: https://gerrit.libreoffice.org/23752
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/source/migration/migration_impl.hxx
b/desktop/source/migration/migration_impl.hxx
index 329414af1..95e63d0 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -135,7 +135,7 @@ struct MigrationItem
};
typedef std::unordered_map< OUString, std::vector< MigrationItem >,
-OUStringHash, std::equal_to< OUString > >
MigrationHashMap;
+OUStringHash > MigrationHashMap;
/**
information for the UI elements to be migrated for one module
diff --git a/filter/source/config/cache/cacheitem.hxx
b/filter/source/config/cache/cacheitem.hxx
index e890f3a..4e66650 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -150,8 +150,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
*/
typedef std::unordered_map< OUString,
CacheItem ,
-OUStringHash,
-std::equal_to< OUString > > CacheItemList;
+OUStringHash > CacheItemList;
/** @short supports registration of multiple key to
@@ -168,8 +167,7 @@ typedef std::unordered_map< OUString,
*/
typedef std::unordered_map< OUString,
OUStringList ,
-OUStringHash,
-std::equal_to< OUString > > CacheItemRegistration;
+OUStringHash > CacheItemRegistration;
/** @short is used to collect all matching types of an URL
diff --git a/filter/source/config/cache/querytokenizer.hxx
b/filter/source/config/cache/querytokenizer.hxx
index 9a25efa..42f2574 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -47,8 +47,7 @@ namespace filter{
*/
class QueryTokenizer : public std::unordered_map< OUString,
OUString,
- OUStringHash,
- std::equal_to< OUString > >
+ OUStringHash >
{
// member
diff --git
[Libreoffice-commits] core.git: basic/source connectivity/source cui/source
basic/source/classes/sbunoobj.cxx |2 +-
basic/source/inc/scriptcont.hxx |2 +-
connectivity/source/drivers/postgresql/pq_statics.hxx |3 +--
cui/source/inc/macropg.hxx|2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 362ab03eb276fd7cf73a6882faa4e4f14fcab2a4
Author: tymyjan
Date: Sun Apr 3 14:41:58 2016 +0200
tdf#97499 Fixed containers parameters clearing #2
Change-Id: I2e77c3b33ae3b8a49a7890cac77be566391972f2
Reviewed-on: https://gerrit.libreoffice.org/23751
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index e98b0d0..610622c 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3269,7 +3269,7 @@ Reference< XTypeDescriptionEnumeration >
getTypeDescriptorEnumeration( const OUS
return xEnum;
}
-typedef std::unordered_map< OUString, Any, OUStringHash, ::std::equal_to<
OUString > > VBAConstantsHash;
+typedef std::unordered_map< OUString, Any, OUStringHash > VBAConstantsHash;
VBAConstantHelper&
VBAConstantHelper::instance()
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index ef93b4a..0411527 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -120,7 +120,7 @@ public:
};
-typedef std::unordered_map< OUString, css::script::ModuleInfo, OUStringHash,
::std::equal_to< OUString > > ModuleInfoMap;
+typedef std::unordered_map< OUString, css::script::ModuleInfo, OUStringHash >
ModuleInfoMap;
typedef ::cppu::ImplHelper1< css::script::vba::XVBAModuleInfo >
SfxScriptLibrary_BASE;
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx
b/connectivity/source/drivers/postgresql/pq_statics.hxx
index 3592502..afc2a56 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -92,8 +92,7 @@ typedef std::unordered_map
<
OUString,
sal_Int32,
- OUStringHash,
- ::std::equal_to< OUString >
+ OUStringHash
> BaseTypeMap;
struct ImplementationStatics
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 74eb46e..5036d4b 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -36,7 +36,7 @@
class SvTreeListBox;
typedef std::unordered_map< OUString, std::pair< OUString, OUString >,
-OUStringHash, std::equal_to< OUString > >
EventsHash;
+OUStringHash > EventsHash;
struct EventDisplayName
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
