diff options
Diffstat (limited to 'svl')
25 files changed, 125 insertions, 176 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; diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index b3a123754dd0..b2ebbd0f8b04 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -368,8 +368,7 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter sal_uInt8 nRecordType, // Subklassen Record-Kennung SvStream* pStream, // Stream, in dem der Record angelegt wird sal_uInt16 nContentTag, // Content-Art-Kennung - sal_uInt8 nContentVer, // Content-Versions-Kennung - sal_uInt32 // Gr"o\se jedes einzelnen Contents in Bytes + sal_uInt8 nContentVer // Content-Versions-Kennung ) /* [Beschreibung] @@ -426,7 +425,7 @@ SfxMultiVarRecordWriter::SfxMultiVarRecordWriter Interner Ctor f"ur Subklassen. */ -: SfxMultiFixRecordWriter( nRecordType, pStream, nRecordTag, nRecordVer, 0 ), +: SfxMultiFixRecordWriter( nRecordType, pStream, nRecordTag, nRecordVer ), _nContentVer( 0 ) { } @@ -454,7 +453,7 @@ SfxMultiVarRecordWriter::SfxMultiVarRecordWriter */ : SfxMultiFixRecordWriter( SFX_REC_TYPE_VARSIZE, - pStream, nRecordTag, nRecordVer, 0 ), + pStream, nRecordTag, nRecordVer ), _nContentVer( 0 ) { } diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index e092808f1a60..8e21da666b4f 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -31,7 +31,6 @@ #include "cppuhelper/factory.hxx" #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/io/XSeekable.hpp> @@ -88,7 +87,6 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance() static_cast< OWeakObject* >( new FSStorage( aResultContent, embed::ElementModes::READWRITE, - uno::Sequence< beans::PropertyValue >(), m_xFactory ) ), uno::UNO_QUERY ); } @@ -143,38 +141,6 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA throw uno::Exception(); // TODO: Illegal argument } - // retrieve mediadescriptor and set storage properties - uno::Sequence< beans::PropertyValue > aDescr; - uno::Sequence< beans::PropertyValue > aPropsToSet; - - if ( nArgNum >= 3 ) - { - if( aArguments[2] >>= aDescr ) - { - aPropsToSet.realloc(1); - aPropsToSet[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); - aPropsToSet[0].Value <<= aURL; - - for ( sal_Int32 nInd = 0, nNumArgs = 1; nInd < aDescr.getLength(); nInd++ ) - { - if ( aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ) ) ) - { - aPropsToSet.realloc( ++nNumArgs ); - aPropsToSet[nNumArgs-1].Name = aDescr[nInd].Name; - aPropsToSet[nNumArgs-1].Value = aDescr[nInd].Value; - break; - } - else - OSL_FAIL( "Unacceptable property, will be ignored!\n" ); - } - } - else - { - OSL_FAIL( "Wrong third argument!\n" ); - throw uno::Exception(); // TODO: Illegal argument - } - } - // allow to use other ucp's // if ( !isLocalNotFile_Impl( aURL ) ) if ( aURL.equalsIgnoreAsciiCaseAsciiL( "vnd.sun.star.pkg", 16 ) @@ -186,7 +152,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA } if ( ( nStorageMode & embed::ElementModes::WRITE ) && !( nStorageMode & embed::ElementModes::NOCREATE ) ) - FSStorage::MakeFolderNoUI( aURL, sal_False ); + FSStorage::MakeFolderNoUI( aURL ); else if ( !::utl::UCBContentHelper::IsFolder( aURL ) ) throw io::IOException(); // there is no such folder @@ -197,7 +163,6 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA return uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( new FSStorage( aResultContent, nStorageMode, - aPropsToSet, m_xFactory ) ), uno::UNO_QUERY ); } @@ -234,7 +199,8 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorageFactory::getSupportedServiceN extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL fsstorage_component_getFactory ( - const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */) + const sal_Char * pImplementationName, void * pServiceManager, + SAL_UNUSED_PARAMETER void * /* pRegistryKey */) { void * pResult = 0; if (pServiceManager) diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 47f52f475ce4..cf4fb57bf8d3 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -153,7 +153,6 @@ FSStorage_Impl::~FSStorage_Impl() //----------------------------------------------- FSStorage::FSStorage( const ::ucbhelper::Content& aContent, sal_Int32 nMode, - uno::Sequence< beans::PropertyValue >, uno::Reference< lang::XMultiServiceFactory > xFactory ) : m_pImpl( new FSStorage_Impl( aContent, nMode, xFactory ) ) { @@ -179,7 +178,7 @@ FSStorage::~FSStorage() } //----------------------------------------------- -sal_Bool FSStorage::MakeFolderNoUI( const ::rtl::OUString& rFolder, sal_Bool ) +sal_Bool FSStorage::MakeFolderNoUI( const ::rtl::OUString& rFolder ) { INetURLObject aURL( rFolder ); ::rtl::OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); @@ -613,12 +612,12 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( { ::utl::UCBContentHelper::Kill( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) ); bFolderExists = - MakeFolderNoUI( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ), sal_True ); // TODO: not atomar :( + MakeFolderNoUI( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) ); // TODO: not atomar :( } else if ( !bFolderExists ) { bFolderExists = - MakeFolderNoUI( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ), sal_True ); // TODO: not atomar :( + MakeFolderNoUI( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) ); // TODO: not atomar :( } } else if ( ( nStorageMode & embed::ElementModes::TRUNCATE ) ) @@ -631,7 +630,6 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( xResult = uno::Reference< embed::XStorage >( static_cast< OWeakObject* >( new FSStorage( aResultContent, nStorageMode, - uno::Sequence< beans::PropertyValue >(), m_pImpl->m_xFactory ) ), uno::UNO_QUERY ); } diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx index 87430ec21069..6b1c69bd5496 100644 --- a/svl/source/fsstor/fsstorage.hxx +++ b/svl/source/fsstor/fsstorage.hxx @@ -33,7 +33,6 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -61,7 +60,6 @@ public: FSStorage( const ::ucbhelper::Content& aContent, sal_Int32 nMode, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > xProperties, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory ); virtual ~FSStorage(); @@ -75,7 +73,7 @@ public: void CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest ); - static sal_Bool MakeFolderNoUI( const ::rtl::OUString& rFolder, sal_Bool bNewOnly ); + static sal_Bool MakeFolderNoUI( const ::rtl::OUString& rFolder ); //____________________________________________________________________________________________________ // XInterface diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index f0abc4badbf1..a400fb47c80c 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -33,9 +33,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase2.hxx> - -class FSStorage; - class FSStorageFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleServiceFactory, ::com::sun::star::lang::XServiceInfo > { diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index d66dd12325ee..66886545dbc5 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -46,7 +46,7 @@ struct SfxAllEnumValue_Impl XubString aText; }; -SV_DECL_PTRARR_DEL(SfxAllEnumValueArr, SfxAllEnumValue_Impl*, 0, 8) +SV_DECL_PTRARR_DEL(SfxAllEnumValueArr, SfxAllEnumValue_Impl*, 0) SV_IMPL_PTRARR(SfxAllEnumValueArr, SfxAllEnumValue_Impl*) // ----------------------------------------------------------------------- diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 01bb16089e31..62ac9f25d5f6 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -104,14 +104,8 @@ SfxItemSet::SfxItemSet SfxItemPool& rPool, /* der Pool, in dem die SfxPoolItems, welche in dieses SfxItemSet gelangen, aufgenommen werden sollen */ - sal_Bool -#ifdef DBG_UTIL -#ifdef SFX_ITEMSET_NO_DEFAULT_CTOR - - bTotalRanges /* komplette Pool-Ranges uebernehmen, + sal_Bool bTotalRanges /* komplette Pool-Ranges uebernehmen, muss auf sal_True gesetzt werden */ -#endif -#endif ) /* [Beschreibung] @@ -134,11 +128,11 @@ SfxItemSet::SfxItemSet DBG( _pChildCountCtor; *_pChildCount(this) = 0 ); // DBG_ASSERT( bTotalRanges || abs( &bTotalRanges - this ) < 1000, // "please use suitable ranges" ); -#ifdef DBG_UTIL -#ifdef SFX_ITEMSET_NO_DEFAULT_CTOR +#if defined DBG_UTIL && defined SFX_ITEMSET_NO_DEFAULT_CTOR if ( !bTotalRanges ) *(int*)0 = 0; // GPF -#endif +#else + (void) bTotalRanges; // avoid warnings #endif _pWhichRanges = (sal_uInt16*) _pPool->GetFrozenIdRanges(); diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx index 5e0df36bb508..ba34369a7a59 100644 --- a/svl/source/notify/brdcst.cxx +++ b/svl/source/notify/brdcst.cxx @@ -34,7 +34,7 @@ #include <svl/smplhint.hxx> #include <svl/lstner.hxx> -SV_DECL_PTRARR( SfxListenerArr_Impl, SfxListener*, 0, 2 ) +SV_DECL_PTRARR( SfxListenerArr_Impl, SfxListener*, 0 ) #define _SFX_BRDCST_CXX #include <svl/brdcst.hxx> diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index 812c7ff0b185..a5eb2d0b61ad 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.cxx @@ -32,7 +32,7 @@ #include <svl/hint.hxx> #include <svl/brdcst.hxx> -SV_DECL_PTRARR( SfxBroadcasterArr_Impl, SfxBroadcaster*, 0, 2 ) +SV_DECL_PTRARR( SfxBroadcasterArr_Impl, SfxBroadcaster*, 0 ) #define _SFX_LSTNER_CXX #include <svl/lstner.hxx> diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index c678876dd033..cd7761ed3732 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -136,7 +136,7 @@ SvNumberFormatterServiceObj::~SvNumberFormatterServiceObj() { } -com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvNumberFormatterServiceObj_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) +com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvNumberFormatterServiceObj_CreateInstance( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) { return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new SvNumberFormatterServiceObj ); } diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 9ffecbae62cc..9a0c59a45710 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -2475,7 +2475,6 @@ bool ImpSvNumberInputScan::ScanStringNumFor( bool ImpSvNumberInputScan::IsNumberFormatMain( const String& rString, // string to be analyzed - double& , // OUT: result as number, if possible const SvNumberformat* pFormat ) // maybe number format set to match against { Reset(); @@ -2869,7 +2868,7 @@ bool ImpSvNumberInputScan::IsNumberFormat( aString = pFormatter->GetCharClass()->uppercase( rString ); // convert native number to ASCII if necessary TransformInput( aString ); - res = IsNumberFormatMain( aString, fOutNumber, pFormat ); + res = IsNumberFormatMain( aString, pFormat ); } if (res) diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx index ce6d897778c5..e808c30e77d7 100644 --- a/svl/source/numbers/zforfind.hxx +++ b/svl/source/numbers/zforfind.hxx @@ -327,7 +327,6 @@ private: //! converted to ASCII. bool IsNumberFormatMain( // Main anlyzing function const String& rString, - double& fOutNumber, // return value if string is numeric const SvNumberformat* pFormat = NULL // optional number format to match against ); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index ed7b523a17be..eecd7439cd03 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3184,7 +3184,7 @@ const NfCurrencyEntry* SvNumberFormatter::GetLegacyOnlyCurrencyEntry( // static -IMPL_STATIC_LINK_NOINSTANCE( SvNumberFormatter, CurrencyChangeLink, void*, EMPTYARG ) +IMPL_STATIC_LINK_NOINSTANCE( SvNumberFormatter, CurrencyChangeLink, SAL_UNUSED_PARAMETER void*, EMPTYARG ) { ::osl::MutexGuard aGuard( GetMutex() ); String aAbbrev; @@ -4092,15 +4092,13 @@ void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr, // static -sal_uInt16 NfCurrencyEntry::GetEffectivePositiveFormat( sal_uInt16 -#if ! NF_BANKSYMBOL_FIX_POSITION - nIntlFormat -#endif - , sal_uInt16 nCurrFormat, bool bBank ) +sal_uInt16 NfCurrencyEntry::GetEffectivePositiveFormat( + sal_uInt16 nIntlFormat, sal_uInt16 nCurrFormat, bool bBank ) { if ( bBank ) { #if NF_BANKSYMBOL_FIX_POSITION + (void) nIntlFormat; // avoid warnings return 3; #else switch ( nIntlFormat ) diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index af3c866b55d4..069d2d3941e9 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -1075,7 +1075,7 @@ bool ImpSvNumberformatScan::Is100SecZero( sal_uInt16 i, bool bHadDecSep ) // SS"any"00 take "any" as a valid decimal separator } -xub_StrLen ImpSvNumberformatScan::ScanType(const String&) +xub_StrLen ImpSvNumberformatScan::ScanType() { const LocaleDataWrapper* pLoc = pFormatter->GetLocaleData(); @@ -2714,7 +2714,7 @@ xub_StrLen ImpSvNumberformatScan::ScanFormat( String& rString ) { xub_StrLen res = Symbol_Division(rString); //lexikalische Analyse if (!res) - res = ScanType(rString); // Erkennung des Formattyps + res = ScanType(); // Erkennung des Formattyps if (!res) res = FinalScan( rString ); // Typabhaengige Endanalyse return res; // res = Kontrollposition diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx index b34a5afdeda8..8cd22b52a5c8 100644 --- a/svl/source/numbers/zforscan.hxx +++ b/svl/source/numbers/zforscan.hxx @@ -249,7 +249,7 @@ private: // ---- privater Teil xub_StrLen& nPos, String& sSymbol); // Naechstes Symbol xub_StrLen Symbol_Division(const String& rString);// lexikalische Voranalyse - xub_StrLen ScanType(const String& rString); // Analyse des Formattyps + xub_StrLen ScanType(); // Analyse des Formattyps xub_StrLen FinalScan( String& rString ); // Endanalyse mit Vorgabe des Typs // -1:= error, return nPos in FinalScan; 0:= no calendar, 1:= calendar found diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 3afa5a5303f7..52bdbcb17e20 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -1532,7 +1532,9 @@ MasterPasswordRequest_Impl::MasterPasswordRequest_Impl( PasswordRequestMode Mode extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL passwordcontainer_component_getFactory ( - const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */) + const sal_Char * pImplementationName, + SAL_UNUSED_PARAMETER void * pServiceManager, + SAL_UNUSED_PARAMETER void * /* pRegistryKey */) { void * pResult = 0; if (pServiceManager) diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 6ec9a2bcb17d..e4fc303a7d10 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -50,7 +50,7 @@ struct DdeItemImpData DdeItemImpData( sal_uLong nH ) : nHCnv( nH ), nCnt( 1 ) {} }; -SV_DECL_VARARR( DdeItemImp, DdeItemImpData, 1, 1 ) +SV_DECL_VARARR( DdeItemImp, DdeItemImpData, 1 ) SV_IMPL_VARARR( DdeItemImp, DdeItemImpData ) // --- DdeInternat::SvrCallback() ---------------------------------- diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index 24b6b5e8be3c..1586939380d1 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -93,7 +93,8 @@ public: // ----------------------------------------------------------------------- css::uno::Reference< css::uno::XInterface > PathService_CreateInstance ( - const css::uno::Reference< css::lang::XMultiServiceFactory > &) + SAL_UNUSED_PARAMETER const css::uno::Reference< + css::lang::XMultiServiceFactory > &) { return css::uno::Reference< css::uno::XInterface >( static_cast< cppu::OWeakObject* >(new PathService())); diff --git a/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx index a1bb6a976724..5b4f8280042b 100644 --- a/svl/source/uno/registerservices.cxx +++ b/svl/source/uno/registerservices.cxx @@ -54,7 +54,8 @@ extern "C" { SVL_DLLPUBLIC void* SAL_CALL svl_component_getFactory ( - const sal_Char * pImplementationName, void * _pServiceManager, void * /* _pRegistryKey*/) + const sal_Char * pImplementationName, void * _pServiceManager, + SAL_UNUSED_PARAMETER void * /* _pRegistryKey*/) { void * pResult = 0; if ( _pServiceManager ) diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index cb8567e5abb0..bf5e8ef8c30e 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.cxx @@ -45,11 +45,11 @@ DdeData::DdeData( const void*, long, sal_uLong) { } -DdeData::~DdeData( void ) +DdeData::~DdeData() { } -void DdeData::SetFormat( sal_uLong ) +void DdeData::SetFormat( SAL_UNUSED_PARAMETER sal_uLong ) { } @@ -82,7 +82,7 @@ DdeConnection::DdeConnection( const String&, const String& ) { } -DdeConnection::~DdeConnection( void ) +DdeConnection::~DdeConnection() { } @@ -106,23 +106,23 @@ DdeTransaction::DdeTransaction( const DdeTransaction& rTransaction ) : { } -void DdeTransaction::Execute(void) +void DdeTransaction::Execute() { } -void DdeTransaction::Done( sal_Bool ) +void DdeTransaction::Done( SAL_UNUSED_PARAMETER sal_Bool ) { } -void DdeTransaction::Data( const DdeData* ) +void DdeTransaction::Data( SAL_UNUSED_PARAMETER const DdeData* ) { } -DdeTransaction::~DdeTransaction(void) +DdeTransaction::~DdeTransaction() { } -DdeRequest::DdeRequest(DdeConnection& rConnection, const String& rString, long lLong ) : +DdeRequest::DdeRequest( DdeConnection& rConnection, const String& rString, long lLong ) : DdeTransaction( rConnection, rString, lLong ) { } @@ -146,15 +146,15 @@ DdeTopic::~DdeTopic() { } -void DdeTopic::Connect (long ) +void DdeTopic::Connect( SAL_UNUSED_PARAMETER long ) { } -void DdeTopic::Disconnect( long ) +void DdeTopic::Disconnect( SAL_UNUSED_PARAMETER long ) { } -void DdeTopic::InsertItem( DdeItem* ) +void DdeTopic::InsertItem( SAL_UNUSED_PARAMETER DdeItem* ) { } @@ -163,16 +163,16 @@ DdeItem* DdeTopic::AddItem( const DdeItem& rDdeItem ) return (DdeItem*) &rDdeItem; } -void DdeTopic::RemoveItem( const DdeItem& ) +void DdeTopic::RemoveItem( SAL_UNUSED_PARAMETER const DdeItem& ) { } -DdeData* DdeTopic::Get( sal_uLong ) +DdeData* DdeTopic::Get( SAL_UNUSED_PARAMETER sal_uLong ) { return NULL; } -sal_Bool DdeTopic::MakeItem( const String& ) +sal_Bool DdeTopic::MakeItem( SAL_UNUSED_PARAMETER const String& ) { return sal_False; } @@ -187,12 +187,12 @@ sal_Bool DdeTopic::StopAdviseLoop() return sal_False; } -sal_Bool DdeTopic::Execute( const String* ) +sal_Bool DdeTopic::Execute( SAL_UNUSED_PARAMETER const String* ) { return sal_False; } -sal_Bool DdeTopic::Put( const DdeData* ) +sal_Bool DdeTopic::Put( SAL_UNUSED_PARAMETER const DdeData* ) { return sal_False; } @@ -227,7 +227,7 @@ String DdeService::SysTopicGet(const String& rString) { return rString; } -sal_Bool DdeService::SysTopicExecute(const String*) { +sal_Bool DdeService::SysTopicExecute(SAL_UNUSED_PARAMETER const String*) { return sal_False; } @@ -245,19 +245,19 @@ String DdeService::GetHelp() return String::EmptyString(); } -void DdeService::AddFormat( sal_uLong ) +void DdeService::AddFormat( SAL_UNUSED_PARAMETER sal_uLong ) { } -void DdeService::AddTopic( const DdeTopic& ) +void DdeService::AddTopic( SAL_UNUSED_PARAMETER const DdeTopic& ) { } -void DdeService::RemoveTopic( const DdeTopic& ) +void DdeService::RemoveTopic( SAL_UNUSED_PARAMETER const DdeTopic& ) { } -sal_Bool DdeService::MakeTopic( const String& ) +sal_Bool DdeService::MakeTopic( SAL_UNUSED_PARAMETER const String& ) { return sal_False; } @@ -304,17 +304,17 @@ DdeItem( rItem ) { } -DdeData* DdeGetPutItem::Get( sal_uLong ) +DdeData* DdeGetPutItem::Get( SAL_UNUSED_PARAMETER sal_uLong ) { return NULL; } -sal_Bool DdeGetPutItem::Put( const DdeData* ) +sal_Bool DdeGetPutItem::Put( SAL_UNUSED_PARAMETER const DdeData* ) { return sal_False; } -void DdeGetPutItem::AdviseLoop( sal_Bool ) +void DdeGetPutItem::AdviseLoop( SAL_UNUSED_PARAMETER sal_Bool ) { } |