summaryrefslogtreecommitdiff
path: root/svl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'svl/inc')
-rw-r--r--svl/inc/svl/filerec.hxx6
-rw-r--r--svl/inc/svl/svarray.hxx109
-rw-r--r--svl/inc/svl/svdde.hxx16
-rw-r--r--svl/inc/svl/svstdarr.hxx2
-rw-r--r--svl/inc/svl/zforlist.hxx4
5 files changed, 67 insertions, 70 deletions
diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx
index 5c3a8dd1c6ab..214ff22a41c5 100644
--- a/svl/inc/svl/filerec.hxx
+++ b/svl/inc/svl/filerec.hxx
@@ -36,7 +36,7 @@
#include <tools/stream.hxx>
#include <svl/svarray.hxx>
-SV_DECL_VARARR( SfxUINT32s, sal_uInt32, 8, 8 )
+SV_DECL_VARARR( SfxUINT32s, sal_uInt32, 8 )
//------------------------------------------------------------------------
@@ -453,8 +453,8 @@ protected:
SfxMultiFixRecordWriter( sal_uInt8 nRecordType,
SvStream *pStream,
- sal_uInt16 nTag, sal_uInt8 nCurVer,
- sal_uInt32 nContentSize );
+ sal_uInt16 nTag,
+ sal_uInt8 nCurVer );
public:
inline ~SfxMultiFixRecordWriter();
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 7fe833de556e..f1b9bb4a5a98 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -152,7 +152,7 @@ void nm::Insert( const nm *pI, sal_uInt16 nP, sal_uInt16 nStt, sal_uInt16 nE)\
#endif
-#define _SV_DECL_VARARR_GEN(nm, AE, IS, GS, AERef, vis )\
+#define _SV_DECL_VARARR_GEN(nm, AE, IS, AERef, vis )\
typedef sal_Bool (*FnForEach_##nm)( const AERef, void* );\
class vis nm\
{\
@@ -164,7 +164,7 @@ protected:\
void _resize(size_t n);\
\
public:\
- nm( sal_uInt16= IS, sal_uInt8= GS );\
+ nm( sal_uInt16= IS );\
~nm() { rtl_freeMemory( pData ); }\
\
_SVVARARR_DEF_GET_OP_INLINE(nm, AE )\
@@ -192,24 +192,21 @@ public:\
CONCAT( FnForEach_, nm ) fnCall, void* pArgs = 0 );\
\
-#define _SV_DECL_VARARR(nm, AE, IS, GS ) \
-_SV_DECL_VARARR_GEN(nm, AE, IS, GS, AE & )
-
-#define SV_DECL_VARARR_GEN(nm, AE, IS, GS, AERef, vis )\
-_SV_DECL_VARARR_GEN(nm, AE, IS, GS, AERef, vis )\
+#define SV_DECL_VARARR_GEN(nm, AE, IS, AERef, vis )\
+_SV_DECL_VARARR_GEN(nm, AE, IS, AERef, vis )\
private:\
nm( const nm& );\
nm& operator=( const nm& );\
};
-#define SV_DECL_VARARR(nm, AE, IS, GS ) \
-SV_DECL_VARARR_GEN(nm, AE, IS, GS, AE &, )
+#define SV_DECL_VARARR(nm, AE, IS) \
+SV_DECL_VARARR_GEN(nm, AE, IS, AE &, )
-#define SV_DECL_VARARR_VISIBILITY(nm, AE, IS, GS, vis ) \
-SV_DECL_VARARR_GEN(nm, AE, IS, GS, AE &, vis )
+#define SV_DECL_VARARR_VISIBILITY(nm, AE, IS, vis ) \
+SV_DECL_VARARR_GEN(nm, AE, IS, AE &, vis )
#define SV_IMPL_VARARR_GEN( nm, AE, AERef )\
-nm::nm( sal_uInt16 nInit, sal_uInt8 )\
+nm::nm( sal_uInt16 nInit )\
: pData (0),\
nFree (nInit),\
nA (0)\
@@ -310,21 +307,21 @@ _SVVARARR_IMPL_GET_OP_INLINE(nm, AE )\
#define SV_IMPL_VARARR( nm, AE ) \
SV_IMPL_VARARR_GEN( nm, AE, AE & )
-#define _SV_DECL_PTRARR_DEF_GEN( nm, AE, IS, GS, AERef, vis )\
-_SV_DECL_VARARR_GEN( nm, AE, IS, GS, AERef, vis)\
+#define _SV_DECL_PTRARR_DEF_GEN( nm, AE, IS, AERef, vis )\
+_SV_DECL_VARARR_GEN( nm, AE, IS, AERef, vis)\
sal_uInt16 GetPos( const AERef aE ) const;\
};
-#define _SV_DECL_PTRARR_DEF( nm, AE, IS, GS, vis )\
-_SV_DECL_PTRARR_DEF_GEN( nm, AE, IS, GS, AE &, vis )
+#define _SV_DECL_PTRARR_DEF( nm, AE, IS, vis )\
+_SV_DECL_PTRARR_DEF_GEN( nm, AE, IS, AE &, vis )
-#define SV_DECL_PTRARR_GEN(nm, AE, IS, GS, Base, AERef, VPRef, vis )\
+#define SV_DECL_PTRARR_GEN(nm, AE, IS, Base, AERef, VPRef, vis )\
typedef sal_Bool (*FnForEach_##nm)( const AERef, void* );\
class vis nm: public Base \
{\
public:\
- nm( sal_uInt16 nIni=IS, sal_uInt8 nG=GS )\
- : Base(nIni,nG) {}\
+ nm( sal_uInt16 nIni=IS )\
+ : Base(nIni) {}\
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);\
@@ -370,19 +367,19 @@ private:\
nm& operator=( const nm& );\
};
-#define SV_DECL_PTRARR(nm, AE, IS, GS )\
-SV_DECL_PTRARR_GEN(nm, AE, IS, GS, SvPtrarr, AE &, VoidPtr &, )
+#define SV_DECL_PTRARR(nm, AE, IS)\
+SV_DECL_PTRARR_GEN(nm, AE, IS, SvPtrarr, AE &, VoidPtr &, )
-#define SV_DECL_PTRARR_VISIBILITY(nm, AE, IS, GS, vis )\
-SV_DECL_PTRARR_GEN(nm, AE, IS, GS, SvPtrarr, AE &, VoidPtr &, vis )
+#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, GS, Base, AERef, VPRef, vis )\
+#define SV_DECL_PTRARR_DEL_GEN(nm, AE, IS, Base, AERef, VPRef, vis )\
typedef sal_Bool (*FnForEach_##nm)( const AERef, void* );\
class vis nm: public Base \
{\
public:\
- nm( sal_uInt16 nIni=IS, sal_uInt8 nG=GS )\
- : Base(nIni,nG) {}\
+ 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 ) {\
@@ -429,11 +426,11 @@ private:\
nm& operator=( const nm& );\
};
-#define SV_DECL_PTRARR_DEL(nm, AE, IS, GS )\
-SV_DECL_PTRARR_DEL_GEN(nm, AE, IS, GS, SvPtrarr, AE &, VoidPtr &, )
+#define SV_DECL_PTRARR_DEL(nm, AE, IS)\
+SV_DECL_PTRARR_DEL_GEN(nm, AE, IS, SvPtrarr, AE &, VoidPtr &, )
-#define SV_DECL_PTRARR_DEL_VISIBILITY(nm, AE, IS, GS, vis )\
-SV_DECL_PTRARR_DEL_GEN(nm, AE, IS, GS, SvPtrarr, AE &, VoidPtr &, vis)
+#define SV_DECL_PTRARR_DEL_VISIBILITY(nm, AE, IS, vis)\
+SV_DECL_PTRARR_DEL_GEN(nm, AE, IS, SvPtrarr, AE &, VoidPtr &, vis)
#define SV_IMPL_PTRARR_GEN(nm, AE, Base)\
void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )\
@@ -450,17 +447,17 @@ void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )\
SV_IMPL_PTRARR_GEN(nm, AE, SvPtrarr )
typedef void* VoidPtr;
-_SV_DECL_PTRARR_DEF( SvPtrarr, VoidPtr, 0, 1, SVL_DLLPUBLIC )
+_SV_DECL_PTRARR_DEF( SvPtrarr, VoidPtr, 0, SVL_DLLPUBLIC )
// SORTARR - Begin
-#define _SORT_CLASS_DEF(nm, AE, IS, GS, vis)\
+#define _SORT_CLASS_DEF(nm, AE, IS, vis)\
typedef sal_Bool (*FnForEach_##nm)( const AE&, void* );\
class vis nm : private nm##_SAR \
{\
public:\
- nm(sal_uInt16 nSize = IS, sal_uInt8 nG = GS)\
- : nm##_SAR(nSize,nG) {}\
+ nm(sal_uInt16 nSize = IS)\
+ : nm##_SAR(nSize) {}\
void Insert( const nm *pI, sal_uInt16 nS=0, sal_uInt16 nE=USHRT_MAX );\
sal_Bool Insert( const AE& aE );\
sal_Bool Insert( const AE& aE, sal_uInt16& rP );\
@@ -630,9 +627,9 @@ void nm::Remove( const AE &aE, sal_uInt16 nL )\
return SvPtrarr::GetPos((const VoidPtr&)aE);\
}
-#define _SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, GS, vis)\
-SV_DECL_PTRARR_VISIBILITY(nm##_SAR, AE, IS, GS, vis)\
-_SORT_CLASS_DEF(nm, AE, IS, GS, vis)\
+#define _SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, vis)\
+SV_DECL_PTRARR_VISIBILITY(nm##_SAR, AE, IS, vis)\
+_SORT_CLASS_DEF(nm, AE, IS, vis)\
AE operator[](sal_uInt16 nP) const {\
return nm##_SAR::operator[]( nP );\
}\
@@ -654,37 +651,37 @@ _SORT_CLASS_DEF(nm, AE, IS, GS, vis)\
\
/* Das Ende stehe im DECL-Makro !!! */
-#define _SV_DECL_PTRARR_SORT(nm, AE, IS, GS, vis)\
-_SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, GS, vis)\
+#define _SV_DECL_PTRARR_SORT(nm, AE, IS, vis)\
+_SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, vis)\
private:\
nm( const nm& );\
nm& operator=( const nm& );\
};
-#define SV_DECL_PTRARR_SORT(nm, AE, IS, GS)\
-_SV_DECL_PTRARR_SORT(nm, AE, IS, GS, )
+#define SV_DECL_PTRARR_SORT(nm, AE, IS)\
+_SV_DECL_PTRARR_SORT(nm, AE, IS,)
-#define SV_DECL_PTRARR_SORT_VISIBILITY(nm, AE, IS, GS, vis)\
-_SV_DECL_PTRARR_SORT(nm, AE, IS, GS, vis)
+#define SV_DECL_PTRARR_SORT_VISIBILITY(nm, AE, IS, vis)\
+_SV_DECL_PTRARR_SORT(nm, AE, IS, vis)
-#define _SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS, vis)\
-_SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, GS, vis)\
+#define _SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, vis)\
+_SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, vis)\
~nm() { DeleteAndDestroy( 0, Count() ); }\
private:\
nm( const nm& );\
nm& operator=( const nm& );\
};
-#define SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS)\
-_SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS, )
+#define SV_DECL_PTRARR_SORT_DEL(nm, AE, IS)\
+_SV_DECL_PTRARR_SORT_DEL(nm, AE, IS,)
-#define SV_DECL_PTRARR_SORT_DEL_VISIBILITY(nm, AE, IS, GS, vis)\
-_SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS, vis)
+#define SV_DECL_PTRARR_SORT_DEL_VISIBILITY(nm, AE, IS, vis)\
+_SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, vis)
-#define _SV_DECL_VARARR_SORT(nm, AE, IS, GS, vis)\
-SV_DECL_VARARR_VISIBILITY(nm##_SAR, AE, IS, GS, vis)\
-_SORT_CLASS_DEF(nm, AE, IS, GS, vis) \
+#define _SV_DECL_VARARR_SORT(nm, AE, IS, vis)\
+SV_DECL_VARARR_VISIBILITY(nm##_SAR, AE, IS, vis)\
+_SORT_CLASS_DEF(nm, AE, IS, vis) \
const AE& operator[](sal_uInt16 nP) const {\
return nm##_SAR::operator[]( nP );\
}\
@@ -706,11 +703,11 @@ private:\
nm& operator=( const nm& );\
};
-#define SV_DECL_VARARR_SORT(nm, AE, IS, GS)\
-_SV_DECL_VARARR_SORT(nm, AE, IS, GS,)
+#define SV_DECL_VARARR_SORT(nm, AE, IS)\
+_SV_DECL_VARARR_SORT(nm, AE, IS,)
-#define SV_DECL_VARARR_SORT_VISIBILITY(nm, AE, IS, GS, vis)\
-_SV_DECL_VARARR_SORT(nm, AE, IS, GS, vis)
+#define SV_DECL_VARARR_SORT_VISIBILITY(nm, AE, IS, vis)\
+_SV_DECL_VARARR_SORT(nm, AE, IS, vis)
#define SV_IMPL_PTRARR_SORT( nm,AE )\
_SV_IMPL_SORTAR_ALG( nm,AE )\
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index 8fb7b2f06f8d..0791329d1c36 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -81,8 +81,8 @@ class SVL_DLLPUBLIC DdeData
public:
DdeData();
- DdeData( const void*, long, sal_uLong = FORMAT_STRING );
- DdeData( const String& );
+ DdeData( SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER sal_uLong = FORMAT_STRING );
+ DdeData( SAL_UNUSED_PARAMETER const String& );
DdeData( const DdeData& );
~DdeData();
@@ -117,7 +117,7 @@ protected:
Link aDone;
sal_Bool bBusy;
- DdeTransaction( DdeConnection&, const String&, long = 0 );
+ DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const String&, SAL_UNUSED_PARAMETER long = 0 );
public:
virtual ~DdeTransaction();
@@ -203,7 +203,7 @@ class SVL_DLLPUBLIC DdePoke : public DdeTransaction
public:
DdePoke( DdeConnection&, const String&, const char*, long,
sal_uLong = FORMAT_STRING, long = 0 );
- DdePoke( DdeConnection&, const String&, const DdeData&, long = 0 );
+ DdePoke( DdeConnection&, const String&, SAL_UNUSED_PARAMETER const DdeData&, long = 0 );
DdePoke( DdeConnection&, const String&, const String&, long = 0 );
};
@@ -231,7 +231,7 @@ class SVL_DLLPUBLIC DdeConnection
DdeImp* pImp;
public:
- DdeConnection( const String&, const String& );
+ DdeConnection( SAL_UNUSED_PARAMETER const String&, SAL_UNUSED_PARAMETER const String& );
~DdeConnection();
long GetError();
@@ -269,7 +269,7 @@ protected:
public:
DdeItem( const sal_Unicode* );
- DdeItem( const String& );
+ DdeItem( SAL_UNUSED_PARAMETER const String& );
DdeItem( const DdeItem& );
virtual ~DdeItem();
@@ -332,7 +332,7 @@ private:
Link aExecLink;
public:
- DdeTopic( const String& );
+ DdeTopic( SAL_UNUSED_PARAMETER const String& );
virtual ~DdeTopic();
const String& GetName() const;
@@ -397,7 +397,7 @@ private:
SVL_DLLPRIVATE sal_Bool HasCbFormat( sal_uInt16 );
public:
- DdeService( const String& );
+ DdeService( SAL_UNUSED_PARAMETER const String& );
virtual ~DdeService();
const String& GetName() const;
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 4f3793f7b8eb..25f2329466e3 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -45,7 +45,7 @@
typedef String* StringPtr;
#ifndef _SVSTDARR_STRINGSISORTDTOR_DECL
-SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsISortDtor, StringPtr, 1, 1, SVL_DLLPUBLIC )
+SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsISortDtor, StringPtr, 1, SVL_DLLPUBLIC )
#define _SVSTDARR_STRINGSISORTDTOR_DECL
#endif
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 19d408768699..aa68fc100f79 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -313,9 +313,9 @@ public:
};
typedef NfCurrencyEntry* NfCurrencyEntryPtr;
-SV_DECL_PTRARR_DEL( NfCurrencyTable, NfCurrencyEntryPtr, 128, 1 )
+SV_DECL_PTRARR_DEL( NfCurrencyTable, NfCurrencyEntryPtr, 128 )
typedef String* WSStringPtr;
-SV_DECL_PTRARR_DEL_VISIBILITY( NfWSStringsDtor, WSStringPtr, 8, 1, SVL_DLLPUBLIC )
+SV_DECL_PTRARR_DEL_VISIBILITY( NfWSStringsDtor, WSStringPtr, 8, SVL_DLLPUBLIC )
class SvNumberFormatterRegistry_Impl;
generated by cgit (git 2.34.1) at 2024-08-03 00:57:57 +0000