filter/source/graphicfilter/icgm/chart.hxx | 10 +-- filter/source/graphicfilter/icgm/main.hxx | 16 ----- sfx2/source/appl/newhelp.cxx | 2 svl/inc/svl/svarray.hxx | 90 ----------------------------- 4 files changed, 6 insertions(+), 112 deletions(-)
New commits: commit e2b7dc3fcd8cc926d54ddcca0d268fbd3b123a7f Author: Thomas Arnhold <tho...@arnhold.org> Date: Sun Jul 29 14:41:00 2012 +0200 Partially revert "Remove unused defines" This partially reverts 278000a28b8eceb8528ebdcf1d601de8192979e8 http://lists.freedesktop.org/archives/libreoffice/2012-July/035331.html Change-Id: If79b1c82653b8626dd83050b8a91cb17f556870f diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx index d052ce7..bfe7ff2 100644 --- a/filter/source/graphicfilter/icgm/chart.hxx +++ b/filter/source/graphicfilter/icgm/chart.hxx @@ -35,7 +35,7 @@ #define PIECHART 21 /* Standard pie chart file. */ #define ORGCHART 26 /* Standard org chart file. */ #define TTLCHART 31 /* Title chart file. */ -// BULCHART 32 /* Bullet chart file. */ +#define BULCHART 32 /* Bullet chart file. */ #define TABCHART 33 /* Table chart file. */ #define DRWCHART 41 /* Chart with drawings only.*/ #define MLTCHART 42 /* Multiple chart file. */ @@ -44,16 +44,16 @@ #define SYMFILE 47 /* Symbol file. */ /* the following were added although SPC doesn't have a #define */ /* for them... */ -// AUTOTTLCHT 95 /* Autobuild TTL CHT */ -// AUTOBULCHT 96 /* Autobuild BUL CHT */ -// AUTOTABCHT 97 /* Autobuild TAB CHT */ +#define AUTOTTLCHT 95 /* Autobuild TTL CHT */ +#define AUTOBULCHT 96 /* Autobuild BUL CHT */ +#define AUTOTABCHT 97 /* Autobuild TAB CHT */ /* FNC 10/11/93: for the chart stream, ALLCHART was added. */ /* It is used specifically by PPT in its Template to let */ /* us know that the template applies to all charts, not to */ /* one specific chart type. */ #define ALLCHART 127 /* Applies to all chart types */ -// ALLCHART_TPL 255 /* Applies to all chart types */ +#define ALLCHART_TPL 255 /* Applies to all chart types */ #define IOC_CHTTITLE 1 /* Title for any chart. */ #define IOC_CHTFOOTNOTE 2 /* ::com::sun::star::text::Footnote for any chart. */ diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 0e5e697..4093758 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -140,7 +140,7 @@ using namespace ::comphelper; #define TBI_SEARCHDIALOG 1008 #define TBI_SOURCEVIEW 1009 #define TBI_SELECTIONMODE 1010 -// TBI_ONSTARTUP 1011 +#define TBI_ONSTARTUP 1011 #define CONFIGNAME_HELPWIN DEFINE_CONST_UNICODE("OfficeHelp") #define CONFIGNAME_INDEXWIN DEFINE_CONST_UNICODE("OfficeHelpIndex") commit 9c0224d5045ec14c993509c39dc3d04e25a4d662 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sun Jul 29 14:26:25 2012 +0200 Remove some unused definitions in icgm Change-Id: I801d161b6de344c76662bbc019c864c0878dfa2d diff --git a/filter/source/graphicfilter/icgm/main.hxx b/filter/source/graphicfilter/icgm/main.hxx index a48dc5c..c97ea6c 100644 --- a/filter/source/graphicfilter/icgm/main.hxx +++ b/filter/source/graphicfilter/icgm/main.hxx @@ -22,22 +22,6 @@ #include "cgm.hxx" -// --------------------------------------------------------------- - -// CGM_LEVEL1 0x0001 // VERSION 1 METAFILE -// CGM_LEVEL2 0x0002 -// CGM_LEVEL3 0x0003 -// CGM_GDSF_ONLY 0x00F0 -// CGM_GDSF_ONLY 0x00F0 -#define CGM_UNKNOWN_LEVEL 0x00F1 -#define CGM_UNKNOWN_COMMAND 0x00F2 -#define CGM_DESCRIPTION 0x00F3 - -#define CGM_EXTENDED_PRIMITIVES_SET 0x0100 // INDICATES PRIMITIVES WHICH ARE AVAILABLE IN - // LEVEL 1 BUT ARE NOT DEFINED IN ISO 7942(GKS) -#define CGM_DRAWING_PLUS_CONTROL_SET 0x0200 // INDICATES THAT THIS IS AN ADDITIONAL LEVEL 1 - // ELEMENT - #define BMCOL( _col ) BitmapColor( (sal_Int8)(_col >> 16 ), (sal_Int8)( _col >> 8 ), (sal_Int8)_col ) #include <vcl/salbtype.hxx> commit a5a1b5d07b6e614b71a344589470ae89b15a5bac Author: Thomas Arnhold <tho...@arnhold.org> Date: Sun Jul 29 12:33:07 2012 +0200 svarray.hxx: clean out much more cruft Change-Id: Id506fdcd832aca1f55b2406d9232a55ed55e6c19 diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index 12e31a8..4aebb4a 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -109,60 +109,6 @@ private:\ #define SV_DECL_PTRARR_VISIBILITY(nm, AE, IS, vis)\ SV_DECL_PTRARR_GEN(nm, AE, IS, SvPtrarr, AE &, VoidPtr &, vis ) -#define SV_DECL_PTRARR_DEL_GEN(nm, AE, IS, Base, AERef, VPRef, vis )\ -class vis nm: public Base \ -{\ -public:\ - nm( sal_uInt16 nIni=IS )\ - : Base(nIni) {}\ - ~nm() { DeleteAndDestroy( 0, Count() ); }\ - void Insert( const nm *pI, sal_uInt16 nP, \ - sal_uInt16 nS = 0, sal_uInt16 nE = USHRT_MAX ) {\ - Base::Insert((const Base*)pI, nP, nS, nE);\ - }\ - void Insert( const AERef aE, sal_uInt16 nP ) {\ - Base::Insert((const VPRef)aE, nP );\ - }\ - void Insert( const AE *pE, sal_uInt16 nL, sal_uInt16 nP ) {\ - Base::Insert( (const VoidPtr *)pE, nL, nP );\ - }\ - void Replace( const AERef aE, sal_uInt16 nP ) {\ - Base::Replace( (const VPRef)aE, nP );\ - }\ - void Replace( const AE *pE, sal_uInt16 nL, sal_uInt16 nP ) {\ - Base::Replace( (const VoidPtr*)pE, nL, nP );\ - }\ - void Remove( sal_uInt16 nP, sal_uInt16 nL = 1) {\ - Base::Remove(nP,nL);\ - }\ - const AE* GetData() const {\ - return (const AE*)Base::GetData();\ - }\ - AE operator[]( sal_uInt16 nP )const { \ - return (AE)Base::operator[](nP); }\ - AE GetObject( sal_uInt16 nP )const { \ - return (AE)Base::GetObject(nP); }\ - \ - sal_uInt16 GetPos( const AERef aE ) const { \ - return Base::GetPos((const VPRef)aE);\ - } \ - void DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL=1 );\ -private:\ - nm( const nm& );\ - nm& operator=( const nm& );\ -}; - -#define SV_IMPL_PTRARR_GEN(nm, AE, Base)\ -void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )\ -{ \ - if( nL ) {\ - OSL_ENSURE( nP < nA && nP + nL <= nA,"Del");\ - for( sal_uInt16 n=nP; n < nP + nL; n++ ) \ - delete *((AE*)pData+n); \ - Base::Remove( nP, nL ); \ - } \ -} - typedef void* VoidPtr; typedef sal_Bool (*FnForEach_SvPtrarr)( const VoidPtr&, void* ); class SVL_DLLPUBLIC SvPtrarr @@ -299,38 +245,6 @@ sal_Bool nm::Seek_Entry( const AE aE, sal_uInt16* pP ) const\ return sal_False;\ } -#define _SV_SEEK_OBJECT( nm,AE )\ -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--;\ - while( nU <= nO )\ - {\ - nM = nU + ( nO - nU ) / 2;\ - if( *(pData + nM) == aE )\ - {\ - if( pP ) *pP = nM;\ - return sal_True;\ - }\ - else if( *(pData + nM) < 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_SORTAR_ALG(nm, AE)\ void nm::Insert( const nm * pI, sal_uInt16 nS, sal_uInt16 nE )\ {\ @@ -454,13 +368,9 @@ _SV_SEEK_PTR_TO_OBJECT( nm,AE ) #if defined(ICC) || defined(GCC) || (defined(WNT) && _MSC_VER >= 1400) #define C40_INSERT( c, p, n ) Insert( (c const *&) p, n ) -#define C40_PTR_INSERT( c, p ) Insert( (c const *&) p ) -#define C40_REPLACE( c, p, n ) Replace( (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_PTR_INSERT( c, p ) Insert( p ) -#define C40_REPLACE( c, p, n ) Replace( p, n ) #define C40_GETPOS( c, r) GetPos( r ) #endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits