[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/wrtw8esh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0d5167915b47df7c3e450614ea50d845ba959df3
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Jan 21 09:30:05 2012 +0100
Fix Possible inefficient checking for 'aChrSetArr' emptiness
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 3d3cc83..86e9a4a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -888,7 +888,7 @@ void MSWord_SdrAttrIter::NextPara( sal_uInt16 nPar )
rtl_TextEncoding MSWord_SdrAttrIter::GetNextCharSet() const
{
-if( aChrSetArr.size() )
+if( !aChrSetArr.empty() )
return (rtl_TextEncoding)aChrSetArr[ aChrSetArr.size() - 1 ];
return eNdChrSet;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw
binfilter/bf_sc/source/core/data/sc_documen2.cxx |2 +-
binfilter/bf_sc/source/core/data/sc_document.cxx |2 +-
binfilter/bf_sc/source/core/tool/sc_autoform.cxx |2 +-
binfilter/bf_sch/source/core/sch_chtmode2.cxx|2 +-
binfilter/bf_sch/source/core/sch_memchrt.cxx |6 ++
binfilter/bf_sd/source/core/sd_anminfo.cxx |2 +-
binfilter/bf_sd/source/core/sd_cusshow.cxx |4 ++--
binfilter/bf_sd/source/core/sd_drawdoc.cxx |4 ++--
binfilter/bf_sd/source/core/sd_sdpage2.cxx |4 ++--
binfilter/bf_sfx2/source/doc/sfx2_interno.cxx|4 ++--
binfilter/bf_so3/source/data/pseudo.cxx | 11 ---
binfilter/bf_so3/source/inplace/client.cxx |6 ++
binfilter/bf_so3/source/inplace/embobj.cxx |9 ++---
binfilter/bf_so3/source/inplace/ipclient.cxx | 10 ++
binfilter/bf_so3/source/inplace/ipobj.cxx| 10 ++
binfilter/bf_so3/source/misc/iface.cxx |8 ++--
binfilter/bf_so3/source/persist/persist.cxx | 12
binfilter/bf_so3/source/persist/svstor.cxx | 17 -
binfilter/bf_svtools/source/items/svt_style.cxx |6 ++
binfilter/bf_svx/source/editeng/svx_editobj.cxx |2 +-
binfilter/bf_svx/source/items/svx_bulitem.cxx|2 +-
binfilter/bf_svx/source/items/svx_textitem.cxx |2 +-
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 16
binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx |2 +-
binfilter/bf_svx/source/svdraw/svx_svdview.cxx |4 ++--
binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx |3 +--
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx |9 +++--
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx |6 ++
binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx |5 ++---
29 files changed, 61 insertions(+), 111 deletions(-)
New commits:
commit 258ba2fb484d5e1bb4a3aca3991b3b66ea915a10
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Jan 21 15:29:29 2012 +0100
Removed some unused parameters.
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index 14b4809..930e0a3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -580,7 +580,7 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
/*N*/ rStream cGUI cSet;
/*N*/ eSrcSet = (CharSet) cSet;
/*N*/ rStream.SetStreamCharSet(
::GetSOLoadTextEncoding(
-/*N*/ eSrcSet, (USHORT)rStream.GetVersion() ) );
+/*N*/ eSrcSet ) );
/*N*/ }
/*N*/ break;
/*?*/ case SCID_LINKUPMODE: //Link Update Mode
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 1f00d00..26187a7 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -2428,7 +2428,7 @@ namespace binfilter {
/*N*/ rStream cGUI cSet;
/*N*/ eSrcSet = (CharSet) cSet;
/*N*/ rStream.SetStreamCharSet(
::GetSOLoadTextEncoding(
-/*N*/ eSrcSet, (USHORT)rStream.GetVersion() ) );
+/*N*/ eSrcSet ) );
/*N*/ }
/*N*/ break;
/*N*/ case SCID_DOCPOOL:
diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
index e911df3..1dbc3b6 100644
--- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
@@ -653,7 +653,7 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ DBG_ERRORFILE( Der Header enthaelt mehr/neuere Daten
);
/*N*/ rStream.Seek( nPos + nCnt );
/*N*/ }
-/*N*/ rStream.SetStreamCharSet( GetSOLoadTextEncoding(
nChrSet, nFileVers ) );
+/*N*/ rStream.SetStreamCharSet( GetSOLoadTextEncoding( nChrSet
) );
/*N*/ rStream.SetVersion( nFileVers );
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index 1de45ba..2a7aef4 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -1150,7 +1150,7 @@ enum ChartStyleV0
/*N*/
/*N*/ // aInfo is a member of SdrModel
/*N*/ // the SdrModel was read before this, so the value is set
-/*N*/ rtl_TextEncoding eSysSet = ::GetSOLoadTextEncoding(
aInfo.eLastReadCharSet, rIn.GetVersion());
+/*N*/ rtl_TextEncoding eSysSet = ::GetSOLoadTextEncoding(
aInfo.eLastReadCharSet );
/*N*/ rIn.SetStreamCharSet( eSysSet );
/*N*/ // Note: The CharSet is stored in
[Libreoffice-commits] .: sw/source
sw/source/core/inc/swcache.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c76d098cd840c3bf830f04aecc879521b844098d Author: Stephan Bergmann sberg...@redhat.com Date: Sat Jan 21 17:51:19 2012 +0100 Fix non-DBG_UTIL case. diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index aba30d1..63995ea 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -108,7 +108,7 @@ public: SwCache( const sal_uInt16 nInitSize, const rtl::OString rNm ); ~SwCache(); #else -SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize ); +SwCache( const sal_uInt16 nInitSize ); #endif void Flush( const sal_uInt8 nPercent = 100 ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/source
tools/source/fsys/dirent.cxx |4 ++--
tools/source/fsys/wntmsc.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f433d5a9b8379f5207df92d80ce7dede9d9795d8
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Jan 21 17:57:10 2012 +0100
Fix Windows.
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index df3f163..a0d3d8e 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1529,9 +1529,9 @@ DirEntry DirEntry::GetDevice() const
if ( ( pTop-eFlag == FSYS_FLAG_ABSROOT || pTop-eFlag ==
FSYS_FLAG_RELROOT )
!pTop-aName.isEmpty() )
-return DirEntry( pTop-aName, FSYS_FLAG_VOLUME,
FSYS_STYLE_HOST );
+return DirEntry( pTop-aName, FSYS_FLAG_VOLUME );
else
-return DirEntry( rtl::OString(), FSYS_FLAG_INVALID,
FSYS_STYLE_HOST );
+return DirEntry( rtl::OString(), FSYS_FLAG_INVALID );
}
#endif
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index 9878480..361474d 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -315,13 +315,13 @@ USHORT DirReader_Impl::Read()
DirEntry *pTemp = new DirEntry( rtl::OString(pDosEntry-d_name),
eFlag );
#ifdef FEAT_FSYS_DOUBLESPEED
-pTemp-ImpSetStat( new FileStat( (void*) pDosDir, (void*) 0 ) );
+pTemp-ImpSetStat( new FileStat( (void*) pDosDir ) );
#endif
if ( pParent )
pTemp-ImpChangeParent( new DirEntry( *pParent ), sal_False );
if ( pDir-pStatLst ) //Status fuer Sort gewuenscht?
{
-FileStat *pNewStat = new FileStat( (void*) pDosDir, (void*) 0
);
+FileStat *pNewStat = new FileStat( (void*) pDosDir );
pDir-ImpSortedInsert( pTemp, pNewStat );
}
else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_old_test_file.mk sal/CppunitTest_sal_tcwf.mk sal/Module_sal.mk tools/inc
sal/CppunitTest_sal_osl_file.mk | 24 -- sal/CppunitTest_sal_osl_old_test_file.mk | 40 +++ sal/CppunitTest_sal_tcwf.mk | 40 +++ sal/Module_sal.mk|2 + tools/inc/tools/fsys.hxx |8 +++--- 5 files changed, 86 insertions(+), 28 deletions(-) New commits: commit 22815db58f554cd64ec3a625b81175bf5d93f91c Author: Michael Meeks michael.me...@suse.com Date: Sat Jan 21 11:39:07 2012 + sal: only allowed one unit-test per gnumakefile, so separate these diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index 464a153..d118f25 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -37,28 +37,4 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_file,\ $(gb_STDLIBS) \ )) -# sal_osl_old_test_file -$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_old_test_file)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\ -sal/qa/osl/file/osl_old_test_file \ -)) - -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_old_test_file,\ -sal \ -$(gb_STDLIBS) \ -)) - -# sal_tcwf -$(eval $(call gb_CppunitTest_CppunitTest,sal_tcwf)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\ -sal/qa/osl/file/test_cpy_wrt_file \ -)) - -$(eval $(call gb_CppunitTest_add_linked_libs,sal_tcwf,\ -sal \ -$(gb_STDLIBS) \ -)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk new file mode 100644 index 000..30a561e --- /dev/null +++ b/sal/CppunitTest_sal_osl_old_test_file.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2011 Matúš Kukan matus.ku...@gmail.com (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +# sal_osl_old_test_file +$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_old_test_file)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\ +sal/qa/osl/file/osl_old_test_file \ +)) + +$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_old_test_file,\ +sal \ +$(gb_STDLIBS) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk new file mode 100644 index 000..8dfe9ff --- /dev/null +++ b/sal/CppunitTest_sal_tcwf.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2011 Matúš Kukan matus.ku...@gmail.com (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +# sal_tcwf +$(eval $(call gb_CppunitTest_CppunitTest,sal_tcwf)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\ +sal/qa/osl/file/test_cpy_wrt_file \ +)) + +$(eval $(call gb_CppunitTest_add_linked_libs,sal_tcwf,\ +sal \ +$(gb_STDLIBS) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 92950ac..6d7d2c6 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -48,6
[Libreoffice-commits] .: 2 commits - Repository.mk sal/CppunitTest_Module_DLL.mk sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_module.mk sal/CppunitTest_sal_osl_old_test_file.mk sal/CppunitT
Repository.mk|1 sal/CppunitTest_Module_DLL.mk| 42 ++ sal/CppunitTest_sal_osl_file.mk |1 sal/CppunitTest_sal_osl_module.mk| 13 --- sal/CppunitTest_sal_osl_old_test_file.mk |1 sal/CppunitTest_sal_osl_process.mk | 13 --- sal/CppunitTest_sal_osl_thread.mk| 39 + sal/Executable_osl_process_child.mk | 57 +++ sal/Module_sal.mk| 17 ++--- sal/qa/osl/module/osl_Module.cxx |4 +- sal/qa/osl/process/osl_process.cxx |5 +- 11 files changed, 155 insertions(+), 38 deletions(-) New commits: commit 67cf29bb36587f03ec19c789657da4236553c5fd Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jan 21 18:51:16 2012 +0100 sal: make more tests running diff --git a/Repository.mk b/Repository.mk index c9a8dfb..2f54f98 100644 --- a/Repository.mk +++ b/Repository.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ gendict \ genindex_data \ mkunroll \ +osl_process_child \ rsc \ rscdep \ saxparser \ diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk new file mode 100644 index 000..048bd2b --- /dev/null +++ b/sal/CppunitTest_Module_DLL.mk @@ -0,0 +1,42 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2011 Matúš Kukan matus.ku...@gmail.com (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +# This is not really a test. Only a dynamic library which is loaded by +# sal_osl_module unit test library. + +$(eval $(call gb_CppunitTest_CppunitTest,Module_DLL)) + +$(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\ +sal/qa/osl/module/osl_Module_DLL \ +)) + +$(eval $(call gb_CppunitTest_add_linked_libs,Module_DLL,\ +sal \ +$(gb_STDLIBS) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_module_dll.mk b/sal/CppunitTest_sal_osl_module_dll.mk deleted file mode 100644 index ca3d559..000 --- a/sal/CppunitTest_sal_osl_module_dll.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan matus.ku...@gmail.com (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the GPLv3+), or -# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_module_dll)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module_dll,\ -sal/qa/osl/module/osl_Module_DLL \ -)) - -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_module_dll,\ -sal \ -$(gb_STDLIBS) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk new file mode 100644 index 000..c6fa16e --- /dev/null +++ b/sal/Executable_osl_process_child.mk @@ -0,0 +1,57 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the
[Libreoffice-commits] .: 6 commits - animations/source basegfx/inc basegfx/source chart2/source connectivity/source cui/source drawinglayer/source oox/inc oox/source padmin/source sc/source svtools/bm
animations/source/animcore/animcore.cxx |2 -
basegfx/inc/basegfx/curve/b2dbeziertools.hxx|2 -
basegfx/source/polygon/b2dpolygoncutandtouch.cxx| 10 ++---
basegfx/source/polygon/b2dpolygontriangulator.cxx |2 -
basegfx/source/polygon/b2dtrapezoid.cxx |2 -
basegfx/source/raster/rasterconvert3d.cxx |4 +-
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |2 -
chart2/source/model/template/PieChartTypeTemplate.cxx |2 -
connectivity/source/drivers/mozab/MPreparedStatement.cxx|2 -
cui/source/dialogs/SpellDialog.cxx |4 +-
cui/source/dialogs/cuigaldlg.cxx|4 +-
drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx |6 +--
drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx |2 -
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx |2 -
drawinglayer/source/primitive3d/sdrprimitive3d.cxx |2 -
drawinglayer/source/processor2d/canvasprocessor.cxx |2 -
drawinglayer/source/processor2d/vclhelpergradient.cxx |6 +--
drawinglayer/source/processor2d/vclprocessor2d.cxx |2 -
oox/inc/oox/export/chartexport.hxx |7 ---
oox/inc/oox/export/shapes.hxx |3 -
oox/source/export/chartexport.cxx | 16
oox/source/export/shapes.cxx| 11 --
padmin/source/newppdlg.cxx |2 -
sc/source/filter/xml/xmlexprt.cxx |8 ++--
svtools/bmpmaker/bmpcore.cxx|2 -
svtools/source/filter/wmf/winmtf.cxx|2 -
svx/source/engine3d/helperhittest3d.cxx |2 -
svx/source/table/tablelayouter.cxx | 22
svx/source/table/tablelayouter.hxx |3 -
sw/source/core/docnode/ndtbl.cxx|2 -
sw/source/core/unocore/unoportenum.cxx |4 +-
sw/source/ui/uiview/viewmdi.cxx |2 -
unusedcode.easy | 11 --
vcl/generic/print/printerjob.cxx| 19 --
vcl/inc/generic/printerjob.hxx |4 --
35 files changed, 43 insertions(+), 135 deletions(-)
New commits:
commit 22da27d9ddcdacaef21d667b0777052b7e817b9a
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Jan 21 19:57:19 2012 +0100
Improve checking for emptiness
diff --git a/animations/source/animcore/animcore.cxx
b/animations/source/animcore/animcore.cxx
index 9a837f6..e85b806 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -1178,7 +1178,7 @@ Reference XCloneable SAL_CALL
AnimationNode::createClone() throw (RuntimeExce
{
xNewNode = new AnimationNode( *this );
-if( maChildren.size() )
+if( !maChildren.empty() )
{
Reference XTimeContainer xContainer( xNewNode, UNO_QUERY );
if( xContainer.is() )
diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
index 2279cb9..821cc33 100644
--- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
+++ b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
@@ -54,7 +54,7 @@ namespace basegfx
public:
B2DCubicBezierHelper(const B2DCubicBezier rBase, sal_uInt32
nDivisions = 9);
-double getLength() const { if(maLengthArray.size()) return
maLengthArray[maLengthArray.size() - 1]; else return 0.0; }
+double getLength() const { if(!maLengthArray.empty()) return
maLengthArray[maLengthArray.size() - 1]; else return 0.0; }
double distanceToRelative(double fDistance) const;
};
} // end of namespace basegfx
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 011ecff..d4d075b 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -437,7 +437,7 @@ namespace basegfx
// #i76891# using findCuts recursively is not sufficient here
findCutsAndTouchesAndCommonForBezier(aTempPolygonA,
aTempPolygonEdge, aTempPointVectorA, aTempPointVectorEdge);
-if(aTempPointVectorA.size())
+if(!aTempPointVectorA.empty())
{
// adapt tempVector entries to segment
adaptAndTransferCutsWithBezierSegment(aTempPointVectorA,
aTempPolygonA, nIndA, rTempPointsA);
@@ -479,13 +479,13 @@ namespace basegfx
// #i76891# using findCuts recursively is not sufficient here
findCutsAndTouchesAndCommonForBezier(aTempPolygonA, aTempPolygonB,
[Libreoffice-commits] .: sal/qa
sal/qa/osl/file/osl_File.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit e981b4271089607d6086ce965505020fe17b519f Author: Michael Meeks michael.me...@suse.com Date: Sat Jan 21 20:53:01 2012 + sal: re-disable file based unit tests that don't pass diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 6d885c4..a41c761 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -4807,14 +4807,14 @@ namespace osl_File CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::read, osl_File ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::write, osl_File ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::readLine, osl_File ); -// FIXME: disabled these tests for now ... they seem not to pass ... -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::copy, osl_File ); -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::move, osl_File ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::copy, osl_File ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::move, osl_File ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::remove, osl_File ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::setAttributes, osl_File ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::setTime, osl_File ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::sync, osl_File ); -CPPUNIT_REGISTRY_ADD_TO_DEFAULT( osl_File ); +// FIXME: to enable these tests (when they work cross-platform) we need to add the below: +//CPPUNIT_REGISTRY_ADD_TO_DEFAULT( osl_File ); }// namespace osl_File ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: openssl/makefile.mk
openssl/makefile.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 926822b241e6c8037fbda650667637d83b2b7cc0 Author: Michael Meeks michael.me...@suse.com Date: Sat Jan 21 21:40:29 2012 + android: don't add -I/usr/include to the compile line - urk diff --git a/openssl/makefile.mk b/openssl/makefile.mk index f537838..dcbf04e 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -53,7 +53,12 @@ TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4 CONFIGURE_DIR=. CONFIGURE_ACTION=config +.IF $(OS) == ANDROID +CONFIGURE_FLAGS=shared no-idea +.ELSE +# explicitly including /usr/include seems hyper-broken anyway but ... CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared no-idea +.ENDIF BUILD_DIR=. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/RowSetCache.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b026e5a4a17babd43cac266b06ad49e12f9aa225
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sun Jan 22 01:35:58 2012 +0100
ORowSetCache::fillMatrix(): correct off-by-one error
Symptom: segfault.
Thanks to Julien Nabet for precise pointer to problematic code.
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index bcc8652..87655f4 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -760,7 +760,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32
_nNewStartPos,sal_Int32 _nNewEndPos
if ( _nNewStartPos == -1 )
{
aIter = m_pMatrix-begin() + (m_nEndPos - m_nStartPos);
-i = m_nEndPos;
+i = m_nEndPos + 1;
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/dbui/dbtree.cxx | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
New commits:
commit 9a7d098aa92a4099aeb022798189c00c87258408
Author: August Sodora aug...@gmail.com
Date: Sat Jan 21 20:49:55 2012 -0500
SV_DECL_PTRARR_DEL-boost::ptr_vector
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 27faa2a..1ba0c18 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -57,6 +57,8 @@
#include unomid.h
+#include boost/ptr_container/ptr_vector.hpp
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
@@ -73,9 +75,7 @@ struct SwConnectionData
ReferenceXConnection xConnection;
};
-typedef SwConnectionData* SwConnectionDataPtr;
-SV_DECL_PTRARR_DEL( SwConnectionArr, SwConnectionDataPtr, 32 )
-SV_IMPL_PTRARR( SwConnectionArr, SwConnectionDataPtr )
+typedef boost::ptr_vectorSwConnectionData SwConnectionArr;
class SwDBTreeList_Impl : public cppu::WeakImplHelper1 XContainerListener
{
@@ -125,12 +125,11 @@ void SwDBTreeList_Impl::elementRemoved( const
ContainerEvent rEvent ) throw (Ru
SolarMutexGuard aGuard;
::rtl::OUString sSource;
rEvent.Accessor = sSource;
-for(sal_uInt16 i = 0; i aConnections.Count(); i++)
+for(SwConnectionArr::iterator i = aConnections.begin(); i !=
aConnections.end(); ++i)
{
-SwConnectionDataPtr pPtr = aConnections[i];
-if(pPtr-sSourceName == sSource)
+if(i-sSourceName == sSource)
{
-aConnections.DeleteAndDestroy(i);
+aConnections.erase(i);
break;
}
}
@@ -167,22 +166,21 @@ sal_Bool SwDBTreeList_Impl::HasContext()
ReferenceXConnection SwDBTreeList_Impl::GetConnection(const rtl::OUString
rSourceName)
{
-ReferenceXConnection xRet;
-for(sal_uInt16 i = 0; i aConnections.Count(); i++)
+ReferenceXConnection xRet;
+for(SwConnectionArr::const_iterator i = aConnections.begin(); i !=
aConnections.end(); ++i)
{
-SwConnectionDataPtr pPtr = aConnections[i];
-if(pPtr-sSourceName == rSourceName)
+if(i-sSourceName == rSourceName)
{
-xRet = pPtr-xConnection;
+xRet = i-xConnection;
break;
}
}
if(!xRet.is() xDBContext.is() pWrtSh)
{
-SwConnectionDataPtr pPtr = new SwConnectionData();
+SwConnectionData* pPtr = new SwConnectionData();
pPtr-sSourceName = rSourceName;
xRet = pWrtSh-GetNewDBMgr()-RegisterConnection(pPtr-sSourceName);
-aConnections.Insert(pPtr, aConnections.Count());
+aConnections.push_back(pPtr);
}
return xRet;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
