basic/inc/basic/sbx.hxx | 1 basic/inc/basic/sbxbase.hxx | 1 basic/source/classes/propacc.cxx | 1 cui/source/inc/cuisrchdlg.hxx | 1 editeng/source/editeng/eehtml.hxx | 2 filter/qa/cppunit/data/tiff/fail/BID-51132-1.tiff |binary fpicker/source/office/iodlg.cxx | 1 framework/inc/framework/eventsconfiguration.hxx | 1 framework/inc/framework/statusbarconfiguration.hxx | 1 framework/inc/framework/toolboxconfiguration.hxx | 1 framework/inc/xml/imagesconfiguration.hxx | 1 linguistic/source/convdiclist.hxx | 1 sc/inc/conditio.hxx | 1 sc/inc/detdata.hxx | 1 sc/inc/dispuno.hxx | 1 sc/inc/dptabres.hxx | 1 sc/inc/viewuno.hxx | 1 sc/source/core/inc/bcaslot.hxx | 1 sc/source/ui/inc/acredlin.hxx | 1 sfx2/inc/sfx2/appuno.hxx | 1 sfx2/inc/sfx2/frmdescr.hxx | 1 sfx2/inc/sfx2/msgpool.hxx | 1 sfx2/source/appl/linksrc.cxx | 1 starmath/inc/symbol.hxx | 1 svl/inc/svl/itempool.hxx | 1 svl/inc/svl/lstner.hxx | 1 svl/inc/svl/poolitem.hxx | 1 svl/inc/svl/svarray.hxx | 78 ------------------ svl/inc/svl/undo.hxx | 1 svtools/inc/svtools/svlbox.hxx | 1 svtools/inc/svtools/svxbox.hxx | 1 svtools/source/config/fontsubstconfig.cxx | 1 svtools/source/edit/textdat2.hxx | 1 svtools/source/edit/textdoc.hxx | 1 svtools/source/misc/itemdel.cxx | 1 svx/inc/svx/sdrpagewindow.hxx | 1 svx/source/inc/fmshimp.hxx | 1 sw/inc/dbmgr.hxx | 1 sw/inc/editsh.hxx | 1 sw/inc/flypos.hxx | 1 sw/inc/rubylist.hxx | 1 sw/inc/section.hxx | 1 sw/inc/sortopt.hxx | 2 sw/inc/tblafmt.hxx | 1 sw/inc/tox.hxx | 4 sw/inc/unoevtlstnr.hxx | 1 sw/inc/unotxdoc.hxx | 1 sw/inc/viewsh.hxx | 1 sw/source/core/doc/docsort.cxx | 90 +++++++++++---------- sw/source/core/doc/tblcpy.cxx | 10 +- sw/source/core/docnode/ndtbl.cxx | 4 sw/source/core/frmedt/tblsel.cxx | 4 sw/source/core/inc/docsort.hxx | 12 -- sw/source/core/inc/doctxm.hxx | 1 sw/source/core/inc/frame.hxx | 1 sw/source/core/inc/mvsave.hxx | 1 sw/source/core/inc/noteurl.hxx | 1 sw/source/core/inc/pagefrm.hxx | 2 sw/source/core/table/swnewtable.cxx | 22 ++--- sw/source/core/table/swtable.cxx | 2 sw/source/core/txtnode/ndhints.cxx | 4 sw/source/core/undo/untbl.cxx | 6 - sw/source/ui/inc/dbinsdlg.hxx | 1 sw/source/ui/inc/swlbox.hxx | 3 sw/source/ui/inc/uinums.hxx | 1 unotest/inc/unotest/filters-test.hxx | 4 unotest/source/cpp/filters-test.cxx | 1 unusedcode.easy | 5 - xmloff/source/core/i18nmap.cxx | 1 xmloff/source/core/xmlimp.cxx | 1 xmloff/source/core/xmltkmap.cxx | 1 xmloff/source/text/txtparae.cxx | 1 xmloff/source/text/txtparai.cxx | 1 xmloff/source/text/txtparaimphint.hxx | 1 74 files changed, 86 insertions(+), 224 deletions(-)
New commits: commit 8f2d9efa736a33d7812118e53eec130101d049b3 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Jul 30 10:42:13 2012 +0100 split foul SwSortElement::operator< into a keycompare method Change-Id: Iefbab73478dd417a45d0a3799d029708b8e892d5 diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index a76425d..88d791a 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -133,6 +133,44 @@ double SwSortElement::StrToDouble( const String& rStr ) const return nRet; } +int SwSortElement::keycompare(const SwSortElement& rCmp, sal_uInt16 nKey) const +{ + int nCmp = 0; + // The actual comparison + const SwSortElement *pOrig, *pCmp; + + const SwSortKey* pSrtKey = pOptions->aKeys[ nKey ]; + if( pSrtKey->eSortOrder == SRT_ASCENDING ) + pOrig = this, pCmp = &rCmp; + else + pOrig = &rCmp, pCmp = this; + + if( pSrtKey->bIsNumeric ) + { + double n1 = pOrig->GetValue( nKey ); + double n2 = pCmp->GetValue( nKey ); + + nCmp = n1 < n2 ? -1 : n1 == n2 ? 0 : 1; + } + else + { + if( !pLastAlgorithm || *pLastAlgorithm != pSrtKey->sSortType ) + { + if( pLastAlgorithm ) + *pLastAlgorithm = pSrtKey->sSortType; + else + pLastAlgorithm = new String( pSrtKey->sSortType ); + pSortCollator->loadCollatorAlgorithm( *pLastAlgorithm, + *pLocale, + pOptions->bIgnoreCase ? SW_COLLATOR_IGNORES : 0 ); + } + + nCmp = pSortCollator->compareString( + pOrig->GetKey( nKey ), pCmp->GetKey( nKey )); + } + return nCmp; +} + /*-------------------------------------------------------------------- Description: Comparison operators --------------------------------------------------------------------*/ @@ -146,49 +184,17 @@ sal_Bool SwSortElement::operator==(const SwSortElement& ) const --------------------------------------------------------------------*/ sal_Bool SwSortElement::operator<(const SwSortElement& rCmp) const { - // The actual comparison for(sal_uInt16 nKey = 0; nKey < pOptions->aKeys.size(); ++nKey) { - const SwSortElement *pOrig, *pCmp; - - const SwSortKey* pSrtKey = pOptions->aKeys[ nKey ]; - if( pSrtKey->eSortOrder == SRT_ASCENDING ) - pOrig = this, pCmp = &rCmp; - else - pOrig = &rCmp, pCmp = this; + int nCmp = keycompare(rCmp, nKey); - if( pSrtKey->bIsNumeric ) - { - double n1 = pOrig->GetValue( nKey ); - double n2 = pCmp->GetValue( nKey ); - - if( n1 == n2 ) - continue; + if (nCmp == 0) + continue; - return n1 < n2; - } - else - { - if( !pLastAlgorithm || *pLastAlgorithm != pSrtKey->sSortType ) - { - if( pLastAlgorithm ) - *pLastAlgorithm = pSrtKey->sSortType; - else - pLastAlgorithm = new String( pSrtKey->sSortType ); - pSortCollator->loadCollatorAlgorithm( *pLastAlgorithm, - *pLocale, - pOptions->bIgnoreCase ? SW_COLLATOR_IGNORES : 0 ); - } - - sal_Int32 nCmp = pSortCollator->compareString( - pOrig->GetKey( nKey ), pCmp->GetKey( nKey )); - if( 0 == nCmp ) - continue; - - return -1 == nCmp; - } + return nCmp < 0; } + return sal_False; } diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 2162328..7236e0e 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -90,6 +90,8 @@ struct SwSortElement sal_Bool operator<(const SwSortElement& ) const; double StrToDouble(const String& rStr) const; +private: + int keycompare(const SwSortElement& rCmp, sal_uInt16 nKey) const; }; // sort text commit aec9bb52ab50a26fe635ff1036f7fe6882ca74dd Author: Caolán McNamara <caol...@redhat.com> Date: Mon Jul 30 10:21:31 2012 +0100 const up SwSortElement::operator* Change-Id: Iabb2b686776de56957423598ef8f39e1cc4cd986 diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 729ef6e..a76425d 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -136,7 +136,7 @@ double SwSortElement::StrToDouble( const String& rStr ) const /*-------------------------------------------------------------------- Description: Comparison operators --------------------------------------------------------------------*/ -sal_Bool SwSortElement::operator==(const SwSortElement& ) +sal_Bool SwSortElement::operator==(const SwSortElement& ) const { return sal_False; } @@ -144,7 +144,7 @@ sal_Bool SwSortElement::operator==(const SwSortElement& ) /*-------------------------------------------------------------------- Description: Less-than operator for sorting --------------------------------------------------------------------*/ -sal_Bool SwSortElement::operator<(const SwSortElement& rCmp) +sal_Bool SwSortElement::operator<(const SwSortElement& rCmp) const { // The actual comparison diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 03ab738..2162328 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -86,8 +86,8 @@ struct SwSortElement virtual String GetKey(sal_uInt16 nKey ) const = 0; virtual double GetValue(sal_uInt16 nKey ) const; - sal_Bool operator==(const SwSortElement& ); - sal_Bool operator<(const SwSortElement& ); + sal_Bool operator==(const SwSortElement& ) const; + sal_Bool operator<(const SwSortElement& ) const; double StrToDouble(const String& rStr) const; }; commit b8d3a13abe531e2c6ef2451eba8247477b453354 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Jul 30 09:43:28 2012 +0100 move SwSortElements to .cxx Change-Id: I67e018b6994fb40e51d32972ae58282cdab3daa6 diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index bb78bd4..729ef6e 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -29,6 +29,7 @@ #include <hintids.hxx> #include <rtl/math.hxx> +#include <svl/svarray.hxx> #include <unotools/collatorwrapper.hxx> #include <unotools/localedatawrapper.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -67,6 +68,11 @@ lang::Locale* SwSortElement::pLocale = 0; String* SwSortElement::pLastAlgorithm = 0; LocaleDataWrapper* SwSortElement::pLclData = 0; +// List of all sorted elements +typedef SwSortElement* SwSortElementPtr; + +SV_DECL_PTRARR_SORT(SwSortElements, SwSortElementPtr, 0) + SV_IMPL_OP_PTRARR_SORT( SwSortElements, SwSortElementPtr ); /*-------------------------------------------------------------------- diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 4254f62..03ab738 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -29,7 +29,6 @@ #ifndef _SORT_HXX #define _SORT_HXX -#include <svl/svarray.hxx> #include <ndindex.hxx> #include <vector> @@ -54,11 +53,6 @@ namespace com { } } -// List of all sorted elements -typedef SwSortElement* SwSortElementPtr; - -SV_DECL_PTRARR_SORT(SwSortElements, SwSortElementPtr, 0) - class SwMovedBoxes : public std::vector<const SwTableBox*> { public: commit 1d76bc0d90d1151c03b0cf13265df5df9b3ffb41 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Jul 30 09:04:14 2012 +0100 add another tiff regression test Change-Id: I0466a872576132b8ad9e5b164f57951549dd54e0 diff --git a/filter/qa/cppunit/data/tiff/fail/BID-51132-1.tiff b/filter/qa/cppunit/data/tiff/fail/BID-51132-1.tiff new file mode 100644 index 0000000..929ac15 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/BID-51132-1.tiff differ diff --git a/unotest/inc/unotest/filters-test.hxx b/unotest/inc/unotest/filters-test.hxx index 73cfbe3..d26c7f7 100644 --- a/unotest/inc/unotest/filters-test.hxx +++ b/unotest/inc/unotest/filters-test.hxx @@ -40,8 +40,8 @@ enum filterStatus }; /* - * NOTE, any files beginning with CVE- or EDB- will be assumed to be encrypted - * using arcfour with key 0x435645, this is to silence panicky + * NOTE, any files beginning with CVE-, BID- or EDB- will be assumed to be + * encrypted using arcfour with key 0x435645, this is to silence panicky * virus/malware-checkers * * e.g. m[de]crypt --bare -a arcfour -o hex -k 435645 -s 3 diff --git a/unotest/source/cpp/filters-test.cxx b/unotest/source/cpp/filters-test.cxx index f92ce79..64c6159 100644 --- a/unotest/source/cpp/filters-test.cxx +++ b/unotest/source/cpp/filters-test.cxx @@ -98,6 +98,7 @@ void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUStrin continue; if ( + (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("BID"), nLastSlash+1)) || (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("CVE"), nLastSlash+1)) || (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("EDB"), nLastSlash+1)) ) commit 747cb47357f7088077e78878c1a37ad58138faf3 Author: Caolán McNamara <caol...@redhat.com> Date: Sun Jul 29 23:28:56 2012 +0100 remove unnecessary includes of svl/svarray.hxx Change-Id: Ifec201efc4e97baf2d36d66c4ae6967eadd6134c diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx index 04b46de..5a3ecdd 100644 --- a/basic/inc/basic/sbx.hxx +++ b/basic/inc/basic/sbx.hxx @@ -21,7 +21,6 @@ #define _SBXCLASS_HXX #include "tools/ref.hxx" -#include "svl/svarray.hxx" #include "svl/smplhint.hxx" #include "svl/lstner.hxx" diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx index 6e7f7e8..37142a9 100644 --- a/basic/inc/basic/sbxbase.hxx +++ b/basic/inc/basic/sbxbase.hxx @@ -21,7 +21,6 @@ #define _SBXBASE_HXX #include <i18npool/lang.h> -#include "svl/svarray.hxx" #include <basic/sbxdef.hxx> #include "basicdllapi.h" #include <boost/ptr_container/ptr_vector.hpp> diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index 4b38fd3..fe08435 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -20,7 +20,6 @@ #include "propacc.hxx" -#include <svl/svarray.hxx> #include <basic/sbstar.hxx> #include <sbunoobj.hxx> diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 044666d..450dff4 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -29,7 +29,6 @@ #include <vcl/dialog.hxx> #include <sfx2/childwin.hxx> #include <sfx2/basedlgs.hxx> -#include <svl/svarray.hxx> #include <svtools/svmedit.hxx> #include <svl/srchdefs.hxx> diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx index b2091cc..9af651e 100644 --- a/editeng/source/editeng/eehtml.hxx +++ b/editeng/source/editeng/eehtml.hxx @@ -29,8 +29,6 @@ #ifndef _EEHTML_HXX #define _EEHTML_HXX -#include <svl/svarray.hxx> - #include <editdoc.hxx> #include <svtools/parhtml.hxx> diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 291acb1..37e01a9 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -37,7 +37,6 @@ #include "unotools/viewoptions.hxx" #include "svtools/fileview.hxx" #include "svtools/sfxecode.hxx" -#include "svl/svarray.hxx" #include "svtools/svtabbx.hxx" #include <toolkit/helper/vclunohelper.hxx> #include <unotools/localfilehelper.hxx> diff --git a/framework/inc/framework/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx index f02beed..99249a2 100644 --- a/framework/inc/framework/eventsconfiguration.hxx +++ b/framework/inc/framework/eventsconfiguration.hxx @@ -30,7 +30,6 @@ #define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ #include <framework/fwedllapi.h> -#include <svl/svarray.hxx> #include <tools/stream.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/framework/inc/framework/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx index b357998..2ef90ad 100644 --- a/framework/inc/framework/statusbarconfiguration.hxx +++ b/framework/inc/framework/statusbarconfiguration.hxx @@ -29,7 +29,6 @@ #define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ #include <framework/fwedllapi.h> -#include <svl/svarray.hxx> #include <tools/stream.hxx> #include <vcl/status.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/framework/inc/framework/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx index 413f140..e2c1270 100644 --- a/framework/inc/framework/toolboxconfiguration.hxx +++ b/framework/inc/framework/toolboxconfiguration.hxx @@ -20,7 +20,6 @@ #define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ #include <framework/fwedllapi.h> -#include <svl/svarray.hxx> #include <vcl/bitmap.hxx> #include <com/sun/star/io/XInputStream.hpp> #ifndef _COM_SUN_STAR_IO_XOUPUTSTREAM_HPP_ diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 8ea756e..2a5c7ae 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -30,7 +30,6 @@ #define FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_ #include <framework/fwedllapi.h> -#include <svl/svarray.hxx> #include <tools/string.hxx> #include <tools/stream.hxx> #include <tools/color.hxx> diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index 8e5e79c..bc526fa 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.h> -#include <svl/svarray.hxx> #include "linguistic/misc.hxx" #include "lngopt.hxx" diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 1b95933..d25a39f 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -32,7 +32,6 @@ #include "global.hxx" #include "address.hxx" #include "formula/grammar.hxx" -#include <svl/svarray.hxx> #include "scdllapi.h" #include "rangelst.hxx" diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 6ba78c7..ba33503 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -29,7 +29,6 @@ #ifndef SC_DETDATA_HXX #define SC_DETDATA_HXX -#include <svl/svarray.hxx> #include <boost/ptr_container/ptr_vector.hpp> #include "global.hxx" diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index 29209f2..d1c5f65 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -33,7 +33,6 @@ #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <cppuhelper/implbase2.hxx> #include <svl/lstner.hxx> -#include <svl/svarray.hxx> #include "global.hxx" // ScImportParam #include <boost/ptr_container/ptr_vector.hpp> diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index b652bac..48a62b7 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -32,7 +32,6 @@ #include "global.hxx" #include "dpcachetable.hxx" -#include <svl/svarray.hxx> #include <tools/string.hxx> #include <com/sun/star/sheet/MemberResult.hpp> #include <com/sun/star/sheet/DataResult.hpp> diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index cf867b7..2aeb6f5 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -30,7 +30,6 @@ #define SC_VIEWUNO_HXX #include <sfx2/sfxbasecontroller.hxx> -#include <svl/svarray.hxx> #include <svl/itemprop.hxx> #include <com/sun/star/view/XFormLayerAccess.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index 642baa9..b323d0c 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -33,7 +33,6 @@ #include <boost/unordered_set.hpp> #include <functional> #include <svl/broadcast.hxx> -#include <svl/svarray.hxx> #include "global.hxx" #include "brdcst.hxx" diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index a104fad..d023054 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -39,7 +39,6 @@ #include <vcl/lstbox.hxx> #include <svx/ctredlin.hxx> #include <svx/simptabl.hxx> -#include <svl/svarray.hxx> #include "chgtrack.hxx" #include "chgviset.hxx" #include <vcl/timer.hxx> diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx index 1d846d5..3679eb2 100644 --- a/sfx2/inc/sfx2/appuno.hxx +++ b/sfx2/inc/sfx2/appuno.hxx @@ -43,7 +43,6 @@ #include <cppuhelper/implbase4.hxx> #include <tools/errcode.hxx> -#include <svl/svarray.hxx> #include <sfx2/sfxuno.hxx> class SfxObjectShell; diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index fe2e121..e9027d8 100644 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -26,7 +26,6 @@ #include <svl/poolitem.hxx> #include <tools/urlobj.hxx> #include <tools/string.hxx> -#include <svl/svarray.hxx> #include <tools/gen.hxx> class SvStream; diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx index 71c8356..500912f 100644 --- a/sfx2/inc/sfx2/msgpool.hxx +++ b/sfx2/inc/sfx2/msgpool.hxx @@ -25,7 +25,6 @@ #include <sfx2/msg.hxx> #include <tools/string.hxx> -#include <svl/svarray.hxx> #include <string> #include <vector> diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index e026093..6e5ac6b 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <vcl/timer.hxx> -#include <svl/svarray.hxx> #include <vector> #include <algorithm> diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index 4ecfb5e..b6d0224 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -22,7 +22,6 @@ #include <vcl/font.hxx> #include <svl/lstner.hxx> -#include <svl/svarray.hxx> #include <map> #include <vector> diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index a00d8a6..f6a7c6d 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -25,7 +25,6 @@ #include <limits.h> #include <tools/solar.h> #include <tools/string.hxx> -#include <svl/svarray.hxx> #include <svl/poolitem.hxx> #include <vector> diff --git a/svl/inc/svl/lstner.hxx b/svl/inc/svl/lstner.hxx index c856b16..e54368a 100644 --- a/svl/inc/svl/lstner.hxx +++ b/svl/inc/svl/lstner.hxx @@ -21,7 +21,6 @@ #include "svl/svldllapi.h" #include <tools/rtti.hxx> -#include <svl/svarray.hxx> #include <deque> class SfxBroadcaster; diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index 2b606d7..4d60a35 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -28,7 +28,6 @@ #include <tools/solar.h> #include <tools/debug.hxx> #include <tools/string.hxx> -#include <svl/svarray.hxx> #include <svl/hint.hxx> typedef long SfxArgumentError; diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx index 64cf765..096b05e 100644 --- a/svl/inc/svl/undo.hxx +++ b/svl/inc/svl/undo.hxx @@ -22,7 +22,6 @@ #include "svl/svldllapi.h" #include <tools/rtti.hxx> #include <tools/string.hxx> -#include <svl/svarray.hxx> #include <boost/scoped_ptr.hpp> diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx index ea18d05..477de7a 100644 --- a/svtools/inc/svtools/svlbox.hxx +++ b/svtools/inc/svtools/svlbox.hxx @@ -43,7 +43,6 @@ #include <tools/gen.hxx> #include <tools/list.hxx> #include <svtools/treelist.hxx> -#include <svl/svarray.hxx> #include <svtools/transfer.hxx> class Application; diff --git a/svtools/inc/svtools/svxbox.hxx b/svtools/inc/svtools/svxbox.hxx index 1fbf59b..859de7d 100644 --- a/svtools/inc/svtools/svxbox.hxx +++ b/svtools/inc/svtools/svxbox.hxx @@ -30,7 +30,6 @@ // include --------------------------------------------------------------- -#include <svl/svarray.hxx> #include <tools/string.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index 61eaa7b..b38d144 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include <svtools/fontsubstconfig.hxx> -#include <svl/svarray.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svtools/source/edit/textdat2.hxx b/svtools/source/edit/textdat2.hxx index aa0916a..c52d33e 100644 --- a/svtools/source/edit/textdat2.hxx +++ b/svtools/source/edit/textdat2.hxx @@ -30,7 +30,6 @@ #ifndef _TEXTDAT2_HXX #define _TEXTDAT2_HXX -#include <svl/svarray.hxx> #include <vcl/seleng.hxx> #include <vcl/virdev.hxx> #include <vcl/cursor.hxx> diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx index 17607a9..1551123 100644 --- a/svtools/source/edit/textdoc.hxx +++ b/svtools/source/edit/textdoc.hxx @@ -29,7 +29,6 @@ #ifndef _TEXTDOC_HXX #define _TEXTDOC_HXX -#include <svl/svarray.hxx> #include <svtools/textdata.hxx> #include <svtools/txtattr.hxx> diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 4d60877..5d4daca 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -33,7 +33,6 @@ #include <limits.h> #include <vector> -#include <svl/svarray.hxx> #include <svl/itempool.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index 88a0a20..995d324 100644 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -36,7 +36,6 @@ #include <cppuhelper/implbase4.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/svdtypes.hxx> // for SdrLayerID -#include <svl/svarray.hxx> #include <tools/contnr.hxx> #include <svx/sdrpagewindow.hxx> #include "svx/svxdllapi.h" diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 1ca5561..94a0839 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -53,7 +53,6 @@ #include <svx/svdmark.hxx> #include <svx/fmsearch.hxx> #include <svx/svxids.hrc> -#include <svl/svarray.hxx> #include <svl/lstner.hxx> #include <sfx2/mnuitem.hxx> diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 34fc0ae..5849b89 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -31,7 +31,6 @@ #include <tools/string.hxx> #include <tools/link.hxx> -#include <svl/svarray.hxx> #include <com/sun/star/util/Date.hpp> #include "swdllapi.h" #include <swdbdata.hxx> diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 7c8c84a..44486c4 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <tools/string.hxx> -#include <svl/svarray.hxx> #include <vcl/font.hxx> #include <editeng/swafopt.hxx> #include "swdllapi.h" diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx index 4a8d2fd..e979ab8 100644 --- a/sw/inc/flypos.hxx +++ b/sw/inc/flypos.hxx @@ -29,7 +29,6 @@ #define _FLYPOS_HXX -#include <svl/svarray.hxx> #include <swdllapi.h> #include <set> diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx index 793a439..4bd23f0 100644 --- a/sw/inc/rubylist.hxx +++ b/sw/inc/rubylist.hxx @@ -28,7 +28,6 @@ #ifndef _RUBYLIST_HXX #define _RUBYLIST_HXX -#include <svl/svarray.hxx> #include <swtypes.hxx> #include <fmtruby.hxx> #include <boost/ptr_container/ptr_vector.hpp> diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index eccf256..e095d6f 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -35,7 +35,6 @@ #include <tools/rtti.hxx> #include <tools/ref.hxx> -#include <svl/svarray.hxx> #include <svl/smplhint.hxx> #include <sfx2/lnkbase.hxx> #include <sfx2/Metadatable.hxx> diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx index aeeb72d..2fa4623 100644 --- a/sw/inc/sortopt.hxx +++ b/sw/inc/sortopt.hxx @@ -28,8 +28,6 @@ #ifndef _SORTOPT_HXX #define _SORTOPT_HXX - -#include <svl/svarray.hxx> #include <tools/string.hxx> #include "swdllapi.h" #include <vector> diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index bb1eb3a..a3b7cba 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -39,7 +39,6 @@ #include <boost/scoped_ptr.hpp> -#include <svl/svarray.hxx> #include "hintids.hxx" // _Always_ before the solar-items! #include <svx/algitem.hxx> #include <editeng/fontitem.hxx> diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 561df1f..0368e3a 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -31,13 +31,11 @@ #include <cppuhelper/weakref.hxx> #include <i18npool/lang.h> +#include <svl/poolitem.hxx> #include <tools/string.hxx> #include <osl/diagnose.h> #include <editeng/svxenum.hxx> -#include <svl/svarray.hxx> -#include <svl/poolitem.hxx> -#include "swdllapi.h" #include <swtypes.hxx> #include <toxe.hxx> #include <calbck.hxx> diff --git a/sw/inc/unoevtlstnr.hxx b/sw/inc/unoevtlstnr.hxx index c52fe5e..634a5fb 100644 --- a/sw/inc/unoevtlstnr.hxx +++ b/sw/inc/unoevtlstnr.hxx @@ -28,7 +28,6 @@ #ifndef _UNOEVTLSTNR_HXX #define _UNOEVTLSTNR_HXX -#include <svl/svarray.hxx> #include <com/sun/star/uno/Reference.h> #include <vector> diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 9d94f18..903e487 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -29,7 +29,6 @@ #define _UNOTXDOC_HXX #include "swdllapi.h" -#include <svl/svarray.hxx> #include <sfx2/sfxbasemodel.hxx> #include <com/sun/star/beans/PropertyValues.hpp> diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index fb9682f..ab0e014 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/embed/XClassifiedObject.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <tools/rtti.hxx> -#include <svl/svarray.hxx> #include "swdllapi.h" #include <swtypes.hxx> #include <ring.hxx> diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx index 02c5d20..6767430 100644 --- a/sw/source/core/inc/doctxm.hxx +++ b/sw/source/core/inc/doctxm.hxx @@ -29,7 +29,6 @@ #ifndef _DOCTXM_HXX #define _DOCTXM_HXX -#include <svl/svarray.hxx> #include <tools/gen.hxx> #include <tox.hxx> #include <section.hxx> diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 716738b..b346b30 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -32,7 +32,6 @@ #include <vector> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> -#include <svl/svarray.hxx> #include <editeng/borderline.hxx> #include "swtypes.hxx" #include "swrect.hxx" diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index fd91329..c360938 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -29,7 +29,6 @@ #define SW_MVSAVE_HXX #include <vcl/keycod.hxx> -#include <svl/svarray.hxx> #include <IDocumentMarkAccess.hxx> #include <vector> #include <deque> diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx index 00fbaaa..974f3a4 100644 --- a/sw/source/core/inc/noteurl.hxx +++ b/sw/source/core/inc/noteurl.hxx @@ -30,7 +30,6 @@ #define _NOTEURL_HXX -#include <svl/svarray.hxx> #include <tools/string.hxx> #include "swrect.hxx" #include <boost/ptr_container/ptr_vector.hpp> diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 5a17b59..ea2ee13 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -29,8 +29,6 @@ #define _PAGEFRM_HXX #include <viewsh.hxx> -#include <svl/svarray.hxx> - #include "ftnboss.hxx" #include <tools/mempool.hxx> diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 098214e..696808f 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -37,7 +37,6 @@ #include <vcl/lstbox.hxx> #include <svtools/svmedit.hxx> #include <sfx2/basedlgs.hxx> -#include <svl/svarray.hxx> #include <unotools/configitem.hxx> #include <numfmtlb.hxx> #include <swdbdata.hxx> diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 95a4365..481af85 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -28,10 +28,7 @@ #ifndef _SWLBOX_HXX #define _SWLBOX_HXX -#include <svl/svarray.hxx> - #include <vcl/lstbox.hxx> - #include <vcl/combobox.hxx> #include "swdllapi.h" #include <boost/ptr_container/ptr_vector.hpp> diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx index 2d4bb0a..9431369 100644 --- a/sw/source/ui/inc/uinums.hxx +++ b/sw/source/ui/inc/uinums.hxx @@ -28,7 +28,6 @@ #ifndef _UINUMS_HXX #define _UINUMS_HXX -#include <svl/svarray.hxx> #include <numrule.hxx> #include "swdllapi.h" #include <boost/ptr_container/ptr_vector.hpp> diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx index ea4db31..26e4f41 100644 --- a/xmloff/source/core/i18nmap.cxx +++ b/xmloff/source/core/i18nmap.cxx @@ -28,7 +28,6 @@ #include <rtl/ustring.hxx> #include <tools/debug.hxx> -#include <svl/svarray.hxx> #include "xmloff/i18nmap.hxx" bool SvI18NMap::Add( sal_uInt16 nKind, const rtl::OUString& rName, diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 68ddd35..e4a55d1 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -31,7 +31,6 @@ #include <tools/urlobj.hxx> #include <osl/mutex.hxx> #include <rtl/memory.h> -#include <svl/svarray.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx index f85ba87..911ec66 100644 --- a/xmloff/source/core/xmltkmap.cxx +++ b/xmloff/source/core/xmltkmap.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include <rtl/ustring.hxx> -#include <svl/svarray.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmltoken.hxx> #include <boost/ptr_container/ptr_set.hpp> diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 392f491..e5d8876 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -28,7 +28,6 @@ #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <tools/debug.hxx> -#include <svl/svarray.hxx> #include <rtl/ustrbuf.hxx> #include <sal/types.h> diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 15a6138..20c6054 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -32,7 +32,6 @@ #include <tools/debug.hxx> #include <boost/ptr_container/ptr_vector.hpp> -#include <svl/svarray.hxx> #include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx index e83a7a2..c04c14e 100644 --- a/xmloff/source/text/txtparaimphint.hxx +++ b/xmloff/source/text/txtparaimphint.hxx @@ -21,7 +21,6 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#include <svl/svarray.hxx> #include <xmloff/xmlimp.hxx> #include "XMLTextFrameContext.hxx" #include <xmloff/XMLEventsImportContext.hxx> commit 2b049bb03a6d7bf55cac2eedceff52b998167e3c Author: Caolán McNamara <caol...@redhat.com> Date: Mon Jul 30 08:00:48 2012 +0100 C40_GETPOS is unnecessary now Change-Id: Ida64fbeba996c8e3deb7591be825b61d17044d9c diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index 609338a..64d5403 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -236,10 +236,8 @@ sal_Bool nm::Seek_Entry( const AE aE, sal_uInt16* pP ) const\ #if defined(ICC) || defined(GCC) || (defined(WNT) && _MSC_VER >= 1400) #define C40_INSERT( c, p, n ) Insert( (c const *&) p, n ) -#define C40_GETPOS( c, r) GetPos( (c const *&) r ) #else #define C40_INSERT( c, p, n ) Insert( p, n ) -#define C40_GETPOS( c, r) GetPos( r ) #endif #endif //_SVARRAY_HXX diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index 590740a..273a865 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -196,12 +196,12 @@ namespace _FndLines &rFndLines = rFndBox.GetLines(); maCols.push_front(0); const SwTableLine* pLine = rFndLines.front().GetLine(); - sal_uInt16 nStartLn = rTable.GetTabLines().C40_GETPOS( SwTableLine, pLine ); + sal_uInt16 nStartLn = rTable.GetTabLines().GetPos( pLine ); sal_uInt16 nEndLn = nStartLn; if( rFndLines.size() > 1 ) { pLine = rFndLines.back().GetLine(); - nEndLn = rTable.GetTabLines().C40_GETPOS( SwTableLine, pLine ); + nEndLn = rTable.GetTabLines().GetPos( pLine ); } if( nStartLn < USHRT_MAX && nEndLn < USHRT_MAX ) { @@ -795,7 +795,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox, SwTableLine* pNxtLine = pMyBox->GetUpper(); while( pNxtLine->GetUpper() ) pNxtLine = pNxtLine->GetUpper()->GetUpper(); - sal_uInt16 nPos = GetTabLines().C40_GETPOS( SwTableLine, pNxtLine ); + sal_uInt16 nPos = GetTabLines().GetPos( pNxtLine ); // Is there a next? if( nPos + 1 >= (sal_uInt16)GetTabLines().size() ) bDelCntnt = sal_False; // there is none, all goes into the last Box @@ -847,7 +847,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes, if( 1 != rCpyTbl.GetTabSortBoxes().size() ) { SwTableLine* pSttLine = pSttBox->GetUpper(); - sal_uInt16 nSttLine = GetTabLines().C40_GETPOS( SwTableLine, pSttLine ); + sal_uInt16 nSttLine = GetTabLines().GetPos( pSttLine ); _FndBox* pFndBox; sal_uInt16 nFndCnt = aFndBox.GetLines().size(); @@ -858,7 +858,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes, sal_uInt16 nTstLns = 0; pFLine = &aFndBox.GetLines().front(); pSttLine = pFLine->GetLine(); - nSttLine = GetTabLines().C40_GETPOS( SwTableLine, pSttLine ); + nSttLine = GetTabLines().GetPos( pSttLine ); // Do we have as many rows, actually? if( 1 == nFndCnt ) { diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index f89ff9c..944e920 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -3145,7 +3145,7 @@ sal_Bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode, pLine = pLine->GetUpper()->GetUpper(); // in pLine steht jetzt die GrundLine. - aMsgHnt.nSplitLine = rTbl.GetTabLines().C40_GETPOS( SwTableLine, pLine ); + aMsgHnt.nSplitLine = rTbl.GetTabLines().GetPos( pLine ); } String sNewTblNm( GetUniqueTblName() ); @@ -3371,7 +3371,7 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, sal_Bool bAfter, pLine = pLine->GetUpper()->GetUpper(); // in pLine steht jetzt die GrundLine. - sal_uInt16 nLinePos = rTbl.GetTabLines().C40_GETPOS( SwTableLine, pLine ); + sal_uInt16 nLinePos = rTbl.GetTabLines().GetPos( pLine ); if( USHRT_MAX == nLinePos || ( bAfter ? ++nLinePos >= rTbl.GetTabLines().size() : !nLinePos )) return 0; // nicht gefunden oder letze Line !! diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 00e1b48..aa8fbc4 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -2146,13 +2146,13 @@ void _FndBox::SetTableLines( const SwTable &rTable ) return; SwTableLine* pTmpLine = GetLines().front().GetLine(); - sal_uInt16 nPos = rTable.GetTabLines().C40_GETPOS( SwTableLine, pTmpLine ); + sal_uInt16 nPos = rTable.GetTabLines().GetPos( pTmpLine ); OSL_ENSURE( USHRT_MAX != nPos, "Line steht nicht in der Tabelle" ); if( nPos ) pLineBefore = rTable.GetTabLines()[ nPos - 1 ]; pTmpLine = GetLines().back().GetLine(); - nPos = rTable.GetTabLines().C40_GETPOS( SwTableLine, pTmpLine ); + nPos = rTable.GetTabLines().GetPos( pTmpLine ); OSL_ENSURE( USHRT_MAX != nPos, "Line steht nicht in der Tabelle" ); if( ++nPos < rTable.GetTabLines().size() ) pLineBehind = rTable.GetTabLines()[nPos]; diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index 603dfd4..5fa2377 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -501,7 +501,7 @@ SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM& rPam ) const pOuterBox->FindStartOfRowSpan( *this, USHRT_MAX ); nOutSpan = rBox.getRowSpan(); const SwTableLine* pTmpL = rBox.GetUpper(); - nCheck = GetTabLines().C40_GETPOS( SwTableLine, pTmpL ); + nCheck = GetTabLines().GetPos( pTmpL ); if( nCheck < nTop ) bOkay = false; if( pOuterBox == pLeftBox ) @@ -617,7 +617,7 @@ long lcl_InsertPosition( SwTable &rTable, std::vector<sal_uInt16>& rInsPos, long nWidth = rBoxes[j]->GetFrmFmt()->GetFrmSize().GetWidth(); nAddWidth += nWidth; sal_uInt16 nCurrBox = pLine->GetTabBoxes().GetPos( pBox ); - sal_uInt16 nCurrLine = rTable.GetTabLines().C40_GETPOS(SwTableLine, pLine ); + sal_uInt16 nCurrLine = rTable.GetTabLines().GetPos( pLine ); OSL_ENSURE( nCurrLine != USHRT_MAX, "Time to say Good-Bye.." ); if( rInsPos[ nCurrLine ] == USHRT_MAX ) { @@ -977,8 +977,8 @@ void SwTable::_FindSuperfluousRows( SwSelBoxes& rBoxes, pFirstLn = rBoxes[0]->GetUpper(); pLastLn = rBoxes.back()->GetUpper(); } - sal_uInt16 nFirstLn = GetTabLines().C40_GETPOS(SwTableLine, pFirstLn ); - sal_uInt16 nLastLn = GetTabLines().C40_GETPOS(SwTableLine, pLastLn ); + sal_uInt16 nFirstLn = GetTabLines().GetPos( pFirstLn ); + sal_uInt16 nLastLn = GetTabLines().GetPos( pLastLn ); for( sal_uInt16 nRow = nFirstLn; nRow <= nLastLn; ++nRow ) { SwTableLine* pLine = aLines[nRow]; @@ -1018,7 +1018,7 @@ SwTableBox& SwTableBox::FindStartOfRowSpan( const SwTable& rTable, sal_uInt16 nM long nLeftBorder = lcl_Box2LeftBorder( *this ); SwTableBox* pBox = this; const SwTableLine* pMyUpper = GetUpper(); - sal_uInt16 nLine = rTable.GetTabLines().C40_GETPOS(SwTableLine, pMyUpper ); + sal_uInt16 nLine = rTable.GetTabLines().GetPos( pMyUpper ); if( nLine && nLine < rTable.GetTabLines().size() ) { SwTableBox* pNext; @@ -1048,7 +1048,7 @@ SwTableBox& SwTableBox::FindEndOfRowSpan( const SwTable& rTable, sal_uInt16 nMax if( nMaxStep > --nAbsSpan ) nMaxStep = (sal_uInt16)nAbsSpan; const SwTableLine* pMyUpper = GetUpper(); - sal_uInt16 nLine = rTable.GetTabLines().C40_GETPOS(SwTableLine, pMyUpper ); + sal_uInt16 nLine = rTable.GetTabLines().GetPos( pMyUpper ); nMaxStep = nLine + nMaxStep; if( nMaxStep >= rTable.GetTabLines().size() ) nMaxStep = rTable.GetTabLines().size() - 1; @@ -1072,7 +1072,7 @@ void lcl_getAllMergedBoxes( const SwTable& rTable, SwSelBoxes& rBoxes, SwTableBo if( pBox->getRowSpan() == 1 ) return; const SwTableLine* pMyUpper = pBox->GetUpper(); - sal_uInt16 nLine = rTable.GetTabLines().C40_GETPOS(SwTableLine, pMyUpper ); + sal_uInt16 nLine = rTable.GetTabLines().GetPos( pMyUpper ); long nLeftBorder = lcl_Box2LeftBorder( *pBox ); sal_uInt16 nCount = rTable.GetTabLines().size(); while( ++nLine < nCount && pBox && pBox->getRowSpan() != -1 ) @@ -1214,7 +1214,7 @@ void lcl_SophisticatedFillLineIndices( SwLineOffsetArray &rArr, { const SwTableLine *pLine = rBox.GetUpper(); const sal_uInt16 nEnd = sal_uInt16( rBox.getRowSpan() + - rTable.GetTabLines().C40_GETPOS( SwTableLine, pLine ) ); + rTable.GetTabLines().GetPos( pLine ) ); // The next if statement is a small optimization if( aLnOfs.first != nEnd || aLnOfs.second != rBox.getRowSpan() ) { @@ -1310,7 +1310,7 @@ sal_uInt16 lcl_CalculateSplitLineHeights( SwSplitLines &rCurr, SwSplitLines &rNe const SwTableBox &rBox = rBoxes[ i ]->FindStartOfRowSpan( rTable ); OSL_ENSURE( rBox.getRowSpan() > 0, "Didn't I say 'StartOfRowSpan' ??" ); const SwTableLine *pLine = rBox.GetUpper(); - const sal_uInt16 nStart = rTable.GetTabLines().C40_GETPOS( SwTableLine, pLine ); + const sal_uInt16 nStart = rTable.GetTabLines().GetPos( pLine ); const sal_uInt16 nEnd = sal_uInt16( rBox.getRowSpan() + nStart - 1 ); // The next if statement is a small optimization if( aLnOfs.first != nStart || aLnOfs.second != nEnd ) @@ -1366,7 +1366,7 @@ sal_uInt16 lcl_LineIndex( const SwTable& rTable, const SwSelBoxes& rBoxes, { SwTableBox *pBox = rBoxes[i]; const SwTableLine* pLine = rBoxes[i]->GetUpper(); - sal_uInt16 nPos = rTable.GetTabLines().C40_GETPOS( SwTableLine, pLine ); + sal_uInt16 nPos = rTable.GetTabLines().GetPos( pLine ); if( USHRT_MAX != nPos ) { if( bBehind ) @@ -1555,7 +1555,7 @@ void SwTable::PrepareDelBoxes( const SwSelBoxes& rBoxes ) { long nLeft = lcl_Box2LeftBorder( *pBox ); SwTableLine *pLine = pBox->GetUpper(); - sal_uInt16 nLinePos = GetTabLines().C40_GETPOS(SwTableLine, pLine); + sal_uInt16 nLinePos = GetTabLines().GetPos( pLine); OSL_ENSURE( nLinePos < USHRT_MAX, "Box/table mismatch" ); if( nRowSpan > 1 ) { diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 200c5a6..3d1371b 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1293,7 +1293,7 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew, if( bCurRowOnly ) { const SwTableLine* pCurrLine = pStart->GetUpper(); - sal_uInt16 nCurr = rLines.C40_GETPOS( SwTableLine, pCurrLine ); + sal_uInt16 nCurr = rLines.GetPos( pCurrLine ); if( nCurr >= USHRT_MAX ) return; diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 10fa4ed..27e3983 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -1568,7 +1568,7 @@ SwTableLine* lcl_FindTableLine( const SwTable& rTable, rBox.GetUpper()->GetUpper()->GetTabLines() : rTable.GetTabLines(); const SwTableLine* pLine = rBox.GetUpper(); - sal_uInt16 nLineNo = rTableLines.C40_GETPOS( SwTableLine, pLine ); + sal_uInt16 nLineNo = rTableLines.GetPos( pLine ); pRet = rTableLines[nLineNo - 1]; return pRet; @@ -1619,7 +1619,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd, const SwTableBox* pSourceBox = NULL; const SwTableBox* pCheckBox = NULL; const SwTableLine* pBoxLine = pBox->GetUpper(); - sal_uInt16 nLineDiff = lcl_FindParentLines(rTbl,*pBox).C40_GETPOS(SwTableLine,pBoxLine); + sal_uInt16 nLineDiff = lcl_FindParentLines(rTbl,*pBox).GetPos(pBoxLine); sal_uInt16 nLineNo = 0; for( sal_uInt16 j = 0; j < rBoxes.size(); ++j ) { @@ -1628,7 +1628,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd, { const SwTableLine* pCheckLine = pCheckBox->GetUpper(); sal_uInt16 nCheckLine = lcl_FindParentLines( rTbl, *pCheckBox ). - C40_GETPOS( SwTableLine, pCheckLine ); + GetPos( pCheckLine ); if( ( !pSourceBox || nCheckLine > nLineNo ) && nCheckLine < nLineDiff ) { nLineNo = nCheckLine; commit b3a31f640f9af732f9f9949baf9985b98b65b209 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Jul 30 07:57:59 2012 +0100 ditch SV_DECL_PTRARR_SORT_DEL Change-Id: Ie57f283b2087564afe9b700d1f35a3be52f1e940 diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index 556f104..609338a 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -25,26 +25,11 @@ * Hier folgt die Beschreibung fuer die exportierten Makros: * * SV_DECL_PTRARR_SORT(nm, AE, IS, GS) -* SV_IMPL_PTRARR_SORT( nm,AE ) -* defieniere/implementiere ein Sort-Array mit Pointern, das nach -* Pointern sortiert ist. Basiert auf einem PTRARR -* -* SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS) -* SV_IMPL_PTRARR_SORT( nm,AE ) -* defieniere/implementiere ein Sort-Array mit Pointern, das nach -* Pointern sortiert ist. Basiert auf einem PTRARR_DEL -* -* SV_DECL_PTRARR_SORT(nm, AE, IS, GS) * SV_IMPL_OP_PTRARR_SORT( nm,AE ) * defieniere/implementiere ein Sort-Array mit Pointern, das nach * Objecten sortiert ist. Basiert auf einem PTRARR. * Sortierung mit Hilfe der Object-operatoren "<" und "==" * -* SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS) -* SV_IMPL_OP_PTRARR_SORT( nm,AE ) -* defieniere/implementiere ein Sort-Array mit Pointern, das nach -* Objecten sortiert ist. Basiert auf einem PTRARR_DEL. -* Sortierung mit Hilfe der Object-operatoren "<" und "==" ***********************************************************************/ #include "svl/svldllapi.h" @@ -141,8 +126,8 @@ void nm::Remove( const AE &aE, sal_uInt16 nL )\ nm##_SAR::Remove( nP, nL);\ }\ -#define _SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, vis)\ -class vis nm##_SAR: public SvPtrarr \ +#define SV_DECL_PTRARR_SORT(nm, AE, IS)\ +class nm##_SAR: public SvPtrarr \ {\ public:\ nm##_SAR( sal_uInt16 nIni=IS )\ @@ -177,7 +162,7 @@ private:\ nm##_SAR& operator=( const nm##_SAR& );\ };\ \ -class vis nm : private nm##_SAR \ +class nm : private nm##_SAR \ {\ public:\ nm(sal_uInt16 nSize = IS)\ @@ -201,66 +186,11 @@ public:\ sal_uInt16 GetPos( const AE& aE ) const { \ return SvPtrarr::GetPos((const VoidPtr&)aE);\ }\ -\ -/* Das Ende stehe im DECL-Makro !!! */ - -#define SV_DECL_PTRARR_SORT(nm, AE, IS)\ -_SV_DECL_PTRARR_SORT_ALG(nm, AE, IS,)\ -private:\ - nm( const nm& );\ - nm& operator=( const nm& );\ -}; - -#define SV_DECL_PTRARR_SORT_DEL(nm, AE, IS)\ -_SV_DECL_PTRARR_SORT_ALG(nm, AE, IS,)\ - ~nm() { DeleteAndDestroy( 0, Count() ); }\ private:\ nm( const nm& );\ nm& operator=( const nm& );\ }; -#define SV_IMPL_PTRARR_SORT( nm,AE )\ -_SV_IMPL_SORTAR_ALG( nm,AE )\ -void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL ) { \ - if( nL ) {\ - OSL_ENSURE( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\ - for( sal_uInt16 n=nP; n < nP + nL; n++ ) \ - delete *((AE*)pData+n); \ - SvPtrarr::Remove( nP, nL ); \ - } \ -} \ -sal_Bool nm::Seek_Entry( const AE aE, sal_uInt16* pP ) const\ -{\ - register sal_uInt16 nO = nm##_SAR::Count(),\ - nM, \ - nU = 0;\ - if( nO > 0 )\ - {\ - nO--;\ - register long rCmp = (long)aE;\ - while( nU <= nO )\ - {\ - nM = nU + ( nO - nU ) / 2;\ - if( (long)*(pData + nM) == rCmp )\ - {\ - if( pP ) *pP = nM;\ - return sal_True;\ - }\ - else if( (long)*(pData+ nM) < (long)aE )\ - nU = nM + 1;\ - else if( nM == 0 )\ - {\ - if( pP ) *pP = nU;\ - return sal_False;\ - }\ - else\ - nO = nM - 1;\ - }\ - }\ - if( pP ) *pP = nU;\ - return sal_False;\ -} - #define SV_IMPL_OP_PTRARR_SORT( nm,AE )\ _SV_IMPL_SORTAR_ALG( nm,AE )\ void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL ) { \ diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx index 8b495c2..8799b6b 100644 --- a/sw/source/core/txtnode/ndhints.cxx +++ b/sw/source/core/txtnode/ndhints.cxx @@ -54,10 +54,6 @@ inline sal_Bool IsEqual( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 ) * IsLessStart() *************************************************************************/ -// SV_IMPL_OP_PTRARR_SORT( SwpHtStart, SwTxtAttr* ) -// kein SV_IMPL_PTRARR_SORT( name,ArrElement ) -// unser SEEK_PTR_TO_OBJECT_NOTL( name,ArrElement ) - // Sortierreihenfolge: Start, Ende (umgekehrt!), Which-Wert (umgekehrt!), // als letztes die Adresse selbst diff --git a/unusedcode.easy b/unusedcode.easy index cf9da88..fad89f6 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,9 +1,4 @@ FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool) -InsCapOptArr::Insert(InsCapOptArr const*, unsigned short, unsigned short) -InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&) -InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short) -InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short) -InsCapOptArr::Remove(unsigned short, unsigned short) PopupMenu::SetSelectedEntry(unsigned short) RtfAttributeOutput::WriteHex(rtl::OString) SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits