diff options
424 files changed, 2214 insertions, 1333 deletions
diff --git a/autodoc/inc/ary/idl/i_ce2s.hxx b/autodoc/inc/ary/idl/i_ce2s.hxx index 09774d36e09f..87c9c411ab65 100644 --- a/autodoc/inc/ary/idl/i_ce2s.hxx +++ b/autodoc/inc/ary/idl/i_ce2s.hxx @@ -54,8 +54,7 @@ class Ce_2s Ce_2s() {} virtual ~Ce_2s(); - static DYN Ce_2s * Create_( - ClassId i_nCeClass ); + static DYN Ce_2s * Create_(); // OPERATIONS void Add_Link2DescriptionInManual( const String & i_link, diff --git a/autodoc/inc/ary_i/d_token.hxx b/autodoc/inc/ary_i/d_token.hxx index dd1133658086..7247de6e9038 100644 --- a/autodoc/inc/ary_i/d_token.hxx +++ b/autodoc/inc/ary_i/d_token.hxx @@ -116,8 +116,7 @@ class DT_MLTag : public DT_Dsapi class DT_MupType : public DT_MLTag { public: - explicit DT_MupType( /// Constructor for End-Tag - bool ) /// Must be there, but is not evaluated. + explicit DT_MupType() /// Constructor for End-Tag : bIsBegin(false) {} explicit DT_MupType( /// Constructor for Begin-Tag const String & i_sScope ) @@ -138,8 +137,7 @@ class DT_MupType : public DT_MLTag class DT_MupMember : public DT_MLTag { public: - explicit DT_MupMember( /// Constructor for End-Tag - bool ) /// Must be there, but is not evaluated. + explicit DT_MupMember() /// Constructor for End-Tag : bIsBegin(false) {} DT_MupMember( /// Constructor for Begin-Tag const String & i_sScope ) diff --git a/autodoc/source/ary/idl/i_ce.cxx b/autodoc/source/ary/idl/i_ce.cxx index 8a0de924b47c..a7f72b90dda1 100644 --- a/autodoc/source/ary/idl/i_ce.cxx +++ b/autodoc/source/ary/idl/i_ce.cxx @@ -61,7 +61,7 @@ CodeEntity::Secondaries() { if (p2s) return *p2s; - p2s = Ce_2s::Create_(AryClass()); + p2s = Ce_2s::Create_(); return *p2s; } diff --git a/autodoc/source/ary/idl/i_ce2s.cxx b/autodoc/source/ary/idl/i_ce2s.cxx index 9a126fd312e2..a6197bb22249 100644 --- a/autodoc/source/ary/idl/i_ce2s.cxx +++ b/autodoc/source/ary/idl/i_ce2s.cxx @@ -53,7 +53,7 @@ Ce_2s::~Ce_2s() } DYN Ce_2s * -Ce_2s::Create_( ClassId ) +Ce_2s::Create_() { return new Ce_2s; } diff --git a/autodoc/source/ary/idl/ia_type.cxx b/autodoc/source/ary/idl/ia_type.cxx index c029c8e1e877..9bc03386493d 100644 --- a/autodoc/source/ary/idl/ia_type.cxx +++ b/autodoc/source/ary/idl/ia_type.cxx @@ -52,9 +52,7 @@ namespace idl { String MakeTemplateName( - const String & i_localName, - const std::vector<Type_id> & - i_templateParameters ); + const String & i_localName ); @@ -130,9 +128,7 @@ TypeAdmin::lhf_CheckIn_TypeName( const String & i_sLocalName, ? (!i_templateParameters->empty()) : false ) { - sSearchLocalName = MakeTemplateName( - i_sLocalName, - *i_templateParameters); + sSearchLocalName = MakeTemplateName(i_sLocalName); } Type_id @@ -344,8 +340,7 @@ TypeAdmin::IsBuiltInOrRelated( const Type & i_rType ) const String -MakeTemplateName( const String & i_localName, - const std::vector<Type_id> & ) +MakeTemplateName( const String & i_localName ) { StreamLock sl(200); diff --git a/autodoc/source/display/idl/hi_linkhelper.cxx b/autodoc/source/display/idl/hi_linkhelper.cxx index 4d6ae7a735ad..de67f0d9a0b9 100644 --- a/autodoc/source/display/idl/hi_linkhelper.cxx +++ b/autodoc/source/display/idl/hi_linkhelper.cxx @@ -89,7 +89,7 @@ LinkHelper::XrefsSuffix() const String -nameChainLinker( const char * ) +nameChainLinker( SAL_UNUSED_PARAMETER const char * ) { static const String sModuleFileName_( output::ModuleFileName() ); diff --git a/autodoc/source/display/inc/toolkit/out_position.hxx b/autodoc/source/display/inc/toolkit/out_position.hxx index 0bc236cdf871..33dd32313923 100644 --- a/autodoc/source/display/inc/toolkit/out_position.hxx +++ b/autodoc/source/display/inc/toolkit/out_position.hxx @@ -73,16 +73,14 @@ class Position void Get_Chain( StringVector & o_result ) const { pDirectory->Get_Chain(o_result); } - String LinkToRoot( - const String & i_localLabel = String::Null_() ) const; + String LinkToRoot() const; void Get_LinkTo( StreamStr & o_result, const Position & i_destination, const String & i_localLabel = String::Null_() ) const; void Get_LinkToRoot( - StreamStr & o_result, - const String & i_localLabel = String::Null_() ) const; + StreamStr & o_result ) const; static char Delimiter() { return '/'; } diff --git a/autodoc/source/display/toolkit/out_position.cxx b/autodoc/source/display/toolkit/out_position.cxx index efb4495fb0b4..75e51b0ce5a8 100644 --- a/autodoc/source/display/toolkit/out_position.cxx +++ b/autodoc/source/display/toolkit/out_position.cxx @@ -131,7 +131,7 @@ Position::operator-=( intt i_levels ) } String -Position::LinkToRoot( const String & ) const +Position::LinkToRoot() const { StreamLock sl(C_nAssumedMaxLinkLength); return sl() << get_UpLink(Depth()) << c_str; @@ -176,8 +176,7 @@ Position::Get_LinkTo( StreamStr & o_result, } void -Position::Get_LinkToRoot( StreamStr & o_result, - const String & ) const +Position::Get_LinkToRoot( StreamStr & o_result ) const { o_result << get_UpLink(Depth()); } diff --git a/autodoc/source/exes/adc_uni/adc_msg.cxx b/autodoc/source/exes/adc_uni/adc_msg.cxx index ad8b9d5745f0..06d6f8e76dde 100644 --- a/autodoc/source/exes/adc_uni/adc_msg.cxx +++ b/autodoc/source/exes/adc_uni/adc_msg.cxx @@ -62,28 +62,23 @@ Messages::WriteFile(const String & i_sOutputFilePath) // KORR_FUTURE Enable this when appropriate: WriteParagraph( aOut, aParseErrors, - "Incompletely Parsed Files", - "Stopped parsing at " ); + "Incompletely Parsed Files" ); WriteParagraph( aOut, aMissingDocs, - "Entities Without Documentation", - " in " ); + "Entities Without Documentation" ); WriteParagraph( aOut, aInvalidConstSymbols, - "Incorrectly Written Const Symbols", - " in " ); + "Incorrectly Written Const Symbols" ); WriteParagraph( aOut, aUnresolvedLinks, - "Unresolved Links", - " in\n " ); + "Unresolved Links" ); WriteParagraph( aOut, aTypeVsMemberMisuses, - "Confusion or Misuse of <Type> vs. <Member>", - " in " ); + "Confusion or Misuse of <Type> vs. <Member>" ); aOut.close(); } @@ -164,8 +159,7 @@ Messages::AddValue( MessageMap & o_dest, void Messages::WriteParagraph( csv::File & o_out, const MessageMap & i_source, - const String & i_title, - const String & ) + const String & i_title ) { StreamStr aLine(2000); diff --git a/autodoc/source/inc/adc_msg.hxx b/autodoc/source/inc/adc_msg.hxx index e88ccf5ce526..55abd5419b78 100644 --- a/autodoc/source/inc/adc_msg.hxx +++ b/autodoc/source/inc/adc_msg.hxx @@ -115,8 +115,7 @@ class Messages void WriteParagraph( csv::File & o_out, const MessageMap & i_source, - const String & i_title, - const String & i_firstIntermediateText ); + const String & i_title ); // DATA MessageMap aMissingDocs; diff --git a/autodoc/source/parser_i/idl/pe_const.cxx b/autodoc/source/parser_i/idl/pe_const.cxx index 4013f33d02d7..817060e6e0ce 100644 --- a/autodoc/source/parser_i/idl/pe_const.cxx +++ b/autodoc/source/parser_i/idl/pe_const.cxx @@ -26,6 +26,10 @@ * ************************************************************************/ +#include "sal/config.h" + +#include "sal/types.h" + #include <precomp.h> #include <s2_luidl/pe_const.hxx> @@ -160,7 +164,7 @@ PE_Constant::On_expect_curl_bracket_open_Punctuation(const char * i_sText) } void -PE_Constant::On_expect_const_Stereotype(const char *) +PE_Constant::On_expect_const_Stereotype(SAL_UNUSED_PARAMETER const char *) { SetResult( done, push_sure, pPE_Type.Ptr() ); } @@ -180,7 +184,7 @@ PE_Constant::On_expect_const_Punctuation(const char * i_sText) } void -PE_Constant::On_expect_value_Identifier(const char *) +PE_Constant::On_expect_value_Identifier(SAL_UNUSED_PARAMETER const char *) { SetResult( not_done, push_sure, pPE_Value.Ptr() ); } @@ -200,7 +204,7 @@ PE_Constant::On_expect_finish_Punctuation(const char * i_sText) } void -PE_Constant::On_Default(const char * ) +PE_Constant::On_Default(SAL_UNUSED_PARAMETER const char * ) { SetResult(not_done,pop_failure); eState = e_none; diff --git a/autodoc/source/parser_i/idl/pe_enum2.cxx b/autodoc/source/parser_i/idl/pe_enum2.cxx index 68fb46d48a56..ce8a8067ca7c 100644 --- a/autodoc/source/parser_i/idl/pe_enum2.cxx +++ b/autodoc/source/parser_i/idl/pe_enum2.cxx @@ -26,6 +26,10 @@ * ************************************************************************/ +#include "sal/config.h" + +#include "sal/types.h" + #include <precomp.h> #include <s2_luidl/pe_enum2.hxx> @@ -160,7 +164,7 @@ PE_Enum::On_expect_value_Punctuation(const char * i_sText) } void -PE_Enum::On_expect_value_Identifier(const char *) +PE_Enum::On_expect_value_Identifier(SAL_UNUSED_PARAMETER const char *) { SetResult( not_done, push_sure, pPE_Value.Ptr() ); } @@ -180,7 +184,7 @@ PE_Enum::On_expect_finish_Punctuation(const char * i_sText) } void -PE_Enum::On_Default(const char * ) +PE_Enum::On_Default(SAL_UNUSED_PARAMETER const char * ) { SetResult(not_done,pop_failure); eState = e_none; diff --git a/autodoc/source/parser_i/idl/pe_evalu.cxx b/autodoc/source/parser_i/idl/pe_evalu.cxx index 4e1aafabb10b..6ce7c91a1b89 100644 --- a/autodoc/source/parser_i/idl/pe_evalu.cxx +++ b/autodoc/source/parser_i/idl/pe_evalu.cxx @@ -26,6 +26,10 @@ * ************************************************************************/ +#include "sal/config.h" + +#include "sal/types.h" + #include <precomp.h> #include <s2_luidl/pe_evalu.hxx> @@ -151,7 +155,7 @@ PE_Value::On_got_name_Assignment(const char * i_sText) } void -PE_Value::On_Default(const char * ) +PE_Value::On_Default(SAL_UNUSED_PARAMETER const char * ) { SetResult(not_done,pop_failure); } diff --git a/autodoc/source/parser_i/idl/pe_func2.cxx b/autodoc/source/parser_i/idl/pe_func2.cxx index 64a0c6d65736..a091fa72811a 100644 --- a/autodoc/source/parser_i/idl/pe_func2.cxx +++ b/autodoc/source/parser_i/idl/pe_func2.cxx @@ -72,7 +72,7 @@ PE_Function::PE_Function( const RParent & i_rCurInterface ) } PE_Function::PE_Function( const RParent & i_rCurService, - E_Constructor ) + E_Constructor ) : eState(expect_name), sData_Name(), nData_ReturnType(0), diff --git a/autodoc/source/parser_i/idl/pe_iface.cxx b/autodoc/source/parser_i/idl/pe_iface.cxx index 404c303d2c04..7a94938d518f 100644 --- a/autodoc/source/parser_i/idl/pe_iface.cxx +++ b/autodoc/source/parser_i/idl/pe_iface.cxx @@ -187,7 +187,7 @@ PE_Interface::Process_Default() void -PE_Interface::On_need_uik_MetaType(const char *) +PE_Interface::On_need_uik_MetaType(SAL_UNUSED_PARAMETER const char *) { // Deprecated, data will be ignored SetResult(done, stay); @@ -195,7 +195,7 @@ PE_Interface::On_need_uik_MetaType(const char *) } void -PE_Interface::On_uik_Identifier(const char *) +PE_Interface::On_uik_Identifier(SAL_UNUSED_PARAMETER const char *) { // Deprecated, data will be ignored SetResult(done, stay); @@ -213,14 +213,14 @@ PE_Interface::On_uik_Punctuation(const char * i_sText) } void -PE_Interface::On_need_ident_MetaType(const char *) +PE_Interface::On_need_ident_MetaType(SAL_UNUSED_PARAMETER const char *) { SetResult(done, stay); eState = ident; } void -PE_Interface::On_ident_Identifier(const char *) +PE_Interface::On_ident_Identifier(SAL_UNUSED_PARAMETER const char *) { SetResult(done, stay); } @@ -236,7 +236,7 @@ PE_Interface::On_ident_Punctuation(const char * i_sText) } void -PE_Interface::On_need_interface_MetaType(const char *) +PE_Interface::On_need_interface_MetaType(SAL_UNUSED_PARAMETER const char *) { SetResult(done, stay); eState = need_name; @@ -343,21 +343,21 @@ PE_Interface::On_std_Stereotype(const char * i_sText) } void -PE_Interface::On_std_GotoFunction(const char * ) +PE_Interface::On_std_GotoFunction(SAL_UNUSED_PARAMETER const char * ) { SetResult(not_done, push_sure, pPE_Function.Ptr()); eState = in_function; } void -PE_Interface::On_std_GotoAttribute(const char * ) +PE_Interface::On_std_GotoAttribute(SAL_UNUSED_PARAMETER const char * ) { SetResult(not_done, push_sure, pPE_Attribute.Ptr()); eState = in_attribute; } void -PE_Interface::On_std_GotoBaseInterface(const char * ) +PE_Interface::On_std_GotoBaseInterface(SAL_UNUSED_PARAMETER const char * ) { SetResult(done, push_sure, pPE_Type.Ptr()); eState = in_base_interface; @@ -379,7 +379,7 @@ PE_Interface::On_need_finish_Punctuation(const char * i_sText) } void -PE_Interface::On_Default(const char *) +PE_Interface::On_Default(SAL_UNUSED_PARAMETER const char *) { SetResult(not_done, pop_failure); } diff --git a/autodoc/source/parser_i/idl/pe_tydf2.cxx b/autodoc/source/parser_i/idl/pe_tydf2.cxx index 310a8f57327b..0f5d1df0a999 100644 --- a/autodoc/source/parser_i/idl/pe_tydf2.cxx +++ b/autodoc/source/parser_i/idl/pe_tydf2.cxx @@ -26,6 +26,10 @@ * ************************************************************************/ +#include "sal/config.h" + +#include "sal/types.h" + #include <precomp.h> #include <s2_luidl/pe_tydf2.hxx> @@ -120,7 +124,7 @@ PE_Typedef::Process_Default() } void -PE_Typedef::On_expect_description_Any(const char *) +PE_Typedef::On_expect_description_Any(SAL_UNUSED_PARAMETER const char *) { SetResult(not_done,push_sure, pPE_Type.Ptr()); } @@ -146,7 +150,7 @@ PE_Typedef::On_got_name_Punctuation(const char * i_sText) } void -PE_Typedef::On_Default(const char * ) +PE_Typedef::On_Default(SAL_UNUSED_PARAMETER const char * ) { SetResult(not_done,pop_failure); } diff --git a/autodoc/source/parser_i/idoc/docu_pe2.cxx b/autodoc/source/parser_i/idoc/docu_pe2.cxx index ec18bc75bd60..8a7eeb220301 100644 --- a/autodoc/source/parser_i/idoc/docu_pe2.cxx +++ b/autodoc/source/parser_i/idoc/docu_pe2.cxx @@ -229,10 +229,10 @@ SapiDocu_PE::Process_XmlLink_EndTag( const Tok_XmlLink_EndTag & i_rToken ) (this->*fCurTokenAddFunction)(*new DT_Style("</b>",false)); break; case Tok_XmlLink_Tag::member: - (this->*fCurTokenAddFunction)(*new DT_MupMember(true)); + (this->*fCurTokenAddFunction)(*new DT_MupMember); break; case Tok_XmlLink_Tag::type: - (this->*fCurTokenAddFunction)(*new DT_MupType(true)); + (this->*fCurTokenAddFunction)(*new DT_MupType); break; default: // Do nothing. diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx index c39d4f553073..d59ef43e707d 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx @@ -29,6 +29,10 @@ #ifndef ADC_UIDL_PE_FUNC2_HXX #define ADC_UIDL_PE_FUNC2_HXX +#include "sal/config.h" + +#include "sal/types.h" + // USED SERVICES // BASE CLASSES #include <s2_luidl/parsenv2.hxx> diff --git a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx b/basebmp/inc/basebmp/colorblendaccessoradapter.hxx index 4bb913500bd9..e272dc3a9f0b 100644 --- a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx +++ b/basebmp/inc/basebmp/colorblendaccessoradapter.hxx @@ -107,13 +107,13 @@ public: // ------------------------------------------------------- /// @return constant value, regardless of iterator content - template< typename IteratorType > value_type operator()(IteratorType const& ) const + template< typename IteratorType > value_type operator()(SAL_UNUSED_PARAMETER IteratorType const& ) const { return maGetterValue; } /// @return constant value, regardless of iterator content template< typename IteratorType, class Difference > - value_type operator()(IteratorType const& , Difference const& ) const + value_type operator()(SAL_UNUSED_PARAMETER IteratorType const& , SAL_UNUSED_PARAMETER Difference const& ) const { return maGetterValue; } diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx index f933fa1d4d43..e372f725a24f 100644 --- a/basegfx/source/polygon/b2dpolypolygontools.cxx +++ b/basegfx/source/polygon/b2dpolypolygontools.cxx @@ -467,8 +467,9 @@ namespace basegfx } } - void correctGrowShrinkPolygonPair(B2DPolyPolygon& /*rOriginal*/, B2DPolyPolygon& /*rGrown*/) + void correctGrowShrinkPolygonPair(SAL_UNUSED_PARAMETER B2DPolyPolygon& /*rOriginal*/, SAL_UNUSED_PARAMETER B2DPolyPolygon& /*rGrown*/) { + //TODO! } B2DPolyPolygon reSegmentPolyPolygon(const B2DPolyPolygon& rCandidate, sal_uInt32 nSegments) diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx index 3dcbfd9775ae..55341fa56cf4 100644 --- a/basic/inc/basic/sbxbase.hxx +++ b/basic/inc/basic/sbxbase.hxx @@ -38,7 +38,7 @@ class SbxFactory; class SbxVariable; class SbxBasicFormater; -SV_DECL_PTRARR_DEL(SbxFacs,SbxFactory*,5,5) +SV_DECL_PTRARR_DEL(SbxFacs,SbxFactory*,5) // AppData structure for SBX: struct SbxAppData diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 0c27c32d27f6..d79c68808a08 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -42,7 +42,7 @@ #define NS_UNO ::com::sun::star::uno typedef NS_BEANS::PropertyValue* SbPropertyValuePtr; -SV_DECL_PTRARR( SbPropertyValueArr_Impl, SbPropertyValuePtr, 4, 4 ) +SV_DECL_PTRARR( SbPropertyValueArr_Impl, SbPropertyValuePtr, 4 ) typedef ::cppu::WeakImplHelper2< NS_BEANS::XPropertySet, NS_BEANS::XPropertyAccess > SbPropertyValuesHelper; diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index 310a238a7656..b484c826b30e 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -57,7 +57,7 @@ public: }; -SV_DECL_PTRARR_DEL(SbiSymbols,SbiSymDef*,5,5) +SV_DECL_PTRARR_DEL(SbiSymbols,SbiSymDef*,5) class SbiSymPool { friend class SbiSymDef; diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx index 66dc5f577914..6b22e1868301 100644 --- a/basic/source/uno/sbservices.cxx +++ b/basic/source/uno/sbservices.cxx @@ -59,10 +59,10 @@ namespace basic //........................................................................ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sb_component_getFactory( - const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) + const sal_Char* pImplementationName, void*, void* ) { ::basic::initializeModule(); - return ::basic::BasicModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey ); + return ::basic::BasicModule::getInstance().getComponentFactory( pImplementationName ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 389284d96b7e..a47f14e0aa6e 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -99,7 +99,8 @@ rtl::OUString toString(css::uno::TypeDescription const & type) { return rtl::OUString(d->pTypeName); } -extern "C" void SAL_CALL freeProxyCallback(uno_ExtEnvironment *, void * pProxy) +extern "C" void SAL_CALL freeProxyCallback( + SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pProxy) { assert(pProxy != 0); static_cast< Proxy * >(pProxy)->do_free(); diff --git a/boost/boost_1_44_0-unused-parameters.patch b/boost/boost_1_44_0-unused-parameters.patch new file mode 100644 index 000000000000..b50285a4bfc9 --- /dev/null +++ b/boost/boost_1_44_0-unused-parameters.patch @@ -0,0 +1,869 @@ +--- misc/boost_1_44_0/boost/bind/bind.hpp 2009-11-30 21:30:22.000000000 +0100 ++++ misc/build/boost_1_44_0/boost/bind/bind.hpp 2012-01-20 12:44:07.111316403 +0100 +@@ -143,7 +143,7 @@ + + template<class F> struct unwrapper + { +- static inline F & unwrap( F & f, long ) ++ static inline F & unwrap( F & f, __attribute__ ((unused)) long ) + { + return f; + } +@@ -226,7 +226,7 @@ + + A1 operator[] (boost::arg<1>) const { return base_type::a1_; } + +- A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; } ++ A1 operator[] (__attribute__ ((unused)) boost::arg<1> (*) ()) const { return base_type::a1_; } + + template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); } + +@@ -238,22 +238,22 @@ + + template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); } + +- template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long) ++ template<class R, class F, class A> R operator()(type<R>, F & f, A & a, __attribute__ ((unused)) long) + { + return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_]); + } + +- template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const ++ template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, __attribute__ ((unused)) long) const + { + return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_]); + } + +- template<class F, class A> void operator()(type<void>, F & f, A & a, int) ++ template<class F, class A> void operator()(type<void>, F & f, A & a, __attribute__ ((unused)) int) + { + unwrapper<F>::unwrap(f, 0)(a[base_type::a1_]); + } + +- template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const ++ template<class F, class A> void operator()(type<void>, F const & f, A & a, __attribute__ ((unused)) int) const + { + unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_]); + } +@@ -285,8 +285,8 @@ + A1 operator[] (boost::arg<1>) const { return base_type::a1_; } + A2 operator[] (boost::arg<2>) const { return base_type::a2_; } + +- A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; } +- A2 operator[] (boost::arg<2> (*) ()) const { return base_type::a2_; } ++ A1 operator[] (__attribute__ ((unused)) boost::arg<1> (*) ()) const { return base_type::a1_; } ++ A2 operator[] (__attribute__ ((unused)) boost::arg<2> (*) ()) const { return base_type::a2_; } + + template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); } + +@@ -298,22 +298,22 @@ + + template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); } + +- template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long) ++ template<class R, class F, class A> R operator()(type<R>, F & f, A & a, __attribute__ ((unused)) long) + { + return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_]); + } + +- template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const ++ template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, __attribute__ ((unused)) long) const + { + return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_]); + } + +- template<class F, class A> void operator()(type<void>, F & f, A & a, int) ++ template<class F, class A> void operator()(type<void>, F & f, A & a, __attribute__ ((unused)) int) + { + unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_]); + } + +- template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const ++ template<class F, class A> void operator()(type<void>, F const & f, A & a, __attribute__ ((unused)) int) const + { + unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_]); + } +@@ -377,7 +377,7 @@ + + template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); } + +- template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long) ++ template<class R, class F, class A> R operator()(type<R>, F & f, A & a, __attribute__ ((unused)) long) + { + return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_]); + } +@@ -387,12 +387,12 @@ + return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_]); + } + +- template<class F, class A> void operator()(type<void>, F & f, A & a, int) ++ template<class F, class A> void operator()(type<void>, F & f, A & a, __attribute__ ((unused)) int) + { + unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_]); + } + +- template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const ++ template<class F, class A> void operator()(type<void>, F const & f, A & a, __attribute__ ((unused)) int) const + { + unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_]); + } +@@ -427,10 +427,10 @@ + A3 operator[] (boost::arg<3>) const { return base_type::a3_; } + A4 operator[] (boost::arg<4>) const { return base_type::a4_; } + +- A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; } +- A2 operator[] (boost::arg<2> (*) ()) const { return base_type::a2_; } +- A3 operator[] (boost::arg<3> (*) ()) const { return base_type::a3_; } +- A4 operator[] (boost::arg<4> (*) ()) const { return base_type::a4_; } ++ A1 operator[] (__attribute__ ((unused)) boost::arg<1> (*) ()) const { return base_type::a1_; } ++ A2 operator[] (__attribute__ ((unused)) boost::arg<2> (*) ()) const { return base_type::a2_; } ++ A3 operator[] (__attribute__ ((unused)) boost::arg<3> (*) ()) const { return base_type::a3_; } ++ A4 operator[] (__attribute__ ((unused)) boost::arg<4> (*) ()) const { return base_type::a4_; } + + template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); } + +@@ -442,7 +442,7 @@ + + template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); } + +- template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long) ++ template<class R, class F, class A> R operator()(type<R>, F & f, A & a, __attribute__ ((unused)) long) + { + return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_]); + } +@@ -452,7 +452,7 @@ + return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_]); + } + +- template<class F, class A> void operator()(type<void>, F & f, A & a, int) ++ template<class F, class A> void operator()(type<void>, F & f, A & a, __attribute__ ((unused)) int) + { + unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_]); + } +@@ -510,7 +510,7 @@ + + template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); } + +- template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long) ++ template<class R, class F, class A> R operator()(type<R>, F & f, A & a, __attribute__ ((unused)) long) + { + return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_]); + } +@@ -520,7 +520,7 @@ + return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_]); + } + +- template<class F, class A> void operator()(type<void>, F & f, A & a, int) ++ template<class F, class A> void operator()(type<void>, F & f, A & a, __attribute__ ((unused)) int) + { + unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_]); + } +@@ -591,7 +591,7 @@ + return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_]); + } + +- template<class F, class A> void operator()(type<void>, F & f, A & a, int) ++ template<class F, class A> void operator()(type<void>, F & f, A & a, __attribute__ ((unused)) int) + { + unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_]); + } +--- misc/boost_1_44_0/boost/bind/mem_fn.hpp 2009-03-02 17:15:40.000000000 +0100 ++++ misc/build/boost_1_44_0/boost/bind/mem_fn.hpp 2012-01-20 12:44:07.112316398 +0100 +@@ -328,7 +328,7 @@ + return (u.*f_); + } + +- template<class U> R const & call(U & u, void const *) const ++ template<class U> R const & call(U & u, __attribute__ ((unused)) void const *) const + { + return (get_pointer(u)->*f_); + } +--- misc/boost_1_44_0/boost/bind/mem_fn_template.hpp 2009-12-03 18:44:37.000000000 +0100 ++++ misc/build/boost_1_44_0/boost/bind/mem_fn_template.hpp 2012-01-20 12:44:07.112316398 +0100 +@@ -35,7 +35,7 @@ + BOOST_MEM_FN_RETURN (u.*f_)(); + } + +- template<class U> R call(U & u, void const *) const ++ template<class U> R call(U & u, __attribute__ ((unused)) void const *) const + { + BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(); + } +@@ -100,7 +100,7 @@ + BOOST_MEM_FN_RETURN (u.*f_)(); + } + +- template<class U> R call(U & u, void const *) const ++ template<class U> R call(U & u, __attribute__ ((unused)) void const *) const + { + BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(); + } +@@ -146,12 +146,12 @@ + BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1)) + F f_; + +- template<class U, class B1> R call(U & u, T const *, B1 & b1) const ++ template<class U, class B1> R call(U & u, __attribute__ ((unused)) T const *, B1 & b1) const + { + BOOST_MEM_FN_RETURN (u.*f_)(b1); + } + +- template<class U, class B1> R call(U & u, void const *, B1 & b1) const ++ template<class U, class B1> R call(U & u, __attribute__ ((unused)) void const *, B1 & b1) const + { + BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1); + } +@@ -217,7 +217,7 @@ + BOOST_MEM_FN_RETURN (u.*f_)(b1); + } + +- template<class U, class B1> R call(U & u, void const *, B1 & b1) const ++ template<class U, class B1> R call(U & u, __attribute__ ((unused)) void const *, B1 & b1) const + { + BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1); + } +@@ -266,7 +266,7 @@ + BOOST_MEM_FN_RETURN (u.*f_)(b1, b2); + } + +- template<class U, class B1, class B2> R call(U & u, void const *, B1 & b1, B2 & b2) const ++ template<class U, class B1, class B2> R call(U & u, __attribute__ ((unused)) void const *, B1 & b1, B2 & b2) const + { + BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2); + } +@@ -330,7 +330,7 @@ + BOOST_MEM_FN_RETURN (u.*f_)(b1, b2); + } + +- template<class U, class B1, class B2> R call(U & u, void const *, B1 & b1, B2 & b2) const ++ template<class U, class B1, class B2> R call(U & u, __attribute__ ((unused)) void const *, B1 & b1, B2 & b2) const + { + BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2); + } +@@ -379,7 +379,7 @@ + BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3); + } + +- template<class U, class B1, class B2, class B3> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3) const ++ template<class U, class B1, class B2, class B3> R call(U & u, __attribute__ ((unused)) void const *, B1 & b1, B2 & b2, B3 & b3) const + { + BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3); + } +@@ -492,7 +492,7 @@ + BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4); + } + +- template<class U, class B1, class B2, class B3, class B4> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4) const ++ template<class U, class B1, class B2, class B3, class B4> R call(U & u, __attribute__ ((unused)) void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4) const + { + BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4); + } +@@ -556,7 +556,7 @@ + BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4); + } + +- template<class U, class B1, class B2, class B3, class B4> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4) const ++ template<class U, class B1, class B2, class B3, class B4> R call(U & u, __attribute__ ((unused)) void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4) const + { + BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4); + } +--- misc/boost_1_44_0/boost/detail/dynamic_bitset.hpp 2008-10-21 20:13:59.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/detail/dynamic_bitset.hpp 2012-01-20 12:44:07.113316394 +0100 +@@ -100,8 +100,8 @@ + + template <typename Iterator> + inline std::size_t do_count(Iterator first, std::size_t length, +- int /*dummy param*/, +- value_to_type<access_by_bytes>* ) ++ __attribute__ ((unused)) int /*dummy param*/, ++ __attribute__ ((unused)) value_to_type<access_by_bytes>* ) + { + std::size_t num = 0; + if (length) +--- misc/boost_1_44_0/boost/foreach.hpp 2010-07-30 22:26:40.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/foreach.hpp 2012-01-20 12:44:07.114316390 +0100 +@@ -610,7 +610,7 @@ + } + + template<typename T> +-inline auto_any<T *> contain(T &t, boost::mpl::false_ *) // lvalue ++inline auto_any<T *> contain(T &t, __attribute__ ((unused)) boost::mpl::false_ *) // lvalue + { + // Cannot seem to get sunpro to handle addressof() with array types. + #if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x570)) +@@ -641,7 +641,7 @@ + + template<typename T, typename C> + inline auto_any<BOOST_DEDUCED_TYPENAME foreach_iterator<T, C>::type> +-begin(auto_any_t col, type2type<T, C> *, boost::mpl::false_ *) // lvalue ++begin(auto_any_t col, __attribute__ ((unused)) type2type<T, C> *, __attribute__ ((unused)) boost::mpl::false_ *) // lvalue + { + typedef BOOST_DEDUCED_TYPENAME type2type<T, C>::type type; + typedef BOOST_DEDUCED_TYPENAME foreach_iterator<T, C>::type iterator; +@@ -678,7 +678,7 @@ + + template<typename T, typename C> + inline auto_any<BOOST_DEDUCED_TYPENAME foreach_iterator<T, C>::type> +-end(auto_any_t col, type2type<T, C> *, boost::mpl::false_ *) // lvalue ++end(auto_any_t col, __attribute__ ((unused)) type2type<T, C> *, __attribute__ ((unused)) boost::mpl::false_ *) // lvalue + { + typedef BOOST_DEDUCED_TYPENAME type2type<T, C>::type type; + typedef BOOST_DEDUCED_TYPENAME foreach_iterator<T, C>::type iterator; +@@ -707,7 +707,7 @@ + // done + // + template<typename T, typename C> +-inline bool done(auto_any_t cur, auto_any_t end, type2type<T, C> *) ++inline bool done(auto_any_t cur, auto_any_t end, __attribute__ ((unused)) type2type<T, C> *) + { + typedef BOOST_DEDUCED_TYPENAME foreach_iterator<T, C>::type iter_t; + return auto_any_cast<iter_t, boost::mpl::false_>(cur) == auto_any_cast<iter_t, boost::mpl::false_>(end); +@@ -725,7 +725,7 @@ + // next + // + template<typename T, typename C> +-inline void next(auto_any_t cur, type2type<T, C> *) ++inline void next(auto_any_t cur, __attribute__ ((unused)) type2type<T, C> *) + { + typedef BOOST_DEDUCED_TYPENAME foreach_iterator<T, C>::type iter_t; + ++auto_any_cast<iter_t, boost::mpl::false_>(cur); +@@ -736,7 +736,7 @@ + // + template<typename T, typename C> + inline BOOST_DEDUCED_TYPENAME foreach_reference<T, C>::type +-deref(auto_any_t cur, type2type<T, C> *) ++deref(auto_any_t cur, __attribute__ ((unused)) type2type<T, C> *) + { + typedef BOOST_DEDUCED_TYPENAME foreach_iterator<T, C>::type iter_t; + return *auto_any_cast<iter_t, boost::mpl::false_>(cur); +--- misc/boost_1_44_0/boost/function/function_template.hpp 2009-07-09 01:23:52.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/function/function_template.hpp 2012-01-20 15:29:25.217770399 +0100 +@@ -711,7 +711,7 @@ + template<typename Functor> + BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f + #ifndef BOOST_NO_SFINAE +- ,typename enable_if_c< ++ ,__attribute__ ((unused)) typename enable_if_c< + (boost::type_traits::ice_not< + (is_integral<Functor>::value)>::value), + int>::type = 0 +@@ -724,7 +724,7 @@ + template<typename Functor,typename Allocator> + BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a + #ifndef BOOST_NO_SFINAE +- ,typename enable_if_c< ++ ,__attribute__ ((unused)) typename enable_if_c< + (boost::type_traits::ice_not< + (is_integral<Functor>::value)>::value), + int>::type = 0 +@@ -1055,7 +1055,7 @@ + template<typename Functor> + function(Functor f + #ifndef BOOST_NO_SFINAE +- ,typename enable_if_c< ++ ,__attribute__ ((unused)) typename enable_if_c< + (boost::type_traits::ice_not< + (is_integral<Functor>::value)>::value), + int>::type = 0 +@@ -1067,7 +1067,7 @@ + template<typename Functor,typename Allocator> + function(Functor f, Allocator a + #ifndef BOOST_NO_SFINAE +- ,typename enable_if_c< ++ ,__attribute__ ((unused)) typename enable_if_c< + (boost::type_traits::ice_not< + (is_integral<Functor>::value)>::value), + int>::type = 0 +--- misc/boost_1_44_0/boost/iterator/reverse_iterator.hpp 2004-08-12 19:13:07.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/iterator/reverse_iterator.hpp 2012-01-20 12:44:07.122316355 +0100 +@@ -34,7 +34,7 @@ + template<class OtherIterator> + reverse_iterator( + reverse_iterator<OtherIterator> const& r +- , typename enable_if_convertible<OtherIterator, Iterator>::type* = 0 ++ , __attribute__ ((unused)) typename enable_if_convertible<OtherIterator, Iterator>::type* = 0 + ) + : super_t(r.base()) + {} +--- misc/boost_1_44_0/boost/optional/optional.hpp 2012-01-20 15:24:32.364576113 +0100 ++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2012-01-20 12:44:07.123316351 +0100 +@@ -365,7 +365,7 @@ + // Converting constructions of optional<T> from optional<U> uses this function with + // 'Expr' being of type 'U' and relying on a converting constructor of T from U. + template<class Expr> +- void construct ( Expr const& expr, void const* ) ++ void construct ( Expr const& expr, __attribute__ ((unused)) void const* ) + { + new (m_storage.address()) internal_type(expr) ; + m_initialized = true ; +@@ -376,7 +376,7 @@ + // Converting assignments of optional<T> from optional<U> uses this function with + // 'Expr' being of type 'U' and relying on a converting assignment of T from U. + template<class Expr> +- void assign_expr_to_initialized ( Expr const& expr, void const* ) ++ void assign_expr_to_initialized ( Expr const& expr, __attribute__ ((unused)) void const* ) + { + assign_value(expr, is_reference_predicate()); + } +--- misc/boost_1_44_0/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp 2012-01-20 12:44:07.124316347 +0100 +@@ -63,8 +63,8 @@ + + template<typename IteratorT> + void operator()( +- IteratorT const& /*first*/, +- IteratorT const& /*last*/ ++ __attribute__ ((unused)) IteratorT const& /*first*/, ++ __attribute__ ((unused)) IteratorT const& /*last*/ + ) const + { + this->act(ref,value_ref); // defined in ActionT +--- misc/boost_1_44_0/boost/spirit/home/classic/core/composite/impl/directives.ipp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/composite/impl/directives.ipp 2012-01-20 12:44:07.124316347 +0100 +@@ -41,7 +41,7 @@ + contiguous_parser_parse( + ST const& s, + ScannerT const& scan, +- skipper_iteration_policy<BaseT> const&) ++ __attribute__ ((unused)) skipper_iteration_policy<BaseT> const&) + { + typedef scanner_policies< + no_skipper_iteration_policy< +@@ -61,7 +61,7 @@ + contiguous_parser_parse( + ST const& s, + ScannerT const& scan, +- no_skipper_iteration_policy<BaseT> const&) ++ __attribute__ ((unused)) no_skipper_iteration_policy<BaseT> const&) + { + return s.parse(scan); + } +@@ -85,7 +85,7 @@ + implicit_lexeme_parse( + ParserT const& p, + ScannerT const& scan, +- skipper_iteration_policy<BaseT> const&) ++ __attribute__ ((unused)) skipper_iteration_policy<BaseT> const&) + { + typedef scanner_policies< + no_skipper_iteration_policy< +@@ -129,7 +129,7 @@ + inhibit_case_parser_parse( + ST const& s, + ScannerT const& scan, +- iteration_policy const&) ++ __attribute__ ((unused)) iteration_policy const&) + { + typedef scanner_policies< + inhibit_case_iteration_policy< +--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/parser_context.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/parser_context.hpp 2012-01-20 12:44:07.124316347 +0100 +@@ -51,15 +51,15 @@ + typedef parser_context_linker<parser_context<AttrT> > context_linker_t; + + template <typename ParserT> +- parser_context(ParserT const&) {} ++ parser_context(__attribute__ ((unused)) ParserT const&) {} + + template <typename ParserT, typename ScannerT> + void +- pre_parse(ParserT const&, ScannerT const&) {} ++ pre_parse(__attribute__ ((unused)) ParserT const&, __attribute__ ((unused)) ScannerT const&) {} + + template <typename ResultT, typename ParserT, typename ScannerT> + ResultT& +- post_parse(ResultT& hit, ParserT const&, ScannerT const&) ++ post_parse(ResultT& hit, __attribute__ ((unused)) ParserT const&, __attribute__ ((unused)) ScannerT const&) + { return hit; } + }; + +--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2012-01-20 15:24:32.364576113 +0100 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2012-01-20 12:44:07.125316343 +0100 +@@ -240,7 +240,7 @@ + } + + template <> +- inline bool allow_more_digits<-1>(std::size_t) ++ inline bool allow_more_digits<-1>(__attribute__ ((unused)) std::size_t) + { + return true; + } +--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp 2012-01-20 12:44:07.125316343 +0100 +@@ -316,7 +316,7 @@ + anychar_parser() {} + + template <typename CharT> +- bool test(CharT) const ++ bool test(__attribute__ ((unused)) CharT) const + { + return true; + } +--- misc/boost_1_44_0/boost/spirit/home/classic/core/scanner/impl/skipper.ipp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/scanner/impl/skipper.ipp 2012-01-20 12:44:07.125316343 +0100 +@@ -122,7 +122,7 @@ + IteratorT const& first_, + IteratorT const& last, + ParserT const& p, +- space_parser const&) ++ __attribute__ ((unused)) space_parser const&) + { + typedef skipper_iteration_policy<> iter_policy_t; + typedef scanner_policies<iter_policy_t> scanner_policies_t; +--- misc/boost_1_44_0/boost/spirit/home/classic/core/scanner/scanner.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/scanner/scanner.hpp 2012-01-20 12:44:07.126316338 +0100 +@@ -82,18 +82,18 @@ + create_match( + std::size_t length, + AttrT const& val, +- IteratorT const& /*first*/, +- IteratorT const& /*last*/) const ++ __attribute__ ((unused)) IteratorT const& /*first*/, ++ __attribute__ ((unused)) IteratorT const& /*last*/) const + { + return match<AttrT>(length, val); + } + + template <typename MatchT, typename IteratorT> + void group_match( +- MatchT& /*m*/, +- parser_id const& /*id*/, +- IteratorT const& /*first*/, +- IteratorT const& /*last*/) const {} ++ __attribute__ ((unused)) MatchT& /*m*/, ++ __attribute__ ((unused)) parser_id const& /*id*/, ++ __attribute__ ((unused)) IteratorT const& /*first*/, ++ __attribute__ ((unused)) IteratorT const& /*last*/) const {} + + template <typename Match1T, typename Match2T> + void concat_match(Match1T& l, Match2T const& r) const +@@ -126,8 +126,8 @@ + call( + ActorT const& actor, + AttrT& val, +- IteratorT const&, +- IteratorT const&) ++ __attribute__ ((unused)) IteratorT const&, ++ __attribute__ ((unused)) IteratorT const&) + { + actor(val); + } +--- misc/boost_1_44_0/boost/spirit/home/classic/core/scanner/skipper.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/scanner/skipper.hpp 2012-01-20 12:44:07.126316338 +0100 +@@ -82,7 +82,7 @@ + + template <typename ScannerT> + void +- skip(ScannerT const& /*scan*/) const {} ++ skip(__attribute__ ((unused)) ScannerT const& /*scan*/) const {} + }; + + /////////////////////////////////////////////////////////////////////////// +--- misc/boost_1_44_0/boost/spirit/home/classic/meta/impl/refactoring.ipp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/meta/impl/refactoring.ipp 2012-01-20 12:44:07.126316338 +0100 +@@ -92,7 +92,7 @@ + + template <typename ParserT, typename ScannerT, typename BinaryT> + static typename parser_result<ParserT, ScannerT>::type +- parse(ParserT const &, ScannerT const& scan, BinaryT const& binary) ++ parse(__attribute__ ((unused)) ParserT const &, ScannerT const& scan, BinaryT const& binary) + { + return binary.parse(scan); + } +@@ -140,7 +140,7 @@ + template <typename ParserT, typename ScannerT, typename BinaryT> + static typename parser_result<ParserT, ScannerT>::type + parse(ParserT const &p, ScannerT const& scan, BinaryT const& binary, +- non_nested_refactoring const&) ++ __attribute__ ((unused)) non_nested_refactoring const&) + { + typedef + typename BinaryT::left_t::parser_category_t +@@ -205,7 +205,7 @@ + typename NestedT + > + static typename parser_result<ParserT, ScannerT>::type +- parse(ParserT const &, ScannerT const& scan, BinaryT const& binary, ++ parse(__attribute__ ((unused)) ParserT const &, ScannerT const& scan, BinaryT const& binary, + NestedT const& nested_d) + { + typedef typename BinaryT::parser_generator_t binary_gen_t; +--- misc/boost_1_44_0/boost/spirit/home/classic/utility/impl/chset_operators.ipp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/impl/chset_operators.ipp 2012-01-20 12:44:07.127316333 +0100 +@@ -576,7 +576,7 @@ + ////////////////////////////////// + template <typename CharT> + inline chset<CharT> +-operator-(anychar_parser, chset<CharT> const& b) ++operator-(__attribute__ ((unused)) anychar_parser, chset<CharT> const& b) + { + return ~b; + } +--- misc/boost_1_44_0/boost/spirit/home/classic/utility/impl/lists.ipp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/impl/lists.ipp 2012-01-20 12:44:07.127316333 +0100 +@@ -64,8 +64,8 @@ + typename ItemT, typename DelimT + > + static typename parser_result<ParserT, ScannerT>::type +- parse(ScannerT const& scan, ParserT const& /*p*/, +- ItemT const &item, DelimT const &delim, no_list_endtoken const&) ++ parse(ScannerT const& scan, __attribute__ ((unused)) ParserT const& /*p*/, ++ ItemT const &item, DelimT const &delim, __attribute__ ((unused)) no_list_endtoken const&) + { + typedef refactor_action_gen<refactor_unary_gen<> > refactor_t; + const refactor_t refactor_item_d = refactor_t(refactor_unary_d); +@@ -112,8 +112,8 @@ + typename ItemT, typename DelimT + > + static typename parser_result<ParserT, ScannerT>::type +- parse(ScannerT const& scan, ParserT const& /*p*/, +- ItemT const &item, DelimT const &delim, no_list_endtoken const&) ++ parse(ScannerT const& scan, __attribute__ ((unused)) ParserT const& /*p*/, ++ ItemT const &item, DelimT const &delim, __attribute__ ((unused)) no_list_endtoken const&) + { + return ( + (item - delim) +--- misc/boost_1_44_0/boost/throw_exception.hpp 2010-07-03 23:32:02.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/throw_exception.hpp 2012-01-20 12:44:07.127316333 +0100 +@@ -49,7 +49,7 @@ + + #else + +-inline void throw_exception_assert_compatibility( std::exception const & ) { } ++inline void throw_exception_assert_compatibility( __attribute__ ((unused)) std::exception const & ) { } + + template<class E> BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const & e ) + { +--- misc/boost_1_44_0/boost/unordered/detail/node.hpp 2009-09-24 23:12:46.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/unordered/detail/node.hpp 2012-01-20 12:44:07.128316328 +0100 +@@ -35,7 +35,7 @@ + } + + template <class A> +- inline std::size_t ungrouped_node_base<A>::group_count(node_ptr) ++ inline std::size_t ungrouped_node_base<A>::group_count(__attribute__ ((unused)) node_ptr) + { + return 1; + } +--- misc/boost_1_44_0/boost/unordered/detail/util.hpp 2010-02-25 20:05:01.000000000 +0100 ++++ misc/build/boost_1_44_0/boost/unordered/detail/util.hpp 2012-01-20 12:44:07.128316328 +0100 +@@ -149,7 +149,7 @@ + #if defined(BOOST_UNORDERED_STD_FORWARD) + + template <class T, class... Args> +- inline void construct_impl(T*, void* address, Args&&... args) ++ inline void construct_impl(__attribute__ ((unused)) T*, void* address, Args&&... args) + { + new(address) T(std::forward<Args>(args)...); + } +@@ -262,7 +262,7 @@ + + #endif + template <class K, class M> +- void construct_pair(K const& k, M*) ++ void construct_pair(K const& k, __attribute__ ((unused)) M*) + { + construct_preamble(); + new(node_->address()) value_type(k, M()); +--- misc/boost_1_44_0/boost/utility/addressof.hpp 2009-05-16 20:15:17.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/utility/addressof.hpp 2012-01-20 12:44:07.128316328 +0100 +@@ -34,7 +34,7 @@ + + template<class T> struct addressof_impl + { +- static inline T * f( T & v, long ) ++ static inline T * f( T & v, __attribute__ ((unused)) long ) + { + return reinterpret_cast<T*>( + &const_cast<char&>(reinterpret_cast<const volatile char &>(v))); +--- misc/boost_1_44_0/boost/variant/detail/visitation_impl.hpp 2010-06-10 17:32:07.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/variant/detail/visitation_impl.hpp 2012-01-20 12:44:07.128316328 +0100 +@@ -121,7 +121,7 @@ + inline + BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(typename Visitor::result_type) + visitation_impl_invoke_impl( +- int, Visitor& visitor, VoidPtrCV storage, T* ++ int, Visitor& visitor, VoidPtrCV storage, __attribute__ ((unused)) T* + , mpl::true_// never_uses_backup + ) + { +@@ -158,7 +158,7 @@ + visitation_impl_invoke( + int internal_which, Visitor& visitor, VoidPtrCV storage, T* t + , NoBackupFlag +- , int ++ , __attribute__ ((unused)) int + ) + { + typedef typename mpl::or_< +@@ -176,7 +176,7 @@ + template <typename Visitor, typename VoidPtrCV, typename NBF> + inline + BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(typename Visitor::result_type) +-visitation_impl_invoke(int, Visitor&, VoidPtrCV, apply_visitor_unrolled*, NBF, long) ++visitation_impl_invoke(__attribute__ ((unused)) int, __attribute__ ((unused)) Visitor&, VoidPtrCV, __attribute__ ((unused)) apply_visitor_unrolled*, NBF, __attribute__ ((unused)) long) + { + // should never be here at runtime: + BOOST_ASSERT(false); +@@ -198,9 +198,9 @@ + inline + BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(typename Visitor::result_type) + visitation_impl( +- int, int, Visitor&, VPCV ++ __attribute__ ((unused)) int, __attribute__ ((unused)) int, __attribute__ ((unused)) Visitor&, VPCV + , mpl::true_ // is_apply_visitor_unrolled +- , NBF, W* = 0, S* = 0 ++ , NBF, __attribute__ ((unused)) W* = 0, __attribute__ ((unused)) S* = 0 + ) + { + // should never be here at runtime: +@@ -221,7 +221,7 @@ + , Visitor& visitor, VoidPtrCV storage + , mpl::false_ // is_apply_visitor_unrolled + , NoBackupFlag no_backup_flag +- , Which* = 0, step0* = 0 ++ , __attribute__ ((unused)) Which* = 0, __attribute__ ((unused)) step0* = 0 + ) + { + // Typedef apply_visitor_unrolled steps and associated types... +--- misc/boost_1_44_0/boost/variant/get.hpp 2005-08-25 18:27:28.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/variant/get.hpp 2012-01-20 12:44:07.129316324 +0100 +@@ -85,7 +85,7 @@ + } + + template <typename U> +- pointer operator()(const U&) const ++ pointer operator()(__attribute__ ((unused)) const U&) const + { + return static_cast<pointer>(0); + } +--- misc/boost_1_44_0/boost/variant/variant.hpp 2010-06-10 17:32:07.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/variant/variant.hpp 2012-01-20 12:44:07.129316324 +0100 +@@ -290,7 +290,7 @@ + + template <typename T> + BOOST_VARIANT_AUX_RETURN_VOID_TYPE +- internal_visit(T& operand, int) const ++ internal_visit(T& operand, __attribute__ ((unused)) int) const + { + operand.~T(); + +@@ -404,7 +404,7 @@ + + template <typename T> + BOOST_VARIANT_AUX_RETURN_VOID_TYPE +- internal_visit(const T& operand, int) const ++ internal_visit(const T& operand, __attribute__ ((unused)) int) const + { + new(storage_) T(operand); + BOOST_VARIANT_AUX_RETURN_VOID; +@@ -454,7 +454,7 @@ + + template <typename T> + BOOST_VARIANT_AUX_RETURN_VOID_TYPE +- internal_visit(T& lhs_content, int) const ++ internal_visit(T& lhs_content, __attribute__ ((unused)) int) const + { + // NOTE TO USER : + // Compile error here indicates one of variant's bounded types does +@@ -502,7 +502,7 @@ + } + + template <typename U> +- bool operator()(U&) ++ bool operator()(__attribute__ ((unused)) U&) + { + return false; + } +@@ -827,7 +827,7 @@ + public: // internal visitor interfaces + + template <typename T> +- result_type internal_visit(T& operand, int) ++ result_type internal_visit(T& operand, __attribute__ ((unused)) int) + { + return visitor_(operand); + } +@@ -1225,7 +1225,7 @@ + public: // internal visitor interfaces (below) + + template <typename T> +- int internal_visit(T& operand, int) const ++ int internal_visit(T& operand, __attribute__ ((unused)) int) const + { + // NOTE TO USER : + // Compile error here indicates one of the source variant's types +@@ -1288,7 +1288,7 @@ + template <typename T> + void convert_construct( + T& operand +- , int ++ , __attribute__ ((unused)) int + , mpl::false_ = mpl::false_() // is_foreign_variant + ) + { +@@ -1308,7 +1308,7 @@ + template <typename Variant> + void convert_construct( + Variant& operand +- , long ++ , __attribute__ ((unused)) long + , mpl::true_// is_foreign_variant + ) + { +@@ -1348,7 +1348,7 @@ + template <BOOST_VARIANT_ENUM_PARAMS(typename U)> + void convert_construct( + boost::variant<BOOST_VARIANT_ENUM_PARAMS(U)>& operand +- , long ++ , __attribute__ ((unused)) long + ) + { + convert_construct_variant(operand); +@@ -1553,7 +1553,7 @@ + + template <typename RhsT> + BOOST_VARIANT_AUX_RETURN_VOID_TYPE +- internal_visit(const RhsT& rhs_content, int) ++ internal_visit(const RhsT& rhs_content, __attribute__ ((unused)) int) + { + typedef typename has_nothrow_copy<RhsT>::type + nothrow_copy; +--- misc/boost_1_44_0/libs/date_time/src/gregorian/greg_month.cpp 2012-01-20 15:24:32.362576125 +0100 ++++ misc/build/boost_1_44_0/libs/date_time/src/gregorian/greg_month.cpp 2012-01-20 12:44:07.130316320 +0100 +@@ -108,7 +108,7 @@ + */ + BOOST_DATE_TIME_DECL + boost::date_time::all_date_names_put<greg_facet_config, char>* +- create_facet_def(char /* type */) ++ create_facet_def(__attribute__ ((unused)) char /* type */) + { + typedef + boost::date_time::all_date_names_put<greg_facet_config, char> facet_def; +@@ -121,7 +121,7 @@ + } + + //! generates a locale with the set of gregorian name-strings of type char* +- BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, char /* type */){ ++ BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, __attribute__ ((unused)) char /* type */){ + typedef boost::date_time::all_date_names_put<greg_facet_config, char> facet_def; + return std::locale(loc, new facet_def(short_month_names, + long_month_names, +@@ -139,7 +139,7 @@ + */ + BOOST_DATE_TIME_DECL + boost::date_time::all_date_names_put<greg_facet_config, wchar_t>* +- create_facet_def(wchar_t /* type */) ++ create_facet_def(__attribute__ ((unused)) wchar_t /* type */) + { + typedef + boost::date_time::all_date_names_put<greg_facet_config,wchar_t> facet_def; +@@ -152,7 +152,7 @@ + } + + //! generates a locale with the set of gregorian name-strings of type wchar_t* +- BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, wchar_t /* type */){ ++ BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, __attribute__ ((unused)) wchar_t /* type */){ + typedef boost::date_time::all_date_names_put<greg_facet_config, wchar_t> facet_def; + return std::locale(loc, new facet_def(w_short_month_names, + w_long_month_names, diff --git a/boost/makefile.mk b/boost/makefile.mk index f9cd078257a1..093566bb579c 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -66,6 +66,11 @@ PATCH_FILES+=boost.6397.warnings.patch PATCH_FILES+=boost.windows.patch +# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h): +.IF "$(COM)" == "GCC" +PATCH_FILES += boost_1_44_0-unused-parameters.patch +.END + ADDITIONAL_FILES= \ libs/thread/src/win32/makefile.mk \ libs/date_time/src/gregorian/makefile.mk diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index f0b9d64859f9..0b92ab6814e9 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -520,8 +520,8 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( //================================================================================================== void bridges::cpp_uno::shared::VtableFactory::flushCode( - unsigned char const *, unsigned char const * ) -{ -} + SAL_UNUSED_PARAMETER unsigned char const *, + SAL_UNUSED_PARAMETER unsigned char const * ) +{} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index c39f6ddb8101..341a128a7045 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -57,7 +57,7 @@ using namespace ::__cxxabiv1; namespace CPPU_CURRENT_NAMESPACE { -void dummy_can_throw_anything( char const * ) +void dummy_can_throw_anything( SAL_UNUSED_PARAMETER char const * ) { } diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index c40c4515179f..b6914de1a97e 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -189,7 +189,8 @@ static void SAL_CALL releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCpp uno_Environment_invoke(&pExtEnv->aBase, s_stub_releaseInterface, pExtEnv, pCppI); } -static void SAL_CALL environmentDisposing( uno_Environment * ) SAL_THROW( () ) +static void SAL_CALL environmentDisposing( + SAL_UNUSED_PARAMETER uno_Environment * ) SAL_THROW( () ) { bridges::cpp_uno::shared::g_moduleCount.modCnt.release( &bridges::cpp_uno::shared::g_moduleCount.modCnt ); diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 830d899ea91a..d44c2e6f52bd 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -74,7 +74,9 @@ using bridges::cpp_uno::shared::VtableFactory; namespace { -extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) { +extern "C" void * SAL_CALL allocExec( + SAL_UNUSED_PARAMETER rtl_arena_type *, sal_Size * size) +{ sal_Size pagesize; #if defined SAL_UNX #if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY @@ -113,7 +115,7 @@ extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) { } extern "C" void SAL_CALL freeExec( - rtl_arena_type *, void * address, sal_Size size) + SAL_UNUSED_PARAMETER rtl_arena_type *, void * address, sal_Size size) { #if defined SAL_UNX munmap(static_cast< char * >(address), size); diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java index 076d568e9c91..7625df04b747 100644 --- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java +++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java @@ -137,7 +137,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler //__________________________________________________________________________ private native Object dispatch_call( - long bridge_handle, String decl_class, String method, Object args [] ) + long bridge_handle, String method, Object args [] ) throws Throwable; // InvocationHandler impl @@ -172,8 +172,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler else if (decl_class.isAssignableFrom( m_class )) { // dispatch interface call - return dispatch_call( - m_bridge_handle, decl_class.getName(), method_name, args ); + return dispatch_call( m_bridge_handle, method_name, args ); } // IQueryInterface impl else if (IQueryInterface.class.equals( decl_class )) @@ -185,9 +184,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler m_java_env.getRegisteredInterface( m_oid, (Type)args[ 0 ] ); if (null == registered_proxy) { - return dispatch_call( - m_bridge_handle, - "com.sun.star.uno.XInterface", method_name, args ); + return dispatch_call( m_bridge_handle, method_name, args ); } else { diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx index 4a3228c043f4..a5ed28aacb5e 100644 --- a/bridges/source/jni_uno/jni_info.cxx +++ b/bridges/source/jni_uno/jni_info.cxx @@ -984,7 +984,7 @@ extern "C" //------------------------------------------------------------------------------ JNIEXPORT void JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1info_1holder_finalize__J( - JNIEnv * jni_env, jobject, jlong jni_info_handle ) + JNIEnv * jni_env, SAL_UNUSED_PARAMETER jobject, jlong jni_info_handle ) SAL_THROW_EXTERN_C() { ::jni_uno::JNI_info * jni_info = diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index d8496f049841..55674b44dd3d 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -390,8 +390,8 @@ extern "C" //------------------------------------------------------------------------------ JNIEXPORT jobject JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( - JNIEnv * jni_env, jobject jo_proxy, jlong bridge_handle, jstring, - jstring jo_method, jobjectArray jo_args /* may be 0 */ ) + JNIEnv * jni_env, jobject jo_proxy, jlong bridge_handle, jstring jo_method, + jobjectArray jo_args /* may be 0 */ ) SAL_THROW_EXTERN_C() { Bridge const * bridge = reinterpret_cast< Bridge const * >( bridge_handle ); diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx index b51031756889..8ed0d9ee27a7 100644 --- a/bridges/source/jni_uno/nativethreadpool.cxx +++ b/bridges/source/jni_uno/nativethreadpool.cxx @@ -94,7 +94,7 @@ static void SAL_CALL executeRequest(void * data) { extern "C" JNIEXPORT jbyteArray JNICALL Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_threadId( - JNIEnv * env, jclass) SAL_THROW_EXTERN_C() + JNIEnv * env, SAL_UNUSED_PARAMETER jclass) SAL_THROW_EXTERN_C() { sal_Sequence * s = 0; uno_getIdOfCurrentThread(&s); //TODO: out of memory @@ -119,7 +119,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_threadId( extern "C" JNIEXPORT jlong JNICALL Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_create( - JNIEnv * env, jclass) SAL_THROW_EXTERN_C() + JNIEnv * env, SAL_UNUSED_PARAMETER jclass) SAL_THROW_EXTERN_C() { JavaVM * vm; if (env->GetJavaVM(&vm) != JNI_OK) { //TODO: no Java exception raised? @@ -149,14 +149,15 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_create( extern "C" JNIEXPORT void JNICALL Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_attach( - JNIEnv *, jclass, jlong pool) SAL_THROW_EXTERN_C() + SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool) + SAL_THROW_EXTERN_C() { uno_threadpool_attach(reinterpret_cast< Pool * >(pool)->pool); } extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_enter( - JNIEnv * env, jclass, jlong pool) SAL_THROW_EXTERN_C() + JNIEnv * env, SAL_UNUSED_PARAMETER jclass, jlong pool) SAL_THROW_EXTERN_C() { jobject job; uno_threadpool_enter( @@ -172,15 +173,16 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_enter( extern "C" JNIEXPORT void JNICALL Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_detach( - JNIEnv *, jclass, jlong pool) SAL_THROW_EXTERN_C() + SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool) + SAL_THROW_EXTERN_C() { uno_threadpool_detach(reinterpret_cast< Pool * >(pool)->pool); } extern "C" JNIEXPORT void JNICALL Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_putJob( - JNIEnv * env, jclass, jlong pool, jbyteArray threadId, jobject job, - jboolean request, jboolean oneWay) SAL_THROW_EXTERN_C() + JNIEnv * env, SAL_UNUSED_PARAMETER jclass, jlong pool, jbyteArray threadId, + jobject job, jboolean request, jboolean oneWay) SAL_THROW_EXTERN_C() { void * s = env->GetPrimitiveArrayCritical(threadId, 0); if (s == 0) { @@ -214,14 +216,16 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_putJob( extern "C" JNIEXPORT void JNICALL Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_dispose( - JNIEnv *, jclass, jlong pool) SAL_THROW_EXTERN_C() + SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool) + SAL_THROW_EXTERN_C() { uno_threadpool_dispose(reinterpret_cast< Pool * >(pool)->pool); } extern "C" JNIEXPORT void JNICALL Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_destroy( - JNIEnv *, jclass, jlong pool) SAL_THROW_EXTERN_C() + SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool) + SAL_THROW_EXTERN_C() { Pool * p = reinterpret_cast< Pool * >(pool); uno_threadpool_destroy(p->pool); diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index dc238fcc74f1..ccc7a8135bf1 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -249,7 +249,7 @@ void CppuType::dumpGetCppuTypePreamble(FileStream & out) { out << "\n\n"; } out << ("inline ::com::sun::star::uno::Type const &" - " cppu_detail_getUnoType("); + " cppu_detail_getUnoType(SAL_UNUSED_PARAMETER "); dumpType(out, m_typeName, false, false, true); out << " const *) {\n"; } @@ -271,7 +271,8 @@ void CppuType::dumpGetCppuTypePostamble(FileStream & out) { } } dumpTemplateHead(out); - out << "inline ::com::sun::star::uno::Type const & SAL_CALL getCppuType("; + out << ("inline ::com::sun::star::uno::Type const & SAL_CALL" + " getCppuType(SAL_UNUSED_PARAMETER "); dumpType(out, m_typeName); dumpTemplateParameters(out); out << " const *) SAL_THROW(()) {\n"; @@ -531,7 +532,7 @@ void CppuType::dumpHFileContent( { out << "\n" << indent() << ("inline ::com::sun::star::uno::Type const &" - " cppu_detail_getUnoType("); + " cppu_detail_getUnoType(SAL_UNUSED_PARAMETER "); dumpType(out, m_typeName, false, false, true); out << " const *);\n"; } @@ -550,7 +551,7 @@ void CppuType::dumpGetCppuType(FileStream & out) { if (m_typeName.equals("com/sun/star/uno/XInterface")) { out << indent() << ("inline ::com::sun::star::uno::Type const & SAL_CALL" - " getCppuType("); + " getCppuType(SAL_UNUSED_PARAMETER "); dumpType(out, m_typeName, true, false); out << " *) SAL_THROW(()) {\n"; inc(); @@ -562,7 +563,7 @@ void CppuType::dumpGetCppuType(FileStream & out) { } else if (m_typeName.equals("com/sun/star/uno/Exception")) { out << indent() << ("inline ::com::sun::star::uno::Type const & SAL_CALL" - " getCppuType("); + " getCppuType(SAL_UNUSED_PARAMETER "); dumpType(out, m_typeName, true, false); out << " *) SAL_THROW(()) {\n"; inc(); @@ -1435,7 +1436,7 @@ sal_Bool InterfaceType::dumpHxxFile( o << "\n::com::sun::star::uno::Type const & " << scopedCppName(m_typeName) - << "::static_type(void *) {\n"; + << "::static_type(SAL_UNUSED_PARAMETER void *) {\n"; inc(); o << indent() << "return ::getCppuType(static_cast< "; dumpType(o, m_typeName); diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index 83f61d750328..1453122ce749 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -842,8 +842,9 @@ typedef void (* handleUnoTypeRegistryEntityFunction)( typereg::Reader const & reader, Dependencies * dependencies); void handleEnumType( - TypeManager const &, JavaOptions /*TODO const*/ & options, - typereg::Reader const & reader, Dependencies *) + SAL_UNUSED_PARAMETER TypeManager const &, + JavaOptions /*TODO const*/ & options, typereg::Reader const & reader, + SAL_UNUSED_PARAMETER Dependencies *) { sal_uInt16 fields = reader.getFieldCount(); if (fields == 0 || reader.getSuperTypeCount() != 0 @@ -2364,7 +2365,8 @@ void handleInterfaceType( } void handleTypedef( - TypeManager const & manager, JavaOptions /*TODO const*/ &, + TypeManager const & manager, + SAL_UNUSED_PARAMETER JavaOptions /*TODO const*/ &, typereg::Reader const & reader, Dependencies * dependencies) { OSL_ASSERT(dependencies != 0); diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx index 5893313c8497..8397e7c5fce7 100644 --- a/comphelper/inc/comphelper/componentmodule.hxx +++ b/comphelper/inc/comphelper/componentmodule.hxx @@ -31,7 +31,6 @@ #include <comphelper/comphelperdllapi.h> /** === begin UNO includes === **/ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/uno/Sequence.hxx> /** === end UNO includes === **/ @@ -141,23 +140,17 @@ namespace comphelper /** creates a Factory for the component with the given implementation name. <p>Usually used from within component_getFactory.<p/> - @param _rxServiceManager - a pointer to an XMultiServiceFactory interface as got in component_getFactory @param _pImplementationName the implementation name of the component @return the XInterface access to a factory for the component */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( - const ::rtl::OUString& _rImplementationName, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager - ); + const ::rtl::OUString& _rImplementationName ); - /** version of getComponentFactory which directly takes the arguments you got in your component_getFactory call + /** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call */ - void* getComponentFactory( - const sal_Char* _pImplementationName, void* _pServiceManager, void* _pRegistryKey - ); + void* getComponentFactory( const sal_Char* _pImplementationName ); public: class ClientAccess { friend class OModuleClient; private: ClientAccess() { } }; diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index 7fb13d1a900d..538c7d42b531 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -34,8 +34,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> - #include <vector> @@ -256,7 +254,7 @@ sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const ::rtl:: uno::Reference< uno::XInterface > SAL_CALL IndexedPropertyValuesContainer::Create( - const uno::Reference< uno::XComponentContext >&) + SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >&) { return (cppu::OWeakObject*)new IndexedPropertyValuesContainer(); } diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 954aabf1c4d8..0bf692a8aca5 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/stl_types.hxx> @@ -227,7 +226,7 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const ::rtl::OU } uno::Reference< uno::XInterface > SAL_CALL NamedPropertyValuesContainer::Create( - const uno::Reference< uno::XComponentContext >&) + SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >&) { return (cppu::OWeakObject*)new NamedPropertyValuesContainer(); } diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx index 9d00f76b5f4f..da91afe8f547 100644 --- a/comphelper/source/misc/comphelper_services.cxx +++ b/comphelper/source/misc/comphelper_services.cxx @@ -84,10 +84,11 @@ namespace comphelper { namespace module //........................................................................ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL comphelp_component_getFactory( - const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) + const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, + SAL_UNUSED_PARAMETER void* ) { ::comphelper::module::initializeModule(); - return ::comphelper::module::ComphelperModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey ); + return ::comphelper::module::ComphelperModule::getInstance().getComponentFactory( pImplementationName ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index f5e190d1f823..6f4e1fe6f60d 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -137,18 +137,15 @@ namespace comphelper } //-------------------------------------------------------------------------- - void* OModule::getComponentFactory( const sal_Char* _pImplementationName, void* _pServiceManager, void* /*_pRegistryKey*/ ) + void* OModule::getComponentFactory( const sal_Char* _pImplementationName ) { Reference< XInterface > xFactory( getComponentFactory( - ::rtl::OUString::createFromAscii( _pImplementationName ), - Reference< XMultiServiceFactory >( static_cast< XMultiServiceFactory* >( _pServiceManager ) ) - ) ); + ::rtl::OUString::createFromAscii( _pImplementationName ) ) ); return xFactory.get(); } //-------------------------------------------------------------------------- - Reference< XInterface > OModule::getComponentFactory( const ::rtl::OUString& _rImplementationName, - const Reference< XMultiServiceFactory >& /* _rxServiceManager */ ) + Reference< XInterface > OModule::getComponentFactory( const ::rtl::OUString& _rImplementationName ) { Reference< XInterface > xReturn; diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx index 532a2bdb21d0..a3a29df98a62 100644 --- a/comphelper/source/misc/documentiologring.cxx +++ b/comphelper/source/misc/documentiologring.cxx @@ -40,7 +40,7 @@ namespace comphelper { // ---------------------------------------------------------- -OSimpleLogRing::OSimpleLogRing( const uno::Reference< uno::XComponentContext >& /*xContext*/ ) +OSimpleLogRing::OSimpleLogRing() : m_aMessages( SIMPLELOGRING_SIZE ) , m_bInitialized( sal_False ) , m_bFull( sal_False ) @@ -80,9 +80,9 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNam } // ---------------------------------------------------------- -uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( const uno::Reference< uno::XComponentContext >& rxContext ) +uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >& ) { - return static_cast< cppu::OWeakObject* >( new OSimpleLogRing( rxContext ) ); + return static_cast< cppu::OWeakObject* >( new OSimpleLogRing ); } // XSimpleLogRing diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 90acd7f9152b..c51c309a730f 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -30,7 +30,6 @@ #define __DOCUMENTIOLOGRING_HXX_ #include <com/sun/star/logging/XSimpleLogRing.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -54,7 +53,7 @@ class OSimpleLogRing : public ::cppu::WeakImplHelper3< ::com::sun::star::logging sal_Int32 m_nPos; public: - OSimpleLogRing( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + OSimpleLogRing(); virtual ~OSimpleLogRing(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index e480a56331c1..74879e4450ce 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -233,7 +233,7 @@ Sequence< ::rtl::OUString > SAL_CALL UNOMemoryStream::getSupportedServiceNames_s } Reference< XInterface > SAL_CALL UNOMemoryStream::Create( - const Reference< XComponentContext >& ) + SAL_UNUSED_PARAMETER const Reference< XComponentContext >& ) { return static_cast<OWeakObject*>(new UNOMemoryStream()); } diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index c85d779c612b..e8dd518e1f80 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -133,7 +133,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SequenceInputStreamService::getSupport } uno::Reference< uno::XInterface > SAL_CALL SequenceInputStreamService::Create( - const uno::Reference< uno::XComponentContext >& ) + SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >& ) { return static_cast< ::cppu::OWeakObject * >( new SequenceInputStreamService() ); } diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index 3cfbb912db16..7b94a1e7150a 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -118,7 +118,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SequenceOutputStreamService::getSuppor } uno::Reference< uno::XInterface > SAL_CALL SequenceOutputStreamService::Create( - const uno::Reference< uno::XComponentContext >& ) + SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >& ) { return static_cast< ::cppu::OWeakObject * >( new SequenceOutputStreamService()); } diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index 5a7ed78d4093..fcb605e42819 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -537,8 +537,10 @@ css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Reference< css::lang::XSingleComponentFactory > createFactory( - cppu::ComponentFactoryFunc, rtl::OUString const &, - css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *) + SAL_UNUSED_PARAMETER cppu::ComponentFactoryFunc, + SAL_UNUSED_PARAMETER rtl::OUString const &, + SAL_UNUSED_PARAMETER css::uno::Sequence< rtl::OUString > const &, + SAL_UNUSED_PARAMETER rtl_ModuleCount *) SAL_THROW(()) { return new Factory; diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx index 5c58eb719ac2..656f9d418d9b 100644 --- a/configmgr/source/services.cxx +++ b/configmgr/source/services.cxx @@ -51,7 +51,8 @@ namespace { namespace css = com::sun::star; css::uno::Reference< css::uno::XInterface > SAL_CALL dummy( - css::uno::Reference< css::uno::XComponentContext > const &) + SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > + const &) SAL_THROW((css::uno::Exception)) { assert(false); diff --git a/cosv/inc/cosv/std_outp.hxx b/cosv/inc/cosv/std_outp.hxx index cf81728bfd22..87b05643e8f4 100644 --- a/cosv/inc/cosv/std_outp.hxx +++ b/cosv/inc/cosv/std_outp.hxx @@ -106,11 +106,11 @@ Cerr() -typedef void (*F_FLUSHING_FUNC)(ostream&, bool, int*); +typedef void (*F_FLUSHING_FUNC)(ostream&); -void Endl( ostream&, bool, int* ); +void Endl( ostream& ); -void Flush( ostream&, bool, int* ); +void Flush( ostream& ); } // namespace csv @@ -123,7 +123,7 @@ operator<<( csv::ostream & io_rStream, { #ifndef CSV_NO_IOSTREAMS // (*i_fFlushingFunc)( io_rStream, csv::redirect_out::useme_(), 0 ); - (*i_fFlushingFunc)( io_rStream, false, 0 ); + (*i_fFlushingFunc)( io_rStream ); #else csv_assert( csv::redirect_out::useme_() ); (*i_fFlushingFunc)( io_rStream, true, 0 ); diff --git a/cosv/inc/cosv/streamstr.hxx b/cosv/inc/cosv/streamstr.hxx index ef71a637dce2..f91cef4c3562 100644 --- a/cosv/inc/cosv/streamstr.hxx +++ b/cosv/inc/cosv/streamstr.hxx @@ -29,6 +29,10 @@ #ifndef CSV_STREAMSTR_HXX #define CSV_STREAMSTR_HXX +#include "sal/config.h" + +#include "sal/types.h" + // BASE CLASSES #include <cosv/bstream.hxx> // USED SERVICES @@ -271,7 +275,7 @@ class StreamStrLock // IMPLEMENTATION inline const char * -StreamStr::operator<<( F_CSTR ) +StreamStr::operator<<( SAL_UNUSED_PARAMETER F_CSTR ) { return dpData; } inline void StreamStr::clear() diff --git a/cosv/prj/build.lst b/cosv/prj/build.lst index dd519e1fc446..140c617320d7 100644 --- a/cosv/prj/build.lst +++ b/cosv/prj/build.lst @@ -1,4 +1,4 @@ -cs cosv : soltools NULL +cs cosv : sal soltools NULL cs cosv usr1 - all cs_mkout NULL cs cosv\prj get - all cs_prj NULL cs cosv\inc get - all cs_inc NULL diff --git a/cosv/source/service/std_outp.cxx b/cosv/source/service/std_outp.cxx index bac720a801f7..d7077b54e876 100644 --- a/cosv/source/service/std_outp.cxx +++ b/cosv/source/service/std_outp.cxx @@ -50,7 +50,7 @@ redirect_out * redirect_out::pStdErr_ = 0; void -Endl( ostream & io_rStream, bool /*bUseRedirect*/, int* ) +Endl( ostream & io_rStream ) { #ifndef CSV_NO_IOSTREAMS // if (NOT bUseRedirect) @@ -61,7 +61,7 @@ Endl( ostream & io_rStream, bool /*bUseRedirect*/, int* ) } void -Flush( ostream & io_rStream, bool /*bUseRedirect*/, int* ) +Flush( ostream & io_rStream ) { #ifndef CSV_NO_IOSTREAMS // if (NOT bUseRedirect) diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h index a2fe589682f4..b904d08ec356 100644 --- a/cppu/inc/com/sun/star/uno/Any.h +++ b/cppu/inc/com/sun/star/uno/Any.h @@ -375,7 +375,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v @return type of IDL type any */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Any * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Any * ) SAL_THROW( () ) { return ::cppu::UnoType< ::com::sun::star::uno::Any >::get(); } diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx index c86c629df7bc..c8907d34e6bd 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.hxx +++ b/cppu/inc/com/sun/star/uno/Sequence.hxx @@ -225,7 +225,9 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence( namespace cppu { template< typename T > inline ::com::sun::star::uno::Type const & -getTypeFavourUnsigned(::com::sun::star::uno::Sequence< T > const *) { +getTypeFavourUnsigned( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Sequence< T > const *) +{ if (::com::sun::star::uno::Sequence< T >::s_pType == 0) { ::typelib_static_sequence_type_init( &::com::sun::star::uno::Sequence< T >::s_pType, @@ -240,7 +242,9 @@ getTypeFavourUnsigned(::com::sun::star::uno::Sequence< T > const *) { } template< typename T > inline ::com::sun::star::uno::Type const & -getTypeFavourChar(::com::sun::star::uno::Sequence< T > const *) { +getTypeFavourChar( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Sequence< T > const *) +{ //TODO On certain platforms with weak memory models, the following code can // result in some threads observing that td points to garbage: static typelib_TypeDescriptionReference * td = 0; @@ -261,7 +265,8 @@ getTypeFavourChar(::com::sun::star::uno::Sequence< T > const *) { // generic sequence template template< class E > inline const ::com::sun::star::uno::Type & -SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * ) +SAL_CALL getCppuType( + SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Sequence< E > * ) SAL_THROW( () ) { return ::cppu::getTypeFavourUnsigned( diff --git a/cppu/inc/com/sun/star/uno/Type.hxx b/cppu/inc/com/sun/star/uno/Type.hxx index 46fd86329424..6b53d8192931 100644 --- a/cppu/inc/com/sun/star/uno/Type.hxx +++ b/cppu/inc/com/sun/star/uno/Type.hxx @@ -103,7 +103,7 @@ typelib_TypeDescriptionReference * Array< T >::s_pType = 0; } } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Type * ) SAL_THROW( () ) { return ::cppu::UnoType< ::com::sun::star::uno::Type >::get(); } @@ -125,13 +125,13 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THR { return ::cppu::UnoType< bool >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Bool * ) SAL_THROW( () ) { return ::cppu::UnoType< bool >::get(); } inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( - bool const * ) SAL_THROW( () ) + SAL_UNUSED_PARAMETER bool const * ) SAL_THROW( () ) { return ::cppu::UnoType< bool >::get(); } @@ -145,52 +145,52 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( return ::cppu::UnoType< ::cppu::UnoCharType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int8 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int8 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::rtl::OUString * ) SAL_THROW( () ) { return ::cppu::UnoType< ::rtl::OUString >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int16 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int16 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt16 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int32 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int32 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt32 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_uInt32 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int64 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int64 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt64 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_uInt64 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const float * ) SAL_THROW( () ) { return ::cppu::UnoType< float >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const double * ) SAL_THROW( () ) { return ::cppu::UnoType< double >::get(); } diff --git a/cppu/inc/cppu/unotype.hxx b/cppu/inc/cppu/unotype.hxx index eedd01d7c7fb..a62a137d62ce 100644 --- a/cppu/inc/cppu/unotype.hxx +++ b/cppu/inc/cppu/unotype.hxx @@ -123,90 +123,96 @@ namespace cppu { namespace detail { #endif inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::cppu::UnoVoidType const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoVoidType const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_VOID); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(bool const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER bool const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_BOOLEAN); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_Bool const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_Bool const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_BOOLEAN); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_Int8 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_Int8 const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_BYTE); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_Int16 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_Int16 const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_SHORT); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::cppu::UnoUnsignedShortType const *) { +cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::cppu::UnoUnsignedShortType const *) +{ return ::cppu::detail::getTypeFromTypeClass( ::typelib_TypeClass_UNSIGNED_SHORT); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_Int32 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_Int32 const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_LONG); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_uInt32 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_uInt32 const *) { return ::cppu::detail::getTypeFromTypeClass( ::typelib_TypeClass_UNSIGNED_LONG); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_Int64 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_Int64 const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_HYPER); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_uInt64 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_uInt64 const *) { return ::cppu::detail::getTypeFromTypeClass( ::typelib_TypeClass_UNSIGNED_HYPER); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(float const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER float const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_FLOAT); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(double const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER double const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_DOUBLE); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::cppu::UnoCharType const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoCharType const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_CHAR); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::rtl::OUString const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::rtl::OUString const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_STRING); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::Type const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::com::sun::star::uno::Type const *) +{ return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_TYPE); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::Any const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::com::sun::star::uno::Any const *) +{ return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_ANY); } template< typename T > inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::cppu::UnoSequenceType< T > const *) { +cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::cppu::UnoSequenceType< T > const *) +{ //TODO: depending on memory model, the following might not work reliably static typelib_TypeDescriptionReference * p = 0; if (p == 0) { @@ -217,23 +223,29 @@ cppu_detail_getUnoType(::cppu::UnoSequenceType< T > const *) { } template< typename T > inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::Sequence< T > const *) { +cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Sequence< T > const *) +{ return cppu_detail_getUnoType( static_cast< ::cppu::UnoSequenceType< T > * >(0)); } -inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::Exception const *) { +inline ::com::sun::star::uno::Type const & cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Exception const *) +{ return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_EXCEPTION); } -inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::XInterface const *) { +inline ::com::sun::star::uno::Type const & cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::XInterface const *) +{ return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_INTERFACE); } template< typename T > inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::Reference< T > const *) { +cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Reference< T > const *) +{ return ::cppu::UnoType< T >::get(); } @@ -287,7 +299,7 @@ private: @since UDK 3.2.2 */ template< typename T > inline ::com::sun::star::uno::Type const & -getTypeFavourUnsigned(T const *) { +getTypeFavourUnsigned(SAL_UNUSED_PARAMETER T const *) { return ::cppu::UnoType< T >::get(); } @@ -302,7 +314,7 @@ getTypeFavourUnsigned(T const *) { @since UDK 3.2.2 */ inline ::com::sun::star::uno::Type const & -getTypeFavourUnsigned(::sal_uInt16 const *) { +getTypeFavourUnsigned(SAL_UNUSED_PARAMETER ::sal_uInt16 const *) { return ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get(); } @@ -334,7 +346,7 @@ getTypeFavourUnsigned(::com::sun::star::uno::Sequence< T > const *); @since UDK 3.2.3 */ template< typename T > inline ::com::sun::star::uno::Type const & -getTypeFavourChar(T const *) { +getTypeFavourChar(SAL_UNUSED_PARAMETER T const *) { return ::cppu::UnoType< T >::get(); } @@ -350,7 +362,7 @@ getTypeFavourChar(T const *) { @since UDK 3.2.3 */ inline ::com::sun::star::uno::Type const & -getTypeFavourChar(::sal_Unicode const *) { +getTypeFavourChar(SAL_UNUSED_PARAMETER ::sal_Unicode const *) { return ::cppu::UnoType< ::cppu::UnoCharType >::get(); } diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 3770cb307afa..4b95d476c163 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -380,7 +380,8 @@ namespace com { namespace sun { namespace star { namespace uno { std::ostream & operator <<( - std::ostream & out, com::sun::star::uno::Exception const &) + std::ostream & out, + SAL_UNUSED_PARAMETER com::sun::star::uno::Exception const &) { return out << "<UNO exception>"; } diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index f6077d2a750e..0451f9484579 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -209,8 +209,8 @@ int LogBridge::v_isValid(rtl::OUString * pReason) void LogProbe( bool pre, - void * /*pThis*/, - void * /*pContext*/, + SAL_UNUSED_PARAMETER void * /*pThis*/, + SAL_UNUSED_PARAMETER void * /*pContext*/, typelib_TypeDescriptionReference * pReturnTypeRef, typelib_MethodParameter * pParams, sal_Int32 nParams, diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index 002b7eb56822..5d334be5cfad 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -183,7 +183,7 @@ extern "C" { static void SAL_CALL s_Proxy_dispatch( ppException ); }} -extern "C" void SAL_CALL Proxy_free(uno_ExtEnvironment * /*pEnv*/, void * pProxy) SAL_THROW_EXTERN_C() +extern "C" void SAL_CALL Proxy_free(SAL_UNUSED_PARAMETER uno_ExtEnvironment * /*pEnv*/, void * pProxy) SAL_THROW_EXTERN_C() { Proxy * pThis = static_cast<Proxy * >(reinterpret_cast<uno_Interface *>(pProxy)); delete pThis; diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 312fd89c4375..9dda867a0878 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -428,7 +428,7 @@ uno_threadpool_create() SAL_THROW_EXTERN_C() } extern "C" void SAL_CALL -uno_threadpool_attach( uno_ThreadPool ) SAL_THROW_EXTERN_C() +uno_threadpool_attach(SAL_UNUSED_PARAMETER uno_ThreadPool) SAL_THROW_EXTERN_C() { sal_Sequence *pThreadId = 0; uno_getIdOfCurrentThread( &pThreadId ); @@ -453,14 +453,14 @@ uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob ) } extern "C" void SAL_CALL -uno_threadpool_detach( uno_ThreadPool ) SAL_THROW_EXTERN_C() +uno_threadpool_detach(SAL_UNUSED_PARAMETER uno_ThreadPool) SAL_THROW_EXTERN_C() { // we might do here some tiding up in case a thread called attach but never detach } extern "C" void SAL_CALL uno_threadpool_putJob( - uno_ThreadPool, + SAL_UNUSED_PARAMETER uno_ThreadPool, sal_Sequence *pThreadId, void *pJob, void ( SAL_CALL * doRequest ) ( void *pThreadSpecificData ), diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx index 868a4d7c5e3c..ee1d9d1412e1 100644 --- a/cppu/source/uno/IdentityMapping.cxx +++ b/cppu/source/uno/IdentityMapping.cxx @@ -76,7 +76,7 @@ static void SAL_CALL s_release(uno_Mapping * pMapping) SAL_THROW(()) static void SAL_CALL s_mapInterface(uno_Mapping * pMapping, void ** ppOut, void * pInterface, - struct _typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/) + SAL_UNUSED_PARAMETER struct _typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/) SAL_THROW(()) { *ppOut = pInterface; diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 79581a5d765b..baced8b1d3dd 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -616,7 +616,7 @@ static void SAL_CALL defenv_harden( } //------------------------------------------------------------------------------ -static void SAL_CALL defenv_dispose( uno_Environment * ) +static void SAL_CALL defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * ) { } } @@ -908,7 +908,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier( //============================================================================== static void SAL_CALL unoenv_acquireInterface( - uno_ExtEnvironment *, void * pUnoI_ ) + SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ ) { uno_Interface * pUnoI = reinterpret_cast< uno_Interface * >(pUnoI_); (*pUnoI->acquire)( pUnoI ); @@ -916,7 +916,7 @@ static void SAL_CALL unoenv_acquireInterface( //============================================================================== static void SAL_CALL unoenv_releaseInterface( - uno_ExtEnvironment *, void * pUnoI_ ) + SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ ) { uno_Interface * pUnoI = reinterpret_cast< uno_Interface * >(pUnoI_); (*pUnoI->release)( pUnoI ); @@ -1059,8 +1059,7 @@ inline void EnvironmentsData::getRegisteredEnvironments( } static bool loadEnv(OUString const & cLibStem, - uno_Environment * pEnv, - void * /*pContext*/) + uno_Environment * pEnv) { #ifdef IOS oslModule hMod; @@ -1121,7 +1120,7 @@ static uno_Environment * initDefaultEnvironment( rtl::OUString libStem = envPurpose.copy(envPurpose.lastIndexOf(':') + 1); libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_uno_uno") ); - if(!loadEnv(libStem, pEnv, pContext)) + if(!loadEnv(libStem, pEnv)) { pEnv->release(pEnv); return NULL; @@ -1136,7 +1135,7 @@ static uno_Environment * initDefaultEnvironment( aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM("_uno" ) ); OUString aStr( aLibName.makeStringAndClear() ); - if (!loadEnv(aStr, pEnv, pContext)) + if (!loadEnv(aStr, pEnv)) { pEnv->release(pEnv); return NULL; diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index 55fb7cd5af43..105adae891c6 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -78,9 +78,9 @@ extern "C" { //------------------------------------------------------------------------------ -static void SAL_CALL ExceptionThrower_acquire_release_nop( uno_Interface * ) -{ -} +static void SAL_CALL ExceptionThrower_acquire_release_nop( + SAL_UNUSED_PARAMETER uno_Interface * ) +{} //------------------------------------------------------------------------------ static void SAL_CALL ExceptionThrower_dispatch( diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index cab323a17d4b..4a298d1cb188 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -956,9 +956,7 @@ class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleService public: - OFactoryProxyHelper( - const Reference<XMultiServiceFactory > & /*rServiceManager*/, - const Reference<XSingleServiceFactory > & rFactory ) + OFactoryProxyHelper( const Reference<XSingleServiceFactory > & rFactory ) SAL_THROW( () ) : xFactory( rFactory ) {} @@ -1053,12 +1051,11 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleFactory( // global function Reference<XSingleServiceFactory > SAL_CALL createFactoryProxy( - const Reference<XMultiServiceFactory > & rServiceManager, + SAL_UNUSED_PARAMETER const Reference<XMultiServiceFactory > &, const Reference<XSingleServiceFactory > & rFactory ) SAL_THROW( () ) { - return new OFactoryProxyHelper( - rServiceManager, rFactory ); + return new OFactoryProxyHelper( rFactory ); } // global function diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx index 4aa41501e9dd..bd617b8c9f2c 100644 --- a/cppuhelper/source/implementationentry.cxx +++ b/cppuhelper/source/implementationentry.cxx @@ -37,7 +37,8 @@ using namespace ::com::sun::star::registry; namespace cppu { sal_Bool component_writeInfoHelper( - void *, void *pRegistryKey , const struct ImplementationEntry entries[] ) + SAL_UNUSED_PARAMETER void *, void * pRegistryKey, + ImplementationEntry const * entries) { sal_Bool bRet = sal_False; try @@ -70,8 +71,8 @@ sal_Bool component_writeInfoHelper( void * component_getFactoryHelper( - const sal_Char * pImplName, void *, void *, - const struct ImplementationEntry entries[] ) + char const * pImplName, SAL_UNUSED_PARAMETER void *, + SAL_UNUSED_PARAMETER void *, ImplementationEntry const * entries) { void * pRet = 0; diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 35322327d169..431e24c76c01 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -111,7 +111,7 @@ protected: virtual void SAL_CALL disposing(); public: - inline Bootstrap_MacroExpander( Reference< XComponentContext > const & ) SAL_THROW( () ) + inline Bootstrap_MacroExpander() SAL_THROW( () ) : t_uno_impl( m_mutex ) {} virtual ~Bootstrap_MacroExpander() @@ -173,10 +173,10 @@ OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp ) //================================================================================================== Reference< XInterface > SAL_CALL service_create( - Reference< XComponentContext > const & xComponentContext ) + SAL_UNUSED_PARAMETER Reference< XComponentContext > const & ) SAL_THROW( (RuntimeException) ) { - return static_cast< ::cppu::OWeakObject * >( new Bootstrap_MacroExpander( xComponentContext ) ); + return static_cast< ::cppu::OWeakObject * >( new Bootstrap_MacroExpander ); } } diff --git a/cppuhelper/source/stdidlclass.cxx b/cppuhelper/source/stdidlclass.cxx index 8bb197eed1ad..e42d83bebe97 100644 --- a/cppuhelper/source/stdidlclass.cxx +++ b/cppuhelper/source/stdidlclass.cxx @@ -29,20 +29,22 @@ #include "sal/config.h" #include "cppuhelper/stdidlclass.hxx" -#include "osl/diagnose.h" +#include "sal/log.hxx" +#include "sal/types.h" namespace cppu { com::sun::star::reflection::XIdlClass * createStandardClassWithSequence( - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > - const &, - rtl::OUString const &, - com::sun::star::uno::Reference< com::sun::star::reflection::XIdlClass > - const &, - com::sun::star::uno::Sequence< rtl::OUString > const &) SAL_THROW(()) + SAL_UNUSED_PARAMETER com::sun::star::uno::Reference< + com::sun::star::lang::XMultiServiceFactory > const &, + SAL_UNUSED_PARAMETER rtl::OUString const &, + SAL_UNUSED_PARAMETER com::sun::star::uno::Reference< + com::sun::star::reflection::XIdlClass > const &, + SAL_UNUSED_PARAMETER com::sun::star::uno::Sequence< rtl::OUString > const &) + SAL_THROW(()) { - OSL_TRACE( - OSL_LOG_PREFIX + SAL_INFO( + "cppuhelper", "deprecated/defunct cppu::createStandardClassWithSequence called"); return 0; } diff --git a/cppunit/cppunit-1.12.1-unused-parameters.patch b/cppunit/cppunit-1.12.1-unused-parameters.patch new file mode 100644 index 000000000000..bb8e17fa21f8 --- /dev/null +++ b/cppunit/cppunit-1.12.1-unused-parameters.patch @@ -0,0 +1,11 @@ +--- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2012-01-18 10:28:28.189298501 +0100 ++++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2012-01-18 10:28:06.449450460 +0100 +@@ -153,7 +153,7 @@ + // Unix + #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER) + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ +- int main( int, char *[] ) \ ++ int main() \ + { \ + return 0; \ + } \ diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 20addae65dc9..316714962671 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -34,11 +34,13 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19 # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ # cppunit-1.12.1.tar.gz/download> -PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch +PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912590&group_id=11795&atid=311795> # warnings.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912630&group_id=11795&atid=311795> + # cppunit-1.12.1-unused-parameters.patch: help static analysis tools (see + # SAL_UNUSED_PARAMETER in sal/types.h) .IF "$(OS)" == "ANDROID" PATCH_FILES += android.patch diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index c4fe5c941753..94c764bd4f4d 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -116,7 +116,7 @@ struct CuiMacroInfo }; typedef SfxGroupInfo_Impl* SfxGroupInfoPtr; -SV_DECL_PTRARR_DEL(SfxGroupInfoArr_Impl, SfxGroupInfoPtr, 5, 5) +SV_DECL_PTRARR_DEL(SfxGroupInfoArr_Impl, SfxGroupInfoPtr, 5) class SfxConfigFunctionListBox_Impl : public SvTreeListBox { diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index bd61da269179..c1ee078254e8 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -69,7 +69,7 @@ struct SvxNumSettings_Impl }; typedef SvxNumSettings_Impl* SvxNumSettings_ImplPtr; -SV_DECL_PTRARR_DEL(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr,8,4) +SV_DECL_PTRARR_DEL(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr,8) //------------------------------------------------ diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index ed6cad8e9ba1..51170c12ac7d 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -88,7 +88,7 @@ struct SvxGroupInfo_Impl }; typedef SvxGroupInfo_Impl* SvxGroupInfoPtr; -SV_DECL_PTRARR_DEL(SvxGroupInfoArr_Impl, SvxGroupInfoPtr, 5, 5) +SV_DECL_PTRARR_DEL(SvxGroupInfoArr_Impl, SvxGroupInfoPtr, 5) class ImageProvider { diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 1978a4dcb5e9..a7eefd6e72a1 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -76,7 +76,7 @@ public: }; typedef SfxFilter* SfxFilterPtr; -SV_DECL_PTRARR( SfxFilterPtrArr, SfxFilterPtr, 0, 4 ) +SV_DECL_PTRARR( SfxFilterPtrArr, SfxFilterPtr, 0 ) // class SvxProxyTabPage ------------------------------------------------- diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index a0ce04ba6d2e..93a370f8c334 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -932,7 +932,7 @@ struct DoubleString void* pUserData; // CheckBox -> form. Text Bool -> Selektionstext }; typedef DoubleString* DoubleStringPtr; -SV_DECL_PTRARR_DEL(DoubleStringArray, DoubleStringPtr, 4, 4) +SV_DECL_PTRARR_DEL(DoubleStringArray, DoubleStringPtr, 4) SV_IMPL_PTRARR(DoubleStringArray, DoubleStringPtr); void lcl_ClearTable(DoubleStringTable& rTable) diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 614e7d96a15b..4d7fc17fc96d 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -105,8 +105,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dba::DbaModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii( pImplementationName ), - static_cast< XMultiServiceFactory* >( pServiceManager ) ); + ::rtl::OUString::createFromAscii( pImplementationName ) ); } if (xRet.is()) diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index ae5f1f3a1416..b444a7319177 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -48,10 +48,11 @@ namespace dbmm //........................................................................ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory( - const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) + const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, + SAL_UNUSED_PARAMETER void* ) { ::dbmm::initializeModule(); - return ::dbmm::MacroMigrationModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey ); + return ::dbmm::MacroMigrationModule::getInstance().getComponentFactory( pImplementationName ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index c21dfdda54ab..b4276b3bd893 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -63,8 +63,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::sdbtools::SdbtModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), - static_cast< XMultiServiceFactory* >(pServiceManager)); + ::rtl::OUString::createFromAscii(pImplementationName)); } if (xRet.is()) diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx index 53e0e2c12996..51de3294d1a2 100644 --- a/editeng/inc/editeng/svxacorr.hxx +++ b/editeng/inc/editeng/svxacorr.hxx @@ -129,7 +129,7 @@ public: }; typedef SvxAutocorrWord* SvxAutocorrWordPtr; -SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxAutocorrWordList, SvxAutocorrWordPtr, 10, 10 , EDITENG_DLLPUBLIC) +SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxAutocorrWordList, SvxAutocorrWordPtr, 10, EDITENG_DLLPUBLIC) class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists { diff --git a/editeng/inc/editeng/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx index 125ce5535a3f..c79f2bd846f7 100644 --- a/editeng/inc/editeng/svxrtf.hxx +++ b/editeng/inc/editeng/svxrtf.hxx @@ -88,7 +88,7 @@ typedef std::deque< ColorPtr > SvxRTFColorTbl; DECLARE_TABLE( SvxRTFFontTbl, Font* ) DECLARE_TABLE( SvxRTFStyleTbl, SvxRTFStyleType* ) typedef SvxRTFItemStackType* SvxRTFItemStackTypePtr; -SV_DECL_PTRARR_DEL( SvxRTFItemStackList, SvxRTFItemStackTypePtr, 1, 1 ) +SV_DECL_PTRARR_DEL( SvxRTFItemStackList, SvxRTFItemStackTypePtr, 1 ) // SvxRTFItemStack can't be "std::stack< SvxRTFItemStackTypePtr >" type, because // the methods are using operator[] in sw/source/filter/rtf/rtftbl.cxx file diff --git a/editeng/inc/editeng/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx index f15a5d194347..90052bfc3426 100644 --- a/editeng/inc/editeng/tstpitem.hxx +++ b/editeng/inc/editeng/tstpitem.hxx @@ -103,7 +103,7 @@ public: // class SvxTabStopItem -------------------------------------------------- -SV_DECL_VARARR_SORT_VISIBILITY( SvxTabStopArr, SvxTabStop, SVX_TAB_DEFCOUNT, 1, EDITENG_DLLPUBLIC ) +SV_DECL_VARARR_SORT_VISIBILITY( SvxTabStopArr, SvxTabStop, SVX_TAB_DEFCOUNT, EDITENG_DLLPUBLIC ) /* [Description] diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index b29c3a0608d1..2b35c3e13801 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -118,7 +118,7 @@ struct WritingDirectionInfo typedef std::deque< WritingDirectionInfo > WritingDirectionInfos; typedef EditCharAttrib* EditCharAttribPtr; -SV_DECL_PTRARR( CharAttribArray, EditCharAttribPtr, 0, 4 ) +SV_DECL_PTRARR( CharAttribArray, EditCharAttribPtr, 0 ) class ContentAttribsInfo { @@ -136,7 +136,7 @@ public: }; typedef ContentAttribsInfo* ContentAttribsInfoPtr; -SV_DECL_PTRARR( ContentInfoArray, ContentAttribsInfoPtr, 1, 1 ) +SV_DECL_PTRARR( ContentInfoArray, ContentAttribsInfoPtr, 1 ) // ---------------------------------------------------------------------- // class SvxFontTable @@ -304,13 +304,13 @@ public: }; typedef ContentNode* ContentNodePtr; -SV_DECL_PTRARR( DummyContentList, ContentNodePtr, 0, 4 ) +SV_DECL_PTRARR( DummyContentList, ContentNodePtr, 0 ) class ContentList : public DummyContentList { sal_uInt16 nLastCache; public: - ContentList() : DummyContentList( 0, 4 ), nLastCache(0) {} + ContentList() : DummyContentList( 0 ), nLastCache(0) {} sal_uInt16 GetPos( const ContentNodePtr &rPtr ) const; }; @@ -439,7 +439,7 @@ public: // class TextPortionList // ------------------------------------------------------------------------- typedef TextPortion* TextPortionPtr; -SV_DECL_PTRARR( TextPortionArray, TextPortionPtr, 0, 8 ) +SV_DECL_PTRARR( TextPortionArray, TextPortionPtr, 0 ) class TextPortionList : public TextPortionArray { @@ -455,7 +455,7 @@ public: class ParaPortion; -SV_DECL_VARARR( CharPosArray, sal_Int32, 0, CHARPOSGROW ) +SV_DECL_VARARR( CharPosArray, sal_Int32, 0 ) // ------------------------------------------------------------------------ // class EditLine @@ -550,7 +550,7 @@ public: // class LineList // ------------------------------------------------------------------------- typedef EditLine* EditLinePtr; -SV_DECL_PTRARR( LineArray, EditLinePtr, 0, 4 ) +SV_DECL_PTRARR( LineArray, EditLinePtr, 0 ) class EditLineList : public LineArray { @@ -633,7 +633,7 @@ public: }; typedef ParaPortion* ParaPortionPtr; -SV_DECL_PTRARR( DummyParaPortionList, ParaPortionPtr, 0, 4 ) +SV_DECL_PTRARR( DummyParaPortionList, ParaPortionPtr, 0 ) // ------------------------------------------------------------------------- // class ParaPortionList @@ -712,7 +712,7 @@ public: }; typedef DeletedNodeInfo* DeletedNodeInfoPtr; -SV_DECL_PTRARR( DeletedNodesList, DeletedNodeInfoPtr, 0, 4 ) +SV_DECL_PTRARR( DeletedNodesList, DeletedNodeInfoPtr, 0 ) // ------------------------------------------------------------------------- // class EditDoc diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index b4555d8123f0..e06f8101899d 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1038,7 +1038,7 @@ void BinTextObject::StoreData( SvStream& rOStream ) const } // Store Current text encoding ... - rtl_TextEncoding eEncoding = GetSOStoreTextEncoding( osl_getThreadTextEncoding(), (sal_uInt16) rOStream.GetVersion() ); + rtl_TextEncoding eEncoding = GetSOStoreTextEncoding( osl_getThreadTextEncoding() ); rOStream << (sal_uInt16) eEncoding; // The number of paragraphs ... @@ -1214,7 +1214,7 @@ void BinTextObject::CreateData( SvStream& rIStream ) sal_uInt16 nCharSet; rIStream >> nCharSet; - rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet, (sal_uInt16)rIStream.GetVersion() ); + rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet ); // The number of paragraphs ... sal_uInt16 nParagraphs; diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index f4a7d2e25026..426435aeef5f 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -87,7 +87,7 @@ inline sal_Bool XEditAttribute::IsFeature() } typedef XEditAttribute* XEditAttributePtr; -SV_DECL_PTRARR( XEditAttributeListImpl, XEditAttributePtr, 0, 4 ) +SV_DECL_PTRARR( XEditAttributeListImpl, XEditAttributePtr, 0 ) class XEditAttributeList : public XEditAttributeListImpl { @@ -105,7 +105,7 @@ struct XParaPortion }; typedef XParaPortion* XParaPortionPtr; -SV_DECL_PTRARR( XBaseParaPortionList, XParaPortionPtr, 0, 4 ) +SV_DECL_PTRARR( XBaseParaPortionList, XParaPortionPtr, 0 ) class XParaPortionList : public XBaseParaPortionList { @@ -174,7 +174,7 @@ public: }; typedef ContentInfo* ContentInfoPtr; -SV_DECL_PTRARR( ContentInfoList, ContentInfoPtr, 1, 4 ) +SV_DECL_PTRARR( ContentInfoList, ContentInfoPtr, 1 ) class BinTextObject : public EditTextObject, public SfxItemPoolUser { diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 39107a43fc62..1c008fbc03e1 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -380,7 +380,7 @@ public: // ---------------------------------------------------------------------- typedef EditView* EditViewPtr; -SV_DECL_PTRARR( EditViews, EditViewPtr, 0, 1 ) +SV_DECL_PTRARR( EditViews, EditViewPtr, 0 ) class ImpEditEngine : public SfxListener { diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 757db0c7b6a6..719a8753472b 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -86,7 +86,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::linguistic2; -SV_DECL_VARARR_SORT( SortedPositions, sal_uInt32, 16, 8 ) +SV_DECL_VARARR_SORT( SortedPositions, sal_uInt32, 16 ) SV_IMPL_VARARR_SORT( SortedPositions, sal_uInt32 ); #define CH_HYPH '-' diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index cbfc20821591..ce6c789f9a8e 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -53,7 +53,7 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont ) rStream << rFont.GetColor(); nTemp = (sal_uInt16)rFont.GetFamily(); rStream << nTemp; - nTemp = (sal_uInt16)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet(), (sal_uInt16)rStream.GetVersion()); + nTemp = (sal_uInt16)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet()); rStream << nTemp; nTemp = (sal_uInt16)rFont.GetPitch(); rStream << nTemp; @@ -82,7 +82,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) rStream >> nTemp; aFont.SetFamily((FontFamily)nTemp); rStream >> nTemp; - nTemp = (sal_uInt16)GetSOLoadTextEncoding((rtl_TextEncoding)nTemp, (sal_uInt16)rStream.GetVersion()); + nTemp = (sal_uInt16)GetSOLoadTextEncoding((rtl_TextEncoding)nTemp); aFont.SetCharSet((rtl_TextEncoding)nTemp); rStream >> nTemp; aFont.SetPitch((FontPitch)nTemp); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index abbb90354f56..9a2f3391c967 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -393,7 +393,7 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co GetFamilyName().EqualsAscii( "OpenSymbol", 0, sizeof("OpenSymbol")-1 ); rStrm << (sal_uInt8) GetFamily() << (sal_uInt8) GetPitch() - << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion())); + << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet())); String aStoreFamilyName( GetFamilyName() ); if( bToBats ) @@ -430,7 +430,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const aStyle = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // Set the "correct" textencoding - eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding, (sal_uInt16)rStrm.GetVersion() ); + eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding ); // at some point, the StarBats changes from ANSI font to SYMBOL font if ( RTL_TEXTENCODING_SYMBOL != eFontTextEncoding && aName.EqualsAscii("StarBats") ) @@ -2104,8 +2104,7 @@ SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt8)GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()) - << GetValue(); + rStrm << (sal_uInt8)GetSOStoreTextEncoding(GetCharSet()) << GetValue(); return rStrm; } diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 169c403b84bc..ac726c84a437 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1999,7 +1999,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp( if( rpLst ) rpLst->DeleteAndDestroy( 0, rpLst->Count() ); else - rpLst = new SvStringsISortDtor( 16, 16 ); + rpLst = new SvStringsISortDtor( 16 ); { String sStrmName( pStrmName, RTL_TEXTENCODING_MS_1252 ); @@ -2153,7 +2153,7 @@ SvxAutocorrWordList* SvxAutoCorrectLanguageLists::LoadAutocorrWordList() if( pAutocorr_List ) pAutocorr_List->DeleteAndDestroy( 0, pAutocorr_List->Count() ); else - pAutocorr_List = new SvxAutocorrWordList( 16, 16 ); + pAutocorr_List = new SvxAutocorrWordList( 16 ); try { @@ -2201,7 +2201,7 @@ void SvxAutoCorrectLanguageLists::SetAutocorrWordList( SvxAutocorrWordList* pLis if( !pAutocorr_List ) { OSL_ENSURE( !this, "No valid list" ); - pAutocorr_List = new SvxAutocorrWordList( 16, 16 ); + pAutocorr_List = new SvxAutocorrWordList( 16 ); } nFlags |= ChgWordLstLoad; } @@ -2297,7 +2297,7 @@ void SvxAutoCorrectLanguageLists::SetCplSttExceptList( SvStringsISortDtor* pList if( !pCplStt_ExcptLst ) { OSL_ENSURE( !this, "No valid list" ); - pCplStt_ExcptLst = new SvStringsISortDtor( 16, 16 ); + pCplStt_ExcptLst = new SvStringsISortDtor( 16 ); } nFlags |= CplSttLstLoad; } @@ -2333,7 +2333,7 @@ void SvxAutoCorrectLanguageLists::SetWrdSttExceptList( SvStringsISortDtor* pList if( !pWrdStt_ExcptLst ) { OSL_ENSURE( !this, "No valid list" ); - pWrdStt_ExcptLst = new SvStringsISortDtor( 16, 16 ); + pWrdStt_ExcptLst = new SvStringsISortDtor( 16 ); } nFlags |= WrdSttLstLoad; } diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 7f2e710d5db4..8b9d93cd163c 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -1213,7 +1213,7 @@ SvxRTFItemStackType::~SvxRTFItemStackType() void SvxRTFItemStackType::Add( SvxRTFItemStackType* pIns ) { if( !pChildList ) - pChildList = new SvxRTFItemStackList( 4, 16 ); + pChildList = new SvxRTFItemStackList( 4 ); pChildList->Insert( pIns, pChildList->Count() ); } diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 4303a18f8221..337b01beb12d 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -496,8 +496,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState ) // let the object window be shown if ( nNewState == embed::EmbedStates::UI_ACTIVE || nNewState == embed::EmbedStates::INPLACE_ACTIVE ) - PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ), - uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); + PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ) ); } } @@ -635,8 +634,7 @@ void SAL_CALL OCommonEmbeddedObject::update() throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ), - uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); + PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ) ); } //---------------------------------------------- diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 1a34b4c615bd..475fd87c94ee 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -326,8 +326,7 @@ void OCommonEmbeddedObject::requestPositioning( const awt::Rectangle& aRect ) } //------------------------------------------------------ -void OCommonEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName, - const uno::Reference< uno::XInterface >& /*xSource*/ ) +void OCommonEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName ) { if ( m_pInterfaceContainer ) { diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index 632871dfa962..ce7d28be5bbb 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -38,7 +38,9 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + const sal_Char * pImplName, void * pServiceManager, + SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index c0b4990d3576..0d4a43ee636b 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -1222,7 +1222,7 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent ) // if the component does not support document::XEventBroadcaster // the modify notifications are used as workaround, but only for running state if( aEvent.Source == m_xComponent && m_pEmbedObj && m_pEmbedObj->getCurrentState() == embed::EmbedStates::RUNNING ) - m_pEmbedObj->PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ), aEvent.Source ); + m_pEmbedObj->PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ) ); } //--------------------------------------------------------------------------- @@ -1237,7 +1237,7 @@ void SAL_CALL DocumentHolder::notifyEvent( const document::EventObject& Event ) && !Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSaveAs" ) ) && !Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSaveAsDone" ) ) && !( Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnVisAreaChanged" ) ) && m_nNoResizeReact ) ) - m_pEmbedObj->PostEvent_Impl( Event.EventName, Event.Source ); + m_pEmbedObj->PostEvent_Impl( Event.EventName ); } } diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index d5a7fc54f7ba..eac8a8aa94af 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -59,8 +59,7 @@ void ODummyEmbeddedObject::CheckInit() } //---------------------------------------------- -void ODummyEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName, - const uno::Reference< uno::XInterface >& /*xSource*/ ) +void ODummyEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName ) { if ( m_pInterfaceContainer ) { @@ -411,8 +410,7 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAs" )), - uno::Reference< uno::XInterface >( static_cast< cppu::OWeakObject* >( this ) ) ); + PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAs" )) ); m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName ); @@ -447,8 +445,7 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew ) m_xParentStorage = m_xNewParentStorage; m_aEntryName = m_aNewEntryName; - PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" )), - uno::Reference< uno::XInterface >( static_cast< cppu::OWeakObject* >( this ) ) ); + PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" )) ); } m_xNewParentStorage = uno::Reference< embed::XStorage >(); diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index cd5ff0341f9b..14c992fc0d09 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -258,9 +258,7 @@ public: void requestPositioning( const ::com::sun::star::awt::Rectangle& aRect ); // not a real listener and should not be - void PostEvent_Impl( const ::rtl::OUString& aEventName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xSource = - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); + void PostEvent_Impl( const ::rtl::OUString& aEventName ); // XInterface diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx index 4655bbc3d81b..2bcb9baac0e1 100644 --- a/embeddedobj/source/inc/dummyobject.hxx +++ b/embeddedobj/source/inc/dummyobject.hxx @@ -85,8 +85,7 @@ class ODummyEmbeddedObject : public ::cppu::WeakImplHelper2 protected: void CheckInit(); - void PostEvent_Impl( const ::rtl::OUString& aEventName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xSource ); + void PostEvent_Impl( const ::rtl::OUString& aEventName ); public: diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 8d34e8fbce5b..a772b8b2d48a 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -240,7 +240,6 @@ protected: void StoreToLocation_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs, sal_Bool bSaveAs ) throw ( ::com::sun::star::uno::Exception ); diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 9d2c23a18990..196dba92a883 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -1102,7 +1102,6 @@ void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream > void OleEmbeddedObject::StoreToLocation_Impl( const uno::Reference< embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, - const uno::Sequence< beans::PropertyValue >& /*lArguments*/, const uno::Sequence< beans::PropertyValue >& lObjArgs, sal_Bool bSaveAs ) throw ( uno::Exception ) @@ -1551,7 +1550,7 @@ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XSto VerbExecutionControllerGuard aVerbGuard( m_aVerbExecutionController ); - StoreToLocation_Impl( xStorage, sEntName, lArguments, lObjArgs, sal_False ); + StoreToLocation_Impl( xStorage, sEntName, lObjArgs, sal_False ); // TODO: should the listener notification be done? } @@ -1585,7 +1584,7 @@ void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XSto VerbExecutionControllerGuard aVerbGuard( m_aVerbExecutionController ); - StoreToLocation_Impl( xStorage, sEntName, lArguments, lObjArgs, sal_True ); + StoreToLocation_Impl( xStorage, sEntName, lObjArgs, sal_True ); // TODO: should the listener notification be done here or in saveCompleted? } diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index cf1849774abc..608e69ffa395 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -38,7 +38,9 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + const sal_Char * pImplName, void * pServiceManager, + SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 2042c7ee3168..b97c91090385 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::lang; using ::rtl::OUString; typedef Mapping* MappingPtr; -SV_DECL_PTRARR_DEL(MappingArray, MappingPtr, 2, 2) +SV_DECL_PTRARR_DEL(MappingArray, MappingPtr, 2) SV_IMPL_PTRARR(MappingArray, MappingPtr); #define C2U(cChar) OUString::createFromAscii(cChar) diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index 5cd7e9d46471..4dd6aefb4703 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -58,7 +58,7 @@ public: }; typedef BibStatusDispatch* BibStatusDispatchPtr; -SV_DECL_PTRARR_DEL( BibStatusDispatchArr, BibStatusDispatchPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( BibStatusDispatchArr, BibStatusDispatchPtr, 4 ) class BibFrameController_Impl : public cppu::WeakImplHelper5 < ::com::sun::star::lang::XServiceInfo, diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index ad6f05072309..be2e95c09c8d 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -111,7 +111,7 @@ public: typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener>* BibToolBarListenerPtr; -SV_DECL_PTRARR_DEL( BibToolBarListenerArr, BibToolBarListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( BibToolBarListenerArr, BibToolBarListenerPtr, 4 ) class BibToolBar: public ToolBox { diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx index d244ac79c4f6..46dd19c0b85e 100644 --- a/extensions/source/logging/log_services.cxx +++ b/extensions/source/logging/log_services.cxx @@ -58,10 +58,11 @@ namespace logging //........................................................................ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( - const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) + const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, + SAL_UNUSED_PARAMETER void* ) { ::logging::initializeModule(); - return ::logging::LogModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey ); + return ::logging::LogModule::getInstance().getComponentFactory( pImplementationName ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index ad8ebb1bf7cc..ffde3d828451 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -92,7 +92,7 @@ extern "C" void SAL_CALL pcr_initializeModule() extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, - void* /*pRegistryKey*/) + SAL_UNUSED_PARAMETER void* /*pRegistryKey*/) { pcr_initializeModule(); @@ -100,8 +100,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::pcr::PcrModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), - static_cast< XMultiServiceFactory* >(pServiceManager)); + ::rtl::OUString::createFromAscii(pImplementationName)); } if (xRet.is()) diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index 35bfb0997fa3..88a009ea260b 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -184,14 +184,14 @@ typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer; #define SVEXT_PERSIST_STREAM "\002OlePres000" // nach der Reihenfolge des Auftretens sortiert werden: -SV_DECL_PTRARR_DEL(SvxMSDffBLIPInfos, SvxMSDffBLIPInfo_Ptr, 16,16) +SV_DECL_PTRARR_DEL(SvxMSDffBLIPInfos, SvxMSDffBLIPInfo_Ptr, 16) -SV_DECL_PTRARR_DEL(SvxMSDffShapeOrders, SvxMSDffShapeOrder_Ptr, 16,16) +SV_DECL_PTRARR_DEL(SvxMSDffShapeOrders, SvxMSDffShapeOrder_Ptr, 16) // explizit sortiert werden: -SV_DECL_PTRARR_SORT_DEL_VISIBILITY(SvxMSDffShapeInfos, SvxMSDffShapeInfo_Ptr, 16,16, MSFILTER_DLLPUBLIC) +SV_DECL_PTRARR_SORT_DEL_VISIBILITY(SvxMSDffShapeInfos, SvxMSDffShapeInfo_Ptr, 16, MSFILTER_DLLPUBLIC) -SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort, SvxMSDffShapeOrder_Ptr, 16,16, MSFILTER_DLLPUBLIC) +SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort, SvxMSDffShapeOrder_Ptr, 16, MSFILTER_DLLPUBLIC) #define SVXMSDFF_SETTINGS_CROP_BITMAPS 1 #define SVXMSDFF_SETTINGS_IMPORT_PPT 2 @@ -331,7 +331,7 @@ private: typedef SvxMSDffImportRec* MSDffImportRec_Ptr; // Liste aller SvxMSDffImportRec fuer eine Gruppe -SV_DECL_PTRARR_SORT_DEL_VISIBILITY(MSDffImportRecords, MSDffImportRec_Ptr, 16,16, MSFILTER_DLLPUBLIC) +SV_DECL_PTRARR_SORT_DEL_VISIBILITY(MSDffImportRecords, MSDffImportRec_Ptr, 16, MSFILTER_DLLPUBLIC) //--------------------------------------------------------------------------- // Import-/Export-Parameterblock fuer 1 x ImportObjAtCurrentStreamPos() diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 6d2b8e0e8456..69809177c159 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -353,7 +353,7 @@ public: sal_uInt32 GetSlideId() const { return aPersistAtom.nSlideId; } }; -SV_DECL_PTRARR_DEL(_PptSlidePersistList,PptSlidePersistEntry*,16,16) +SV_DECL_PTRARR_DEL(_PptSlidePersistList,PptSlidePersistEntry*,16) #define PPTSLIDEPERSIST_ENTRY_NOTFOUND 0xFFFF diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 11e84a9fbeb5..326c56f6071f 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -458,7 +458,7 @@ SvStream& operator>>( SvStream& rIn, PptFontEntityAtom& rAtom ) return rIn; } -SV_DECL_PTRARR_DEL( PptFontEntityAtomList, PptFontEntityAtom*, 16, 16 ) +SV_DECL_PTRARR_DEL( PptFontEntityAtomList, PptFontEntityAtom*, 16 ) SV_IMPL_PTRARR( PptFontEntityAtomList, PptFontEntityAtom* ); class PptFontCollection: public PptFontEntityAtomList { diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 7c1eb8548b9b..e0a99a819a81 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -74,7 +74,7 @@ public: sal_Bool isGroupSeparator() const { return 0 == m_aType.Len(); } }; -SV_DECL_PTRARR_DEL( SvtFileDialogFilterList_Impl, SvtFileDialogFilter_Impl*, 3, 3 ) +SV_DECL_PTRARR_DEL( SvtFileDialogFilterList_Impl, SvtFileDialogFilter_Impl*, 3 ) enum SvtFileDlgMode { diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 68ab82ade1d1..4b2876a38dc6 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -65,10 +65,10 @@ struct ExternalImageItemDescriptor }; typedef ImageItemDescriptor* ImageItemDescriptorPtr; -SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10, 2) +SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10 ) typedef ExternalImageItemDescriptor* ExternalImageItemDescriptorPtr; -SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2) +SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10 ) struct ImageListItemDescriptor { @@ -87,7 +87,7 @@ struct ImageListItemDescriptor }; typedef ImageListItemDescriptor* ImageListItemDescriptorPtr; -SV_DECL_PTRARR_DEL( ImageListDescriptor, ImageListItemDescriptorPtr, 10, 2) +SV_DECL_PTRARR_DEL( ImageListDescriptor, ImageListItemDescriptorPtr, 10 ) struct ImageListsDescriptor { diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index 0d2df45406be..1c061a1762a8 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -91,7 +91,7 @@ #define IMPL_CREATEINSTANCE( ImplName ) \ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ SAL_CALL ImplName##_CreateInstance( \ - const ::com::sun::star::uno::Reference< \ + SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Reference< \ ::com::sun::star::lang::XMultiServiceFactory >& ) \ { \ return ::com::sun::star::uno::Reference < \ @@ -574,7 +574,7 @@ static const struct InstancesArray { extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL i18npool_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, void* /*_pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL i18npool_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, SAL_UNUSED_PARAMETER void* /*_pRegistryKey*/ ) { void* pRet = NULL; diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 3f0b529a74fb..18c93a05acf6 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -981,7 +981,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void* SAL_CALL i18nsearch_component_getFactory( const sal_Char* sImplementationName, - void* _pServiceManager, void* /*_pRegistryKey*/ ) + void* _pServiceManager, SAL_UNUSED_PARAMETER void* /*_pRegistryKey*/ ) { void* pRet = NULL; diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index cab6ea8d64a2..5bf76c5be30f 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -443,7 +443,8 @@ Reference< XInputStream > OTextInputStream::getInputStream() } -Reference< XInterface > SAL_CALL TextInputStream_CreateInstance( const Reference< XComponentContext > &) +Reference< XInterface > SAL_CALL TextInputStream_CreateInstance( + SAL_UNUSED_PARAMETER const Reference< XComponentContext > &) { return Reference < XInterface >( ( OWeakObject * ) new OTextInputStream() ); } diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 38cbf46a3604..90f34ab22b7f 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -238,7 +238,8 @@ Reference< XOutputStream > OTextOutputStream::getOutputStream() } -Reference< XInterface > SAL_CALL TextOutputStream_CreateInstance( const Reference< XComponentContext > &) +Reference< XInterface > SAL_CALL TextOutputStream_CreateInstance( + SAL_UNUSED_PARAMETER const Reference< XComponentContext > &) { return Reference < XInterface >( ( OWeakObject * ) new OTextOutputStream() ); } diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 95fea956718c..bb305b8ac692 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -500,7 +500,9 @@ Sequence< OUString > ODataInputStream::getSupportedServiceNames(void) throw () * ****/ -Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference < XComponentContext > & ) throw( Exception) +Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( + SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) + throw( Exception) { ODataInputStream *p = new ODataInputStream; return Reference< XInterface > ( (OWeakObject * ) p ); @@ -904,7 +906,9 @@ Sequence< OUString > ODataOutputStream::getSupportedServiceNames(void) throw () -Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference < XComponentContext > & ) throw(Exception) +Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( + SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) + throw(Exception) { ODataOutputStream *p = new ODataOutputStream; Reference< XInterface > xService = *p; @@ -1186,7 +1190,8 @@ sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark) -Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference < XComponentContext > & ) +Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( + SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) throw(Exception) { OObjectOutputStream *p = new OObjectOutputStream; diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 85a0cc9ce5d7..49fa8e20e0b6 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -464,7 +464,9 @@ Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames(void) throw * external binding * *------------------------*/ -Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( const Reference < XComponentContext > & ) throw(Exception) +Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( + SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) + throw(Exception) { OMarkableOutputStream *p = new OMarkableOutputStream( ); @@ -991,7 +993,8 @@ Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw * *------------------------*/ Reference < XInterface > SAL_CALL OMarkableInputStream_CreateInstance( - const Reference < XComponentContext > & ) throw(Exception) + SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) + throw(Exception) { OMarkableInputStream *p = new OMarkableInputStream( ); return Reference< XInterface > ( (OWeakObject * ) p ); diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index aa2f3abbeba2..9de67a94537b 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -454,7 +454,8 @@ Sequence< OUString > OPipeImpl::getSupportedServiceNames(void) throw( ) Reference < XInterface > SAL_CALL OPipeImpl_CreateInstance( - const Reference < XComponentContext > & ) throw(Exception) + SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) + throw(Exception) { OPipeImpl *p = new OPipeImpl; diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 409fe59869a4..607dda727890 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -485,7 +485,9 @@ Sequence< OUString > Pump::getSupportedServiceNames(void) throw( ) } -Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( const Reference< XComponentContext > & ) throw (Exception) +Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( + SAL_UNUSED_PARAMETER const Reference< XComponentContext > & ) + throw (Exception) { return Reference< XInterface >( *new Pump ); } diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index 4e2c10047967..d053d5793d2f 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -76,7 +76,7 @@ inline ::rtl::OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env ) //================================================================================================== extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( - JNIEnv * jni_env, jclass, jstring juno_rc, jobjectArray jpairs, + JNIEnv * jni_env, SAL_UNUSED_PARAMETER jclass, jstring juno_rc, jobjectArray jpairs, jobject loader ) { try diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index 5178c7650bf9..9016b486ee3e 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -63,7 +63,7 @@ using ::rtl::OUString; */ extern "C" JNIEXPORT jboolean JNICALL Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( - JNIEnv * pJEnv, jclass, jstring jLibName, jobject jSMgr, + JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jLibName, jobject jSMgr, jobject jRegKey, jobject loader ) { sal_Bool bRet = sal_False; @@ -143,7 +143,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( */ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( - JNIEnv * pJEnv, jclass, jstring jLibName, jstring jImplName, + JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jLibName, jstring jImplName, jobject jSMgr, jobject jRegKey, jobject loader ) { const jchar* pJLibName = pJEnv->GetStringChars(jLibName, NULL); @@ -239,7 +239,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( */ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory( - JNIEnv * pJEnv, jclass, jstring jWriteRegFile, + JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jWriteRegFile, jstring jReadRegFile, jboolean jbReadOnly, jobject loader ) { jobject joRegServiceFac = 0; diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index a4d2f8002da7..6b749fca29bc 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -469,9 +469,9 @@ public: MergeData( const ByteString &rTyp, const ByteString &rGID, const ByteString &rLID , const ByteString &rFilename ) : sTyp( rTyp ), sGID( rGID ), sLID( rLID ) , sFilename( rFilename ) {}; ~MergeData(); - PFormEntrys* GetPFormEntrys( ResData *pResData ); + PFormEntrys* GetPFormEntries(); - void Insert( const ByteString& rPFO , PFormEntrys* pfEntrys ); + void Insert( PFormEntrys* pfEntrys ); PFormEntrys* GetPFObject( const ByteString& rPFO ); ByteString Dump(); diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx index da78d3994132..b98d7297d6e4 100644 --- a/l10ntools/inc/gsicheck.hxx +++ b/l10ntools/inc/gsicheck.hxx @@ -124,7 +124,7 @@ public: void WriteError( LazySvFileStream &aErrOut, sal_Bool bRequireSourceLine ); void WriteCorrect( LazySvFileStream &aOkOut, sal_Bool bRequireSourceLine ); - void WriteFixed( LazySvFileStream &aFixOut, sal_Bool bRequireSourceLine ); + void WriteFixed( LazySvFileStream &aFixOut ); }; #endif diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx index f8ee2e0a1726..354bb8d65c97 100644 --- a/l10ntools/source/gsicheck.cxx +++ b/l10ntools/source/gsicheck.cxx @@ -720,7 +720,7 @@ void GSIBlock::WriteCorrect( LazySvFileStream &aOkOut, sal_Bool bRequireSourceLi } } -void GSIBlock::WriteFixed( LazySvFileStream &aFixOut, sal_Bool /*bRequireSourceLine*/ ) +void GSIBlock::WriteFixed( LazySvFileStream &aFixOut ) { if ( pSourceLine && !pSourceLine->IsFixed() && bCheckSourceLang ) return; @@ -1100,7 +1100,7 @@ int _cdecl main( int argc, char *argv[] ) if ( bWriteCorrect ) pBlock->WriteCorrect( aOkOut, aSourceLang.Len() != 0 ); if ( bWriteFixed ) - pBlock->WriteFixed( aFixOut, aSourceLang.Len() != 0 ); + pBlock->WriteFixed( aFixOut ); delete pBlock; } @@ -1168,7 +1168,7 @@ int _cdecl main( int argc, char *argv[] ) if ( bWriteCorrect ) pBlock->WriteCorrect( aOkOut, aSourceLang.Len() != 0 ); if ( bWriteFixed ) - pBlock->WriteFixed( aFixOut, aSourceLang.Len() != 0 ); + pBlock->WriteFixed( aFixOut ); delete pBlock; } diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index db31f186abeb..a2c7f8e67dfd 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -122,14 +122,14 @@ MergeData::~MergeData() { } -PFormEntrys* MergeData::GetPFormEntrys(ResData*) +PFormEntrys* MergeData::GetPFormEntries() { if( aMap.find( ByteString("HACK") ) != aMap.end() ) return aMap[ ByteString("HACK") ]; return NULL; } -void MergeData::Insert(const ByteString&, PFormEntrys* pfEntrys ) +void MergeData::Insert(PFormEntrys* pfEntrys ) { aMap.insert( PFormEntrysHashMap::value_type( ByteString("HACK") , pfEntrys ) ); } @@ -291,7 +291,7 @@ PFormEntrys *MergeDataFile::GetPFormEntrys( ResData *pResData ) // search for requested PFormEntrys MergeData *pData = GetMergeData( pResData ); if ( pData ) - return pData->GetPFormEntrys( pResData ); + return pData->GetPFormEntries(); return NULL; } @@ -300,7 +300,7 @@ PFormEntrys *MergeDataFile::GetPFormEntrysCaseSensitive( ResData *pResData ) // search for requested PFormEntrys MergeData *pData = GetMergeData( pResData , true ); if ( pData ) - return pData->GetPFormEntrys( pResData ); + return pData->GetPFormEntries(); return NULL; } @@ -336,7 +336,7 @@ void MergeDataFile::InsertEntry( { // create new PFormEntrys, cause no one exists with current properties pFEntrys = new PFormEntrys( rPFO ); - pData->Insert( rPFO , pFEntrys ); + pData->Insert( pFEntrys ); } // finaly insert the cur string diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index fa7904b95542..ce58f9914ddc 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -340,7 +340,7 @@ PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args ) Runtime runtime; PyRef paras,callable; - if( PyObject_IsInstance( object, getPyUnoClass( runtime ).get() ) ) + if( PyObject_IsInstance( object, getPyUnoClass().get() ) ) { PyUNO* me = (PyUNO*) object; OUString attrName = OUString::createFromAscii(name); @@ -607,7 +607,7 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op ) try { Runtime runtime; - if( PyObject_IsInstance( that, getPyUnoClass( runtime ).get() ) ) + if( PyObject_IsInstance( that, getPyUnoClass().get() ) ) { PyUNO *me = reinterpret_cast< PyUNO*> ( self ); @@ -697,7 +697,7 @@ static PyTypeObject PyUNOType = #endif }; -PyRef getPyUnoClass( const Runtime &) +PyRef getPyUnoClass() { return PyRef( reinterpret_cast< PyObject * > ( &PyUNOType ) ); } diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx index a4a5b12acfb1..004a49c93545 100644 --- a/pyuno/source/module/pyuno_callable.cxx +++ b/pyuno/source/module/pyuno_callable.cxx @@ -72,7 +72,8 @@ void PyUNO_callable_del (PyObject* self) return; } -PyObject* PyUNO_callable_call (PyObject* self, PyObject* args, PyObject*) +PyObject* PyUNO_callable_call( + PyObject* self, PyObject* args, SAL_UNUSED_PARAMETER PyObject*) { PyUNO_callable* me; diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index ff6ca8716e69..a4af5c2b2c38 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -213,7 +213,7 @@ PyRef getEnumClass( const Runtime &); PyRef getBoolClass( const Runtime &); PyRef getCharClass( const Runtime &); PyRef getByteSequenceClass( const Runtime & ); -PyRef getPyUnoClass( const Runtime &); +PyRef getPyUnoClass(); PyRef getClass( const rtl::OUString & name , const Runtime & runtime ); PyRef getAnyClass( const Runtime &); PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args ); diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index 0382259f95b3..31c330ea03cc 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -253,7 +253,8 @@ void raisePySystemException( const char * exceptionType, const OUString & messag extern "C" { -static PyObject* getComponentContext (PyObject*, PyObject*) +static PyObject* getComponentContext( + SAL_UNUSED_PARAMETER PyObject*, SAL_UNUSED_PARAMETER PyObject*) { PyRef ret; try @@ -352,7 +353,8 @@ PyObject * extractOneStringArg( PyObject *args, char const *funcName ) return obj; } -static PyObject *createUnoStructHelper(PyObject *, PyObject* args, PyObject* keywordArgs) +static PyObject *createUnoStructHelper( + SAL_UNUSED_PARAMETER PyObject *, PyObject* args, PyObject* keywordArgs) { Any IdlStruct; PyRef ret; @@ -439,7 +441,8 @@ static PyObject *createUnoStructHelper(PyObject *, PyObject* args, PyObject* key return ret.getAcquired(); } -static PyObject *getTypeByName( PyObject *, PyObject *args ) +static PyObject *getTypeByName( + SAL_UNUSED_PARAMETER PyObject *, PyObject *args ) { PyObject * ret = NULL; @@ -472,7 +475,8 @@ static PyObject *getTypeByName( PyObject *, PyObject *args ) return ret; } -static PyObject *getConstantByName( PyObject *, PyObject *args ) +static PyObject *getConstantByName( + SAL_UNUSED_PARAMETER PyObject *, PyObject *args ) { PyObject *ret = 0; try @@ -520,7 +524,7 @@ static PyObject *getConstantByName( PyObject *, PyObject *args ) return ret; } -static PyObject *checkType( PyObject *, PyObject *args ) +static PyObject *checkType( SAL_UNUSED_PARAMETER PyObject *, PyObject *args ) { if( !PyTuple_Check( args ) || PyTuple_Size( args) != 1 ) { @@ -544,7 +548,7 @@ static PyObject *checkType( PyObject *, PyObject *args ) return Py_None; } -static PyObject *checkEnum( PyObject *, PyObject *args ) +static PyObject *checkEnum( SAL_UNUSED_PARAMETER PyObject *, PyObject *args ) { if( !PyTuple_Check( args ) || PyTuple_Size( args) != 1 ) { @@ -568,7 +572,7 @@ static PyObject *checkEnum( PyObject *, PyObject *args ) return Py_None; } -static PyObject *getClass( PyObject *, PyObject *args ) +static PyObject *getClass( SAL_UNUSED_PARAMETER PyObject *, PyObject *args ) { PyObject *obj = extractOneStringArg( args, "pyuno.getClass"); if( ! obj ) @@ -594,7 +598,7 @@ static PyObject *getClass( PyObject *, PyObject *args ) return NULL; } -static PyObject *isInterface( PyObject *, PyObject *args ) +static PyObject *isInterface( SAL_UNUSED_PARAMETER PyObject *, PyObject *args ) { if( PyTuple_Check( args ) && PyTuple_Size( args ) == 1 ) @@ -606,7 +610,8 @@ static PyObject *isInterface( PyObject *, PyObject *args ) return PyLong_FromLong( 0 ); } -static PyObject * generateUuid( PyObject *, PyObject * ) +static PyObject * generateUuid( + SAL_UNUSED_PARAMETER PyObject *, SAL_UNUSED_PARAMETER PyObject * ) { Sequence< sal_Int8 > seq( 16 ); rtl_createUuid( (sal_uInt8*)seq.getArray() , 0 , sal_False ); @@ -623,7 +628,8 @@ static PyObject * generateUuid( PyObject *, PyObject * ) return ret.getAcquired(); } -static PyObject *systemPathToFileUrl( PyObject *, PyObject * args ) +static PyObject *systemPathToFileUrl( + SAL_UNUSED_PARAMETER PyObject *, PyObject * args ) { PyObject *obj = extractOneStringArg( args, "pyuno.systemPathToFileUrl" ); if( ! obj ) @@ -648,7 +654,8 @@ static PyObject *systemPathToFileUrl( PyObject *, PyObject * args ) return ustring2PyUnicode( url ).getAcquired(); } -static PyObject * fileUrlToSystemPath( PyObject *, PyObject * args ) +static PyObject * fileUrlToSystemPath( + SAL_UNUSED_PARAMETER PyObject *, PyObject * args ) { PyObject *obj = extractOneStringArg( args, "pyuno.fileUrlToSystemPath" ); if( ! obj ) @@ -673,7 +680,7 @@ static PyObject * fileUrlToSystemPath( PyObject *, PyObject * args ) return ustring2PyUnicode( sysPath ).getAcquired(); } -static PyObject * absolutize( PyObject *, PyObject * args ) +static PyObject * absolutize( SAL_UNUSED_PARAMETER PyObject *, PyObject * args ) { if( PyTuple_Check( args ) && PyTuple_Size( args ) == 2 ) { @@ -702,7 +709,7 @@ static PyObject * absolutize( PyObject *, PyObject * args ) return 0; } -static PyObject * invoke(PyObject *, PyObject *args) +static PyObject * invoke(SAL_UNUSED_PARAMETER PyObject *, PyObject *args) { PyObject *ret = 0; if(PyTuple_Check(args) && PyTuple_Size(args) == 3) @@ -744,7 +751,8 @@ static PyObject * invoke(PyObject *, PyObject *args) return ret; } -static PyObject *getCurrentContext( PyObject *, PyObject * ) +static PyObject *getCurrentContext( + SAL_UNUSED_PARAMETER PyObject *, SAL_UNUSED_PARAMETER PyObject * ) { PyRef ret; try @@ -760,7 +768,8 @@ static PyObject *getCurrentContext( PyObject *, PyObject * ) return ret.getAcquired(); } -static PyObject *setCurrentContext( PyObject *, PyObject * args ) +static PyObject *setCurrentContext( + SAL_UNUSED_PARAMETER PyObject *, SAL_UNUSED_PARAMETER PyObject * args ) { PyRef ret; try diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 9dc5b5214419..f38dccd227c1 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -802,7 +802,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con Reference< XInterface > () ); } } - else if( PyObject_IsInstance( o, getPyUnoClass( runtime ).get() ) ) + else if( PyObject_IsInstance( o, getPyUnoClass().get() ) ) { PyUNO* o_pi; o_pi = (PyUNO*) o; diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index 3cefe35f895a..b0446c73b07a 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -625,7 +625,9 @@ RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType, //********************************************************************* // createLink // -RegError REGISTRY_CALLTYPE createLink(RegKeyHandle, rtl_uString*, rtl_uString*) +RegError REGISTRY_CALLTYPE createLink( + SAL_UNUSED_PARAMETER RegKeyHandle, SAL_UNUSED_PARAMETER rtl_uString*, + SAL_UNUSED_PARAMETER rtl_uString*) { return REG_INVALID_LINK; // links are no longer supported } @@ -633,7 +635,8 @@ RegError REGISTRY_CALLTYPE createLink(RegKeyHandle, rtl_uString*, rtl_uString*) //********************************************************************* // deleteLink // -RegError REGISTRY_CALLTYPE deleteLink(RegKeyHandle, rtl_uString*) +RegError REGISTRY_CALLTYPE deleteLink( + SAL_UNUSED_PARAMETER RegKeyHandle, SAL_UNUSED_PARAMETER rtl_uString*) { return REG_INVALID_LINK; // links are no longer supported } @@ -659,7 +662,8 @@ RegError REGISTRY_CALLTYPE getKeyType(RegKeyHandle hKey, // getLinkTarget // RegError REGISTRY_CALLTYPE getLinkTarget( - RegKeyHandle, rtl_uString*, rtl_uString**) + SAL_UNUSED_PARAMETER RegKeyHandle, SAL_UNUSED_PARAMETER rtl_uString*, + SAL_UNUSED_PARAMETER rtl_uString**) { return REG_INVALID_LINK; // links are no longer supported } @@ -669,7 +673,7 @@ RegError REGISTRY_CALLTYPE getLinkTarget( // RegError REGISTRY_CALLTYPE getResolvedKeyName(RegKeyHandle hKey, rtl_uString* keyName, - sal_Bool, + SAL_UNUSED_PARAMETER sal_Bool, rtl_uString** pResolvedName) { ORegKey* pKey = static_cast< ORegKey* >(hKey); diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index c7a4950cbdd5..6b002ee14abf 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -177,7 +177,7 @@ class RscTypCont RscTop * InitClassColor( RscTop * pSuper, RscEnum * pColor ); RscTop * InitClassImage( RscTop * pSuper, RscTop *pClassBitmap, RscTop * pClassColor ); - RscTop * InitClassImageList( RscTop * pSuper, RscTop *pClassBitmap, + RscTop * InitClassImageList( RscTop * pSuper, RscTop * pClassColor, RscCont * pStrLst ); RscTop * InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, RscArray * pLangGeo ); @@ -221,8 +221,7 @@ class RscTypCont RscTop * InitClassNumericFormatter( RscTop * pSuper ); RscTop * InitClassMetricFormatter( RscTop * pSuper, RscEnum * pFieldUnits ); - RscTop * InitClassCurrencyFormatter( RscTop * pSuper, - RscEnum * pFieldUnits ); + RscTop * InitClassCurrencyFormatter( RscTop * pSuper ); RscTop * InitClassDateFormatter( RscTop * pSuper, RscTop * pClassDate ); RscTop * InitClassTimeFormatter( RscTop * pSuper, RscTop * pClassTime, RscEnum * pTimeFieldFormat ); @@ -240,8 +239,8 @@ class RscTypCont RscTop * InitClassMetricBox( RscTop * pSuper ); RscTop * InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT, RscTop * pSuper ); - RscTop * InitClassDateBox( RscTop * pSuper, RscTop * pClassDate ); - RscTop * InitClassTimeBox( RscTop * pSuper, RscTop * pClassTime ); + RscTop * InitClassDateBox( RscTop * pSuper ); + RscTop * InitClassTimeBox( RscTop * pSuper ); RscTop * InitClassDockingWindow( RscTop * pSuper, RscEnum * pMapUnit ); @@ -254,8 +253,7 @@ class RscTypCont RscTop * InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit ); RscTop * InitClassFloatingWindow( RscTop * pSuper, RscEnum * pMapUnit ); - RscTop * InitClassTabControlItem( RscTop * pSuper, - RscTop * pClassTabPage ); + RscTop * InitClassTabControlItem( RscTop * pSuper ); RscTop * InitClassTabControl( RscTop * pSuper, RscTop * pClassTabControlItem ); RscTop * InitClassSfxStyleFamilyItem( RscTop * pSuper, @@ -343,7 +341,7 @@ public: void ClearSysNames(); ERRTYPE WriteRc( WriteRcContext& rContext ); void WriteSrc( FILE * fOutput, sal_uLong nFileIndex, - CharSet nCharSet, sal_Bool bName = sal_True ); + sal_Bool bName = sal_True ); ERRTYPE WriteHxx( FILE * fOutput, sal_uLong nFileKey); ERRTYPE WriteCxx( FILE * fOutput, sal_uLong nFileKey, const rtl::OString& rHxxName ); diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 3c8d93d33ba5..ce35473b869a 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -715,7 +715,7 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) |* *************************************************************************/ void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey, - CharSet /*nCharSet*/, sal_Bool bName ) + sal_Bool bName ) { RscFile * pFName; RscEnumerateRef aEnumRef( this, pRoot, fOutput ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index ad70349f17b0..ee50a73e44ce 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -192,7 +192,7 @@ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap, /************************************************************************* |* RscTypCont::InitClassImageList() *************************************************************************/ -RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitmap*/, +RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * pClassColor, RscCont * pStrLst ) { Atom nId; @@ -1450,10 +1450,7 @@ RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper, /************************************************************************* |* RscTypCont::InitClassCurrencyFormatter() *************************************************************************/ -RscTop * RscTypCont::InitClassCurrencyFormatter -( - RscTop * pSuper, - RscEnum * /* pFieldUnits */) +RscTop * RscTypCont::InitClassCurrencyFormatter(RscTop * pSuper) { Atom nId; RscTop * pClassCurrency; @@ -1802,8 +1799,7 @@ RscTop * RscTypCont::InitClassCurrencyBox /************************************************************************* |* RscTypCont::InitClassDateBox() *************************************************************************/ -RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper, - RscTop * /*pClassDate*/ ) +RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper ) { Atom nId; RscTop * pClassDateBox; @@ -1823,8 +1819,7 @@ RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper, /************************************************************************* |* RscTypCont::InitClassTimeBox() *************************************************************************/ -RscTop * RscTypCont::InitClassTimeBox( RscTop * pSuper, - RscTop * /*pClassTime*/ ) +RscTop * RscTypCont::InitClassTimeBox( RscTop * pSuper ) { Atom nId; RscTop * pClassTimeBox; @@ -2187,8 +2182,7 @@ RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper, /************************************************************************* |* RscTypCont::InitClassTabControlItem() *************************************************************************/ -RscTop * RscTypCont::InitClassTabControlItem( RscTop * pSuper, - RscTop * /*pClassTabPage*/ ) +RscTop * RscTypCont::InitClassTabControlItem( RscTop * pSuper ) { Atom nId; RscTop * pClassTabControlItem; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 697ee6b7f05e..9034e2f7b89c 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -416,7 +416,7 @@ void RscTypCont::Init() pRoot->Insert( pClassImage ); /********** I M A G E L I S T ****************************************/ - pClassImageList = InitClassImageList( pClassMgr, pClassBitmap, + pClassImageList = InitClassImageList( pClassMgr, pClassColor, pStringLongTupelList ); pRoot->Insert( pClassImageList ); @@ -723,7 +723,7 @@ void RscTypCont::Init() { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField ); aBaseLst.push_back( pClassTmp ); - pClassTmp = InitClassCurrencyFormatter( pClassTmp, pFieldUnits ); + pClassTmp = InitClassCurrencyFormatter( pClassTmp ); aBaseLst.push_back( pClassTmp ); pClassCurrencyField = InitClassCurrencyField( "CurrencyField", RSC_CURRENCYFIELD, pClassTmp ); @@ -782,7 +782,7 @@ void RscTypCont::Init() { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox ); aBaseLst.push_back( pClassTmp ); - pClassTmp = InitClassCurrencyFormatter( pClassTmp, pFieldUnits ); + pClassTmp = InitClassCurrencyFormatter( pClassTmp ); aBaseLst.push_back( pClassTmp ); pClassCurrencyBox = InitClassCurrencyBox( "CurrencyBox", RSC_CURRENCYBOX, pClassTmp ); @@ -796,7 +796,7 @@ void RscTypCont::Init() RscTop * pClassTmp = InitClassDateFormatter( pClassComboBox, pClassDate ); aBaseLst.push_back( pClassTmp ); - pClassDateBox = InitClassDateBox( pClassTmp, pClassDate ); + pClassDateBox = InitClassDateBox( pClassTmp ); pRoot->Insert( pClassDateBox ); } /********** T I M E B O X ********************************************/ @@ -805,7 +805,7 @@ void RscTypCont::Init() pTimeFieldFormat ); aBaseLst.push_back( pClassTmp ); - pClassTimeBox = InitClassTimeBox( pClassTmp, pClassTime ); + pClassTimeBox = InitClassTimeBox( pClassTmp ); pRoot->Insert( pClassTimeBox ); } /********** D O C K I N G W I N D O W ********************************/ @@ -854,8 +854,7 @@ void RscTypCont::Init() pRoot->Insert( pClassTabDialog ); /********** T A B C O N T R O L I T E M *******************************/ - pClassTabControlItem = InitClassTabControlItem( pClassMgr, - pClassTabPage ); + pClassTabControlItem = InitClassTabControlItem( pClassMgr ); pRoot->Insert( pClassTabControlItem ); /********** T A B C O N T R O L **************************************/ diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index fc80beac2444..969af5852ea3 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -536,8 +536,7 @@ void RscCompiler::EndCompile() { if( !pFN->IsIncFile() ) { - pTC->WriteSrc( foutput, NOFILE_INDEX, - RTL_TEXTENCODING_UNICODE, sal_False ); + pTC->WriteSrc( foutput, NOFILE_INDEX, sal_False ); break; // ?T 281091MM nur eine Src-Datei } }; @@ -1019,7 +1018,7 @@ ERRTYPE RscCompiler::Link() pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aTmpOutputSrc.getStr() ); // Schreibe Datei - pTC->WriteSrc( foutput, NOFILE_INDEX, RTL_TEXTENCODING_UNICODE ); + pTC->WriteSrc( foutput, NOFILE_INDEX ); fclose( foutput ); fExitFile = NULL; diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx index 7a3ac10a1f30..36bbd0036685 100644 --- a/sal/inc/rtl/allocator.hxx +++ b/sal/inc/rtl/allocator.hxx @@ -88,7 +88,7 @@ public: //----------------------------------------- template<class U> - Allocator (const Allocator<U>&) SAL_THROW(()) + Allocator (SAL_UNUSED_PARAMETER const Allocator<U>&) SAL_THROW(()) {} //----------------------------------------- @@ -126,14 +126,14 @@ public: are not enabled, e.g. GCC under Linux and it is in general not desired to compile sal with exceptions enabled. */ - pointer allocate (size_type n, const void* = 0) + pointer allocate (size_type n, SAL_UNUSED_PARAMETER const void* = 0) { return reinterpret_cast<pointer>( rtl_allocateMemory(sal_uInt32(n * sizeof(T)))); } //----------------------------------------- - void deallocate (pointer p, size_type /* n */) + void deallocate (pointer p, SAL_UNUSED_PARAMETER size_type /* n */) { rtl_freeMemory(p); } @@ -157,8 +157,9 @@ public: // references above) that's why the operators below // return always true or false -template<class T, class U> -inline bool operator== (const Allocator<T>&, const Allocator<U>&) SAL_THROW(()) +template<class T, class U> inline bool operator ==( + SAL_UNUSED_PARAMETER const Allocator<T>&, + SAL_UNUSED_PARAMETER const Allocator<U>&) SAL_THROW(()) { return true; } diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index 2bb7af39379e..e39e0e091cdf 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -82,7 +82,7 @@ public: private: class DO_NOT_ACQUIRE; - OString( rtl_String * value, DO_NOT_ACQUIRE * ) + OString( rtl_String * value, SAL_UNUSED_PARAMETER DO_NOT_ACQUIRE * ) { pData = value; } diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index 21bd99d87e07..f13f57cd6c20 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -83,7 +83,7 @@ public: private: class DO_NOT_ACQUIRE{}; - OUString( rtl_uString * value, DO_NOT_ACQUIRE * ) + OUString( rtl_uString * value, SAL_UNUSED_PARAMETER DO_NOT_ACQUIRE * ) { pData = value; } diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx index 52a06477603c..ec1fdfa61830 100644 --- a/sal/inc/sal/log.hxx +++ b/sal/inc/sal/log.hxx @@ -83,12 +83,14 @@ struct StreamIgnore { typedef struct { char a[2]; } Result; }; -inline StreamString operator <<(StreamStart const &, char const * s) { +inline StreamString operator <<( + SAL_UNUSED_PARAMETER StreamStart const &, char const * s) +{ return StreamString(s); } template< typename T > inline StreamIgnore operator <<( - StreamStart const &, T const &) + SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &) { std::abort(); #if defined _MSC_VER @@ -97,7 +99,7 @@ template< typename T > inline StreamIgnore operator <<( } template< typename T > inline StreamIgnore operator <<( - StreamString const &, T const &) + SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &) { std::abort(); #if defined _MSC_VER @@ -106,7 +108,7 @@ template< typename T > inline StreamIgnore operator <<( } template< typename T > inline StreamIgnore operator <<( - StreamIgnore const &, T const &) + SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &) { std::abort(); #if defined _MSC_VER @@ -118,7 +120,7 @@ template< typename T > typename T::Result getResult(T const &); inline char const * unwrapStream(StreamString const & s) { return s.string; } -inline char const * unwrapStream(StreamIgnore const &) { +inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) { std::abort(); #if defined _MSC_VER return 0; diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index a331fe1bc391..6c613c060a50 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -479,6 +479,37 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) { # define SAL_WNODEPRECATED_DECLARATIONS_POP #endif +/** Annotate unused but required C++ function parameters. + + An unused parameter is required if the function needs to adhere to a given + type (e.g., if its address is assigned to a function pointer of a specific + type, or if it is called from template code). This annotation helps static + analysis tools suppress false warnings. In the case of virtual functions + (where unused required parameters are common, too), the annotation is not + required (as static analysis tools can themselves derive the information + whether a function is virtual). + + Use the annotation in function definitions like + + void f(SAL_UNUSED_PARAMETER int) {} + + C does not allow unnamed parameters, anyway, so a function definition like + the above needs to be written there as + + void f(int dummy) { (void) dummy; / * avoid warnings * / } + + without a SAL_UNUSED_PARAMETER annotation. + + @since LibreOffice 3.6 + */ +#if defined __cplusplus +#if defined __GNUC__ +#define SAL_UNUSED_PARAMETER __attribute__ ((unused)) +#else +#define SAL_UNUSED_PARAMETER +#endif +#endif + #endif /*_SAL_TYPES_H_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 7bb6bae051f1..84cb2f006811 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -114,7 +114,7 @@ struct FileHandle_Impl ~FileHandle_Impl(); static void* operator new (size_t n); - static void operator delete (void * p, size_t); + static void operator delete (void * p); static size_t getpagesize(); @@ -282,7 +282,7 @@ void* FileHandle_Impl::operator new (size_t n) { return rtl_allocateMemory(n); } -void FileHandle_Impl::operator delete (void * p, size_t) +void FileHandle_Impl::operator delete (void * p) { rtl_freeMemory(p); } diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx index 011c34c01ae4..119859d783d8 100644 --- a/sal/osl/unx/file_impl.hxx +++ b/sal/osl/unx/file_impl.hxx @@ -44,7 +44,7 @@ struct DirectoryItem_Impl ~DirectoryItem_Impl(); static void * operator new(size_t n); - static void operator delete (void * p, size_t); + static void operator delete (void * p); void acquire(); /* @see osl_acquireDirectoryItem() */ void release(); /* @see osl_releaseDirectoryItem() */ diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 7c84086b42ff..06bb72b80e20 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -104,7 +104,7 @@ void * DirectoryItem_Impl::operator new(size_t n) { return rtl_allocateMemory(n); } -void DirectoryItem_Impl::operator delete(void * p, size_t) +void DirectoryItem_Impl::operator delete(void * p) { rtl_freeMemory(p); } @@ -310,7 +310,7 @@ static struct dirent* osl_readdir_impl_(DIR* pdir, sal_Bool bFilterLocalAndParen * osl_getNextDirectoryItem ***************************************************************************/ -oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, sal_uInt32 /*uHint*/) +oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, SAL_UNUSED_PARAMETER sal_uInt32 /*uHint*/) { oslDirectoryImpl* pDirImpl = (oslDirectoryImpl*)Directory; rtl_uString* ustrFileName = NULL; diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index e5fc091ad995..781d9995dd2d 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -345,7 +345,6 @@ oslFileError SAL_CALL osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt6 static oslFileError osl_psz_setFileTime ( const sal_Char* pszFilePath, - const TimeValue* /*pCreationTime*/, const TimeValue* pLastAccessTime, const TimeValue* pLastWriteTime ) { @@ -426,7 +425,7 @@ static oslFileError osl_psz_setFileTime ( oslFileError SAL_CALL osl_setFileTime ( rtl_uString* ustrFileURL, - const TimeValue* pCreationTime, + SAL_UNUSED_PARAMETER const TimeValue* /* pCreationTime */, const TimeValue* pLastAccessTime, const TimeValue* pLastWriteTime ) { @@ -445,7 +444,7 @@ oslFileError SAL_CALL osl_setFileTime ( return oslTranslateFileError( OSL_FET_ERROR, errno ); #endif/* MACOSX */ - return osl_psz_setFileTime( path, pCreationTime, pLastAccessTime, pLastWriteTime ); + return osl_psz_setFileTime( path, pLastAccessTime, pLastWriteTime ); } sal_Bool diff --git a/sal/rtl/source/alloc_arena.cxx b/sal/rtl/source/alloc_arena.cxx index e10131076f8c..639608ce7b3d 100644 --- a/sal/rtl/source/alloc_arena.cxx +++ b/sal/rtl/source/alloc_arena.cxx @@ -911,7 +911,7 @@ SAL_CALL rtl_arena_create ( rtl_arena_type * source_arena, void * (SAL_CALL * source_alloc)(rtl_arena_type *, sal_Size *), void (SAL_CALL * source_free) (rtl_arena_type *, void *, sal_Size), - int + SAL_UNUSED_PARAMETER int ) SAL_THROW_EXTERN_C() { rtl_arena_type * result = 0; diff --git a/sal/rtl/source/alloc_cache.cxx b/sal/rtl/source/alloc_cache.cxx index d601bdb08fe9..102f772872f4 100644 --- a/sal/rtl/source/alloc_cache.cxx +++ b/sal/rtl/source/alloc_cache.cxx @@ -253,7 +253,7 @@ rtl_cache_hash_remove ( /** rtl_cache_slab_constructor() */ static int -rtl_cache_slab_constructor (void * obj, void *) +rtl_cache_slab_constructor (void * obj, SAL_UNUSED_PARAMETER void *) { rtl_cache_slab_type * slab = (rtl_cache_slab_type*)(obj); @@ -267,7 +267,7 @@ rtl_cache_slab_constructor (void * obj, void *) /** rtl_cache_slab_destructor() */ static void -rtl_cache_slab_destructor (void * obj, void *) +rtl_cache_slab_destructor (void * obj, SAL_UNUSED_PARAMETER void *) { rtl_cache_slab_type * slab = static_cast< rtl_cache_slab_type * >(obj); assert(QUEUE_STARTED_NAMED(slab, slab_)); // assure removed from queue(s) @@ -572,7 +572,7 @@ rtl_cache_slab_free ( /** rtl_cache_magazine_constructor() */ static int -rtl_cache_magazine_constructor (void * obj, void *) +rtl_cache_magazine_constructor (void * obj, SAL_UNUSED_PARAMETER void *) { rtl_cache_magazine_type * mag = (rtl_cache_magazine_type*)(obj); /* @@@ sal_Size size = (sal_Size)(arg); @@@ */ @@ -588,7 +588,7 @@ rtl_cache_magazine_constructor (void * obj, void *) /** rtl_cache_magazine_destructor() */ static void -rtl_cache_magazine_destructor (void * obj, void *) +rtl_cache_magazine_destructor (void * obj, SAL_UNUSED_PARAMETER void *) { rtl_cache_magazine_type * mag = static_cast< rtl_cache_magazine_type * >( obj); diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx index 4c3034c0655a..1fe2199e37de 100644 --- a/sal/rtl/source/bootstrap.cxx +++ b/sal/rtl/source/bootstrap.cxx @@ -581,7 +581,7 @@ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open ( //---------------------------------------------------------------------------- void SAL_CALL rtl_bootstrap_args_close ( - rtlBootstrapHandle + SAL_UNUSED_PARAMETER rtlBootstrapHandle ) SAL_THROW_EXTERN_C() { // do nothing; the BootstrapMap::map_ just keeps growing for now diff --git a/sal/rtl/source/cipher.cxx b/sal/rtl/source/cipher.cxx index 31c141771724..4dc517193fdd 100644 --- a/sal/rtl/source/cipher.cxx +++ b/sal/rtl/source/cipher.cxx @@ -1282,7 +1282,8 @@ rtlCipherError SAL_CALL rtl_cipher_initARCFOUR ( rtlCipher Cipher, rtlCipherDirection Direction, const sal_uInt8 *pKeyData, sal_Size nKeyLen, - const sal_uInt8 *, sal_Size) SAL_THROW_EXTERN_C() + SAL_UNUSED_PARAMETER const sal_uInt8 *, SAL_UNUSED_PARAMETER sal_Size) + SAL_THROW_EXTERN_C() { CipherARCFOUR_Impl *pImpl = (CipherARCFOUR_Impl*)Cipher; diff --git a/sal/rtl/source/uuid.cxx b/sal/rtl/source/uuid.cxx index 340bbe9bdf41..bb5c7276282e 100644 --- a/sal/rtl/source/uuid.cxx +++ b/sal/rtl/source/uuid.cxx @@ -100,7 +100,8 @@ static void write_v3( sal_uInt8 *pUuid ) extern "C" void SAL_CALL rtl_createUuid( sal_uInt8 *pTargetUUID , - const sal_uInt8 *, sal_Bool ) + SAL_UNUSED_PARAMETER const sal_uInt8 *, + SAL_UNUSED_PARAMETER sal_Bool ) { { osl::MutexGuard g(osl::Mutex::getGlobalMutex()); diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx index 939aaa3e18d2..d359a1eeef64 100644 --- a/sal/textenc/convertsimple.cxx +++ b/sal/textenc/convertsimple.cxx @@ -533,9 +533,9 @@ static int ImplConvertUnicodeCharToChar( } sal_Size sal::detail::textenc::convertCharToUnicode( - void const * pData, void *, char const * pSrcBuf, sal_Size nSrcBytes, - sal_Unicode * pDestBuf, sal_Size nDestChars, sal_uInt32 nFlags, - sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes) + void const * pData, SAL_UNUSED_PARAMETER void *, char const * pSrcBuf, + sal_Size nSrcBytes, sal_Unicode * pDestBuf, sal_Size nDestChars, + sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes) { sal_uChar c; sal_Unicode cConv; @@ -593,8 +593,9 @@ sal_Size sal::detail::textenc::convertCharToUnicode( } sal_Size sal::detail::textenc::convertUnicodeToChar( - void const * pData, void *, sal_Unicode const * pSrcBuf, sal_Size nSrcChars, - char * pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags, sal_uInt32 * pInfo, + void const * pData, SAL_UNUSED_PARAMETER void *, + sal_Unicode const * pSrcBuf, sal_Size nSrcChars, char * pDestBuf, + sal_Size nDestBytes, sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtChars) { sal_Unicode c; diff --git a/sal/textenc/convertsinglebytetobmpunicode.cxx b/sal/textenc/convertsinglebytetobmpunicode.cxx index 787dee0b7459..efbe5043b0d8 100644 --- a/sal/textenc/convertsinglebytetobmpunicode.cxx +++ b/sal/textenc/convertsinglebytetobmpunicode.cxx @@ -40,7 +40,7 @@ #include "unichars.hxx" sal_Size rtl_textenc_convertSingleByteToBmpUnicode( - void const * data, void *, sal_Char const * srcBuf, + void const * data, SAL_UNUSED_PARAMETER void *, sal_Char const * srcBuf, sal_Size srcBytes, sal_Unicode * destBuf, sal_Size destChars, sal_uInt32 flags, sal_uInt32 * info, sal_Size * srcCvtBytes) { diff --git a/sal/textenc/tcvtbyte.cxx b/sal/textenc/tcvtbyte.cxx index 4861daf4aea1..d80229a45fee 100644 --- a/sal/textenc/tcvtbyte.cxx +++ b/sal/textenc/tcvtbyte.cxx @@ -34,12 +34,12 @@ #include "tcvtbyte.hxx" #include "tenchelp.hxx" -sal_Size ImplSymbolToUnicode( const void*, - void*, +sal_Size ImplSymbolToUnicode( SAL_UNUSED_PARAMETER const void*, + SAL_UNUSED_PARAMETER void*, const char* pSrcBuf, sal_Size nSrcBytes, sal_Unicode* pDestBuf, sal_Size nDestChars, - sal_uInt32, sal_uInt32* pInfo, - sal_Size* pSrcCvtBytes ) + SAL_UNUSED_PARAMETER sal_uInt32, + sal_uInt32* pInfo, sal_Size* pSrcCvtBytes ) { sal_uChar c; sal_Unicode* pEndDestBuf; @@ -70,8 +70,8 @@ sal_Size ImplSymbolToUnicode( const void*, return (nDestChars - (pEndDestBuf-pDestBuf)); } -sal_Size ImplUnicodeToSymbol( const void*, - void*, +sal_Size ImplUnicodeToSymbol( SAL_UNUSED_PARAMETER const void*, + SAL_UNUSED_PARAMETER void*, const sal_Unicode* pSrcBuf, sal_Size nSrcChars, char* pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags, sal_uInt32* pInfo, @@ -130,10 +130,10 @@ sal_Size ImplUnicodeToSymbol( const void*, } sal_Size ImplUpperCharToUnicode( const void* pData, - void*, + SAL_UNUSED_PARAMETER void*, const char* pSrcBuf, sal_Size nSrcBytes, sal_Unicode* pDestBuf, sal_Size nDestChars, - sal_uInt32, sal_uInt32* pInfo, + SAL_UNUSED_PARAMETER sal_uInt32, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes ) { sal_uChar c; diff --git a/sal/textenc/tcvtmb.cxx b/sal/textenc/tcvtmb.cxx index 40bb909ce639..cea7cda42d9e 100644 --- a/sal/textenc/tcvtmb.cxx +++ b/sal/textenc/tcvtmb.cxx @@ -43,7 +43,7 @@ /* ======================================================================= */ -sal_Size ImplDBCSToUnicode( const void* pData, void*, +sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, const char* pSrcBuf, sal_Size nSrcBytes, sal_Unicode* pDestBuf, sal_Size nDestChars, sal_uInt32 nFlags, sal_uInt32* pInfo, @@ -223,7 +223,7 @@ sal_Size ImplDBCSToUnicode( const void* pData, void*, /* ----------------------------------------------------------------------- */ -sal_Size ImplUnicodeToDBCS( const void* pData, void*, +sal_Size ImplUnicodeToDBCS( const void* pData, SAL_UNUSED_PARAMETER void*, const sal_Unicode* pSrcBuf, sal_Size nSrcChars, char* pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags, sal_uInt32* pInfo, @@ -386,7 +386,7 @@ sal_Size ImplUnicodeToDBCS( const void* pData, void*, /* ----------------------------------------------------------------------- */ sal_Size ImplEUCJPToUnicode( const void* pData, - void*, + SAL_UNUSED_PARAMETER void*, const char* pSrcBuf, sal_Size nSrcBytes, sal_Unicode* pDestBuf, sal_Size nDestChars, sal_uInt32 nFlags, sal_uInt32* pInfo, @@ -549,7 +549,7 @@ sal_Size ImplEUCJPToUnicode( const void* pData, /* ----------------------------------------------------------------------- */ sal_Size ImplUnicodeToEUCJP( const void* pData, - void*, + SAL_UNUSED_PARAMETER void*, const sal_Unicode* pSrcBuf, sal_Size nSrcChars, char* pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags, sal_uInt32* pInfo, diff --git a/sal/textenc/tcvtutf7.cxx b/sal/textenc/tcvtutf7.cxx index 79dc5522d971..13c820e7ef55 100644 --- a/sal/textenc/tcvtutf7.cxx +++ b/sal/textenc/tcvtutf7.cxx @@ -143,7 +143,7 @@ void ImplUTF7ResetTextToUnicodeContext( void* pContext ) /* ----------------------------------------------------------------------- */ -sal_Size ImplUTF7ToUnicode( const void*, void* pContext, +sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext, const char* pSrcBuf, sal_Size nSrcBytes, sal_Unicode* pDestBuf, sal_Size nDestChars, sal_uInt32 nFlags, sal_uInt32* pInfo, @@ -436,10 +436,10 @@ void ImplUTF7ResetUnicodeToTextContext( void* pContext ) /* ----------------------------------------------------------------------- */ -sal_Size ImplUnicodeToUTF7( const void*, void* pContext, +sal_Size ImplUnicodeToUTF7( SAL_UNUSED_PARAMETER const void*, void* pContext, const sal_Unicode* pSrcBuf, sal_Size nSrcChars, char* pDestBuf, sal_Size nDestBytes, - sal_uInt32, sal_uInt32* pInfo, + SAL_UNUSED_PARAMETER sal_uInt32, sal_uInt32* pInfo, sal_Size* pSrcCvtChars ) { ImplUTF7FromUCContextData* pContextData = (ImplUTF7FromUCContextData*)pContext; diff --git a/sal/textenc/textcvt.cxx b/sal/textenc/textcvt.cxx index e6f6470305fd..9f0c54763e34 100644 --- a/sal/textenc/textcvt.cxx +++ b/sal/textenc/textcvt.cxx @@ -122,7 +122,8 @@ rtl_TextToUnicodeConverter SAL_CALL rtl_createTextToUnicodeConverter( rtl_TextEn /* ----------------------------------------------------------------------- */ -void SAL_CALL rtl_destroyTextToUnicodeConverter( rtl_TextToUnicodeConverter ) +void SAL_CALL rtl_destroyTextToUnicodeConverter( + SAL_UNUSED_PARAMETER rtl_TextToUnicodeConverter ) {} /* ----------------------------------------------------------------------- */ @@ -199,7 +200,8 @@ rtl_UnicodeToTextConverter SAL_CALL rtl_createUnicodeToTextConverter( rtl_TextEn /* ----------------------------------------------------------------------- */ -void SAL_CALL rtl_destroyUnicodeToTextConverter( rtl_UnicodeToTextConverter ) +void SAL_CALL rtl_destroyUnicodeToTextConverter( + SAL_UNUSED_PARAMETER rtl_UnicodeToTextConverter ) {} /* ----------------------------------------------------------------------- */ diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 7e57583ccccf..677b7f59c8a2 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -194,7 +194,8 @@ private: // the extern interface //--------------------------------------- Reference< XInterface > SAL_CALL SaxExpatParser_CreateInstance( - const Reference< XMultiServiceFactory > & ) throw(Exception) + SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & ) + throw(Exception) { SaxExpatParser *p = new SaxExpatParser; @@ -843,12 +844,10 @@ void SaxExpatParser_Impl::callbackProcessingInstruction( void *pvThis, } -void SaxExpatParser_Impl::callbackUnparsedEntityDecl(void *pvThis , - const XML_Char *entityName, - const XML_Char * /*base*/, - const XML_Char *systemId, - const XML_Char *publicId, - const XML_Char *notationName) +void SaxExpatParser_Impl::callbackUnparsedEntityDecl( + void *pvThis, const XML_Char *entityName, + SAL_UNUSED_PARAMETER const XML_Char * /*base*/, const XML_Char *systemId, + const XML_Char *publicId, const XML_Char *notationName) { SaxExpatParser_Impl *pImpl = ((SaxExpatParser_Impl*)pvThis); if( pImpl->rDTDHandler.is() ) { @@ -862,11 +861,10 @@ void SaxExpatParser_Impl::callbackUnparsedEntityDecl(void *pvThis , } } -void SaxExpatParser_Impl::callbackNotationDecl( void *pvThis, - const XML_Char *notationName, - const XML_Char * /*base*/, - const XML_Char *systemId, - const XML_Char *publicId) +void SaxExpatParser_Impl::callbackNotationDecl( + void *pvThis, const XML_Char *notationName, + SAL_UNUSED_PARAMETER const XML_Char * /*base*/, const XML_Char *systemId, + const XML_Char *publicId) { SaxExpatParser_Impl *pImpl = ((SaxExpatParser_Impl*)pvThis); if( pImpl->rDTDHandler.is() ) { @@ -880,11 +878,10 @@ void SaxExpatParser_Impl::callbackNotationDecl( void *pvThis, -int SaxExpatParser_Impl::callbackExternalEntityRef( XML_Parser parser, - const XML_Char *context, - const XML_Char * /*base*/, - const XML_Char *systemId, - const XML_Char *publicId) +int SaxExpatParser_Impl::callbackExternalEntityRef( + XML_Parser parser, const XML_Char *context, + SAL_UNUSED_PARAMETER const XML_Char * /*base*/, const XML_Char *systemId, + const XML_Char *publicId) { sal_Bool bOK = sal_True; InputSource source; @@ -953,9 +950,10 @@ int SaxExpatParser_Impl::callbackExternalEntityRef( XML_Parser parser, return bOK; } -int SaxExpatParser_Impl::callbackUnknownEncoding(void * /*encodingHandlerData*/, - const XML_Char * /*name*/, - XML_Encoding * /*info*/) +int SaxExpatParser_Impl::callbackUnknownEncoding( + SAL_UNUSED_PARAMETER void * /*encodingHandlerData*/, + SAL_UNUSED_PARAMETER const XML_Char * /*name*/, + SAL_UNUSED_PARAMETER XML_Encoding * /*info*/) { return 0; } @@ -1030,7 +1028,8 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL expwrap_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const sal_Char * pImplName, void * pServiceManager, + SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 3969eb33d779..49c6a837a235 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -1022,7 +1022,7 @@ private: // the extern interface //--------------------------------------- Reference < XInterface > SAL_CALL SaxWriter_CreateInstance( - const Reference < XMultiServiceFactory > & ) + SAL_UNUSED_PARAMETER const Reference < XMultiServiceFactory > & ) throw (Exception) { SAXWriter *p = new SAXWriter; diff --git a/sax/source/fastparser/facreg.cxx b/sax/source/fastparser/facreg.cxx index bc27b2e0b614..2f0eba35ff7d 100644 --- a/sax/source/fastparser/facreg.cxx +++ b/sax/source/fastparser/facreg.cxx @@ -19,13 +19,17 @@ namespace sax_fastparser //-------------------------------------- // the extern interface //--------------------------------------- -Reference< XInterface > SAL_CALL FastSaxParser_CreateInstance( const Reference< XMultiServiceFactory > & ) throw(Exception) +Reference< XInterface > SAL_CALL FastSaxParser_CreateInstance( + SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & ) + throw(Exception) { FastSaxParser *p = new FastSaxParser; return Reference< XInterface > ( (OWeakObject * ) p ); } -Reference< XInterface > SAL_CALL FastSaxSerializer_CreateInstance( const Reference< XMultiServiceFactory > & ) throw(Exception) +Reference< XInterface > SAL_CALL FastSaxSerializer_CreateInstance( + SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & ) + throw(Exception) { FastSaxSerializer *p = new FastSaxSerializer; return Reference< XInterface > ( (OWeakObject * ) p ); @@ -35,7 +39,9 @@ Reference< XInterface > SAL_CALL FastSaxSerializer_CreateInstance( const Referen extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL fastsax_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL fastsax_component_getFactory( + const sal_Char * pImplName, void * pServiceManager, + SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 3480628813f0..66642e475c49 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -847,7 +847,7 @@ void FastSaxParser::callbackStartElement( const XML_Char* pwName, const XML_Char } } -void FastSaxParser::callbackEndElement( const XML_Char* ) +void FastSaxParser::callbackEndElement( SAL_UNUSED_PARAMETER const XML_Char* ) { Entity& rEntity = getEntity(); OSL_ENSURE( !rEntity.maContextStack.empty(), "FastSaxParser::callbackEndElement - no context" ); @@ -887,8 +887,10 @@ void FastSaxParser::callbackCharacters( const XML_Char* s, int nLen ) } } -int FastSaxParser::callbackExternalEntityRef( XML_Parser parser, - const XML_Char *context, const XML_Char * /*base*/, const XML_Char *systemId, const XML_Char *publicId ) +int FastSaxParser::callbackExternalEntityRef( + XML_Parser parser, const XML_Char *context, + SAL_UNUSED_PARAMETER const XML_Char * /*base*/, const XML_Char *systemId, + const XML_Char *publicId ) { bool bOK = true; InputSource source; diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index b2e6097bdcd6..8d1708715699 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -127,11 +127,11 @@ public: typedef ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >* XModifyListenerPtr; -SV_DECL_PTRARR_DEL( XModifyListenerArr_Impl, XModifyListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XModifyListenerArr_Impl, XModifyListenerPtr, 4 ) class ScNamedEntry; typedef ScNamedEntry* ScNamedEntryPtr; -SV_DECL_PTRARR_DEL( ScNamedEntryArr_Impl, ScNamedEntryPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( ScNamedEntryArr_Impl, ScNamedEntryPtr, 4 ) // ScCellRangesBase - base class for ScCellRangesObj (with access by index) diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index f541e247e7d8..8d84e4cdeb7b 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -271,7 +271,7 @@ public: typedef ScConditionalFormat* ScConditionalFormatPtr; SV_DECL_PTRARR_SORT(ScConditionalFormats_Impl, ScConditionalFormatPtr, - SC_COND_GROW, SC_COND_GROW) + SC_COND_GROW) class ScConditionalFormatList : public ScConditionalFormats_Impl { diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 732dd80edd99..79283f05af79 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -71,7 +71,7 @@ struct ScSortParam; typedef ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >* XDBRefreshListenerPtr; -SV_DECL_PTRARR_DEL( XDBRefreshListenerArr_Impl, XDBRefreshListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XDBRefreshListenerArr_Impl, XDBRefreshListenerPtr, 4 ) class ScDataUnoConversion { diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 9dc87fa7f57e..811dde8cd217 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -80,7 +80,7 @@ public: typedef ScDetOpData* ScDetOpDataPtr; -SV_DECL_PTRARR_DEL(ScDetOpArr_Impl, ScDetOpDataPtr, SC_DETOP_GROW, SC_DETOP_GROW) +SV_DECL_PTRARR_DEL(ScDetOpArr_Impl, ScDetOpDataPtr, SC_DETOP_GROW) class ScDetOpList : public ScDetOpArr_Impl { diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index 4b29605cfc3f..8577d37be7bd 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -46,7 +46,7 @@ class ScTabViewShell; typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >* XStatusListenerPtr; -SV_DECL_PTRARR_DEL( XStatusListenerArr_Impl, XStatusListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XStatusListenerArr_Impl, XStatusListenerPtr, 4 ) class ScDispatchProviderInterceptor : public cppu::WeakImplHelper2< diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index d901d7473008..6864e147cc4c 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -497,7 +497,7 @@ public: //! replace PtrArr with 32-bit array ???? typedef ScDPDataMember* ScDPDataMemberPtr; -SV_DECL_PTRARR_DEL(ScDPDataMembers, ScDPDataMemberPtr, SC_DP_RES_GROW, SC_DP_RES_GROW) +SV_DECL_PTRARR_DEL(ScDPDataMembers, ScDPDataMemberPtr, SC_DP_RES_GROW) // result dimension contains only members diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index ea28415edda3..9be4cecba81c 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -62,7 +62,7 @@ class ScTableLink; typedef ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >* XRefreshListenerPtr; -SV_DECL_PTRARR_DEL( XRefreshListenerArr_Impl, XRefreshListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XRefreshListenerArr_Impl, XRefreshListenerPtr, 4 ) diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index e2a1f3a6cdcc..13e4aedd8e82 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -182,8 +182,7 @@ private: typedef ScValidationData* ScValidationDataPtr; -SV_DECL_PTRARR_SORT(ScValidationEntries_Impl, ScValidationDataPtr, - SC_COND_GROW, SC_COND_GROW) +SV_DECL_PTRARR_SORT(ScValidationEntries_Impl, ScValidationDataPtr, SC_COND_GROW) class ScValidationDataList : public ScValidationEntries_Impl { diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index b062fd86a89c..723cf8926996 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -60,27 +60,27 @@ class ScPreviewShell; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >* XRangeSelectionListenerPtr; -SV_DECL_PTRARR_DEL( XRangeSelectionListenerArr_Impl, XRangeSelectionListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XRangeSelectionListenerArr_Impl, XRangeSelectionListenerPtr, 4 ) typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionChangeListener >* XRangeSelectionChangeListenerPtr; -SV_DECL_PTRARR_DEL( XRangeSelectionChangeListenerArr_Impl, XRangeSelectionChangeListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XRangeSelectionChangeListenerArr_Impl, XRangeSelectionChangeListenerPtr, 4 ) typedef ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >* XSelectionChangeListenerPtr; -SV_DECL_PTRARR_DEL( XSelectionChangeListenerArr_Impl, XSelectionChangeListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XSelectionChangeListenerArr_Impl, XSelectionChangeListenerPtr, 4 ) typedef ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >* XViewPropertyChangeListenerPtr; -SV_DECL_PTRARR_DEL( XViewPropertyChangeListenerArr_Impl, XViewPropertyChangeListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XViewPropertyChangeListenerArr_Impl, XViewPropertyChangeListenerPtr, 4 ) typedef ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEnhancedMouseClickHandler >* XMouseClickHandlerPtr; -SV_DECL_PTRARR_DEL( XMouseClickHandlerArr_Impl, XMouseClickHandlerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XMouseClickHandlerArr_Impl, XMouseClickHandlerPtr, 4 ) typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XActivationEventListener >* XActivationEventListenerPtr; -SV_DECL_PTRARR_DEL( XActivationEventListenerArr_Impl, XActivationEventListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XActivationEventListenerArr_Impl, XActivationEventListenerPtr, 4 ) // ScViewPaneBase not derived from OWeakObject diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx index 061c5077137b..4d47d3d5cf09 100644 --- a/sc/source/core/inc/adiasync.hxx +++ b/sc/source/core/inc/adiasync.hxx @@ -41,12 +41,12 @@ void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData ); class ScAddInAsync; typedef ScAddInAsync* ScAddInAsyncPtr; -SV_DECL_PTRARR_SORT( ScAddInAsyncs, ScAddInAsyncPtr, 4, 4 ) +SV_DECL_PTRARR_SORT( ScAddInAsyncs, ScAddInAsyncPtr, 4 ) extern ScAddInAsyncs theAddInAsyncTbl; // in adiasync.cxx class ScDocument; typedef ScDocument* ScAddInDocPtr; -SV_DECL_PTRARR_SORT( ScAddInDocs, ScAddInDocPtr, 1, 1 ) +SV_DECL_PTRARR_SORT( ScAddInDocs, ScAddInDocPtr, 1 ) class String; diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx index 273ec7883407..42b74070df1d 100644 --- a/sc/source/core/tool/addinlis.cxx +++ b/sc/source/core/tool/addinlis.cxx @@ -59,7 +59,7 @@ ScAddInListener* ScAddInListener::CreateListener( ScAddInListener::ScAddInListener( uno::Reference<sheet::XVolatileResult> xVR, ScDocument* pDoc ) : xVolRes( xVR ) { - pDocs = new ScAddInDocs( 1, 1 ); + pDocs = new ScAddInDocs( 1 ); pDocs->Insert( pDoc ); } diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx index 2ff728dc06af..e7b21a8fa306 100644 --- a/sc/source/core/tool/adiasync.cxx +++ b/sc/source/core/tool/adiasync.cxx @@ -74,7 +74,7 @@ ScAddInAsync::ScAddInAsync( sal_uLong nHandleP, sal_uInt16 nIndex, ScDocument* p nHandle( nHandleP ), bValid( false ) { - pDocs = new ScAddInDocs( 1, 1 ); + pDocs = new ScAddInDocs( 1 ); pDocs->Insert( pDoc ); pFuncData = (FuncData*)ScGlobal::GetFuncCollection()->At(nIndex); eType = pFuncData->GetAsyncType(); diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index d6c3a682b033..ee03c4a53241 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -1044,7 +1044,7 @@ sal_Bool ScAutoFormat::Load() OSL_FAIL( "Der Header enthaelt mehr/neuere Daten" ); rStream.Seek( nPos + nCnt ); } - rStream.SetStreamCharSet( GetSOLoadTextEncoding( nChrSet, nFileVers ) ); + rStream.SetStreamCharSet( GetSOLoadTextEncoding( nChrSet ) ); rStream.SetVersion( nFileVers ); } @@ -1134,7 +1134,7 @@ sal_Bool ScAutoFormat::Save() rStream << nVal << (sal_uInt8)2 // Anzahl von Zeichen des Headers incl. diesem << (sal_uInt8)::GetSOStoreTextEncoding( - osl_getThreadTextEncoding(), sal::static_int_cast<sal_uInt16>(rStream.GetVersion()) ); + osl_getThreadTextEncoding() ); ScAfVersions::Write(rStream); // Item-Versionen bRet = (rStream.GetError() == 0); diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 4c3ea8ecf6e3..b8846c46e10d 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -108,7 +108,7 @@ public: // ============================================================================ -SV_DECL_VARARR_SORT( ScHTMLColOffset, sal_uLong, 16, 4) +SV_DECL_VARARR_SORT( ScHTMLColOffset, sal_uLong, 16 ) struct ScHTMLTableStackEntry { diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index 77c82bb788ce..4d62d4d7dc26 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -46,7 +46,7 @@ struct ScRTFCellDefault }; // deswegen ULONG, typedef bringt's auch nicht :-( -SV_DECL_VARARR_SORT( ScRTFColTwips, sal_uLong, 16, 4) +SV_DECL_VARARR_SORT( ScRTFColTwips, sal_uLong, 16 ) #else // SC_RTFPARSE_CXX diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx index b0c31da16e9d..0a9912584787 100644 --- a/sc/workben/result.hxx +++ b/sc/workben/result.hxx @@ -41,7 +41,7 @@ //class XResultListenerRef; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >* XResultListenerPtr; -SV_DECL_PTRARR_DEL( XResultListenerArr_Impl, XResultListenerPtr, 4, 4 ); +SV_DECL_PTRARR_DEL( XResultListenerArr_Impl, XResultListenerPtr, 4 ); class ScAddInResult : public cppu::WeakImplHelper1< diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index d6c76abd6275..3832af5df407 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -391,8 +391,8 @@ void ImpCountGraphicObjects( const Reference< XComponentContext >& rxMSF, const } } -void ImpCountBackgroundGraphic( const Reference< XComponentContext >& /* rxMSF */, const Reference< XDrawPage >& rxDrawPage, - const GraphicSettings& /* rGraphicSettings */, sal_Int32& rnGraphics ) +void ImpCountBackgroundGraphic( + const Reference< XDrawPage >& rxDrawPage, sal_Int32& rnGraphics ) { try { @@ -430,13 +430,13 @@ void GraphicCollector::CountGraphics( const Reference< XComponentContext >& rxMS for ( i = 0; i < xDrawPages->getCount(); i++ ) { Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); - ImpCountBackgroundGraphic( rxMSF, xDrawPage, rGraphicSettings, rnGraphics ); + ImpCountBackgroundGraphic( xDrawPage, rnGraphics ); Reference< XShapes > xDrawShapes( xDrawPage, UNO_QUERY_THROW ); ImpCountGraphicObjects( rxMSF, xDrawShapes, rGraphicSettings, rnGraphics ); Reference< XPresentationPage > xPresentationPage( xDrawPage, UNO_QUERY_THROW ); Reference< XDrawPage > xNotesPage( xPresentationPage->getNotesPage() ); - ImpCountBackgroundGraphic( rxMSF, xNotesPage, rGraphicSettings, rnGraphics ); + ImpCountBackgroundGraphic( xNotesPage, rnGraphics ); Reference< XShapes > xNotesShapes( xNotesPage, UNO_QUERY_THROW ); ImpCountGraphicObjects( rxMSF, xNotesShapes, rGraphicSettings, rnGraphics ); } @@ -445,7 +445,7 @@ void GraphicCollector::CountGraphics( const Reference< XComponentContext >& rxMS for ( i = 0; i < xMasterPages->getCount(); i++ ) { Reference< XDrawPage > xMasterPage( xMasterPages->getByIndex( i ), UNO_QUERY_THROW ); - ImpCountBackgroundGraphic( rxMSF, xMasterPage, rGraphicSettings, rnGraphics ); + ImpCountBackgroundGraphic( xMasterPage, rnGraphics ); Reference< XShapes > xMasterPageShapes( xMasterPage, UNO_QUERY_THROW ); ImpCountGraphicObjects( rxMSF, xMasterPageShapes, rGraphicSettings, rnGraphics ); } diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index 6430c2c3e260..cc3fd3584727 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.cxx @@ -42,7 +42,8 @@ using namespace ::com::sun::star::registry; extern "C" { - sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) + sal_Bool SAL_CALL component_writeInfo( + SAL_UNUSED_PARAMETER void* /*pServiceManager*/, void* pRegistryKey ) { if (pRegistryKey) { @@ -77,7 +78,9 @@ extern "C" // ------------------------------------------------------------------------- - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( + const sal_Char * pImplName, void * pServiceManager, + SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { OUString aImplName( OUString::createFromAscii( pImplName ) ); void* pRet = 0; diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 1638f523485f..ccd33b430d77 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -300,7 +300,7 @@ public: return aStr.makeStringAndClear(); } - void haveFile( iteratorT pBegin, iteratorT /*pEnd*/ ) + void haveFile( iteratorT pBegin, SAL_UNUSED_PARAMETER iteratorT /*pEnd*/ ) { if( m_aObjectStack.empty() ) { @@ -387,7 +387,7 @@ public: insertNewValue( new PDFName(iteratorToString(first,last)), first ); } - void pushDouble( iteratorT first, iteratorT /*last*/ ) + void pushDouble( iteratorT first, SAL_UNUSED_PARAMETER iteratorT /*last*/ ) { insertNewValue( new PDFNumber(m_fDouble), first ); } @@ -402,13 +402,13 @@ public: insertNewValue( new PDFBool( (last-first == 4) ), first ); } - void pushNull( iteratorT first, iteratorT ) + void pushNull( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) { insertNewValue( new PDFNull(), first ); } - void beginObject( iteratorT first, iteratorT /*last*/ ) + void beginObject( iteratorT first, SAL_UNUSED_PARAMETER iteratorT /*last*/ ) { if( m_aObjectStack.empty() ) m_aObjectStack.push_back( new PDFPart() ); @@ -433,7 +433,7 @@ public: parseError( "object in wrong place", first ); } - void endObject( iteratorT first, iteratorT ) + void endObject( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) { if( m_aObjectStack.empty() ) parseError( "endobj without obj", first ); @@ -443,7 +443,7 @@ public: m_aObjectStack.pop_back(); } - void pushObjectRef( iteratorT first, iteratorT ) + void pushObjectRef( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) { unsigned int nGeneration = m_aUIntStack.back(); m_aUIntStack.pop_back(); @@ -452,7 +452,7 @@ public: insertNewValue( new PDFObjectRef(nObject,nGeneration), first ); } - void beginDict( iteratorT first, iteratorT ) + void beginDict( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) { PDFDict* pDict = new PDFDict(); pDict->m_nOffset = first - m_aGlobalBegin; @@ -461,7 +461,7 @@ public: // will not come here if insertion fails (exception) m_aObjectStack.push_back( pDict ); } - void endDict( iteratorT first, iteratorT ) + void endDict( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) { PDFDict* pDict = NULL; if( m_aObjectStack.empty() ) @@ -482,7 +482,7 @@ public: } } - void beginArray( iteratorT first, iteratorT ) + void beginArray( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) { PDFArray* pArray = new PDFArray(); pArray->m_nOffset = first - m_aGlobalBegin; @@ -492,7 +492,7 @@ public: m_aObjectStack.push_back( pArray ); } - void endArray( iteratorT first, iteratorT ) + void endArray( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) { if( m_aObjectStack.empty() ) parseError( "array end without begin", first ); @@ -525,7 +525,7 @@ public: parseError( "stream without object", first ); } - void beginTrailer( iteratorT first, iteratorT ) + void beginTrailer( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) { if( m_aObjectStack.empty() ) m_aObjectStack.push_back( new PDFPart() ); @@ -545,7 +545,7 @@ public: parseError( "trailer in wrong place", first ); } - void endTrailer( iteratorT first, iteratorT ) + void endTrailer( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) { if( m_aObjectStack.empty() ) parseError( "%%EOF without trailer", first ); diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 296ef7f7dfa1..e15d9a5f78ee 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -120,7 +120,8 @@ namespace } extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) +component_writeInfo( + SAL_UNUSED_PARAMETER void* /*pServiceManager*/, void* pRegistryKey ) { Reference< XRegistryKey > xRootKey( static_cast< XRegistryKey* >( pRegistryKey ) ); @@ -149,7 +150,9 @@ component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) } extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( - const sal_Char* pImplementationName, void* /*pServiceManager*/, void* /*pRegistryKey*/ ) + const sal_Char* pImplementationName, + SAL_UNUSED_PARAMETER void* /*pServiceManager*/, + SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) { ::rtl::OUString sImplementationName( ::rtl::OUString::createFromAscii( pImplementationName ) ); diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index e6e9b33e4ed1..2e933e586ade 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -422,9 +422,7 @@ void PDFIProcessor::processGlyph( double fPreAvarageSpaceValue, drawCharGlyphs( aGlyph.getGlyph(), aGlyph.getRect(), - aGlyph.getFontMatrix(), aGlyph.getGC(), - aGlyph.getCurElement(), pPara, pFrame, flag); @@ -433,9 +431,7 @@ void PDFIProcessor::processGlyph( double fPreAvarageSpaceValue, { drawCharGlyphs( aGlyph.getGlyph(), aGlyph.getRect(), - aGlyph.getFontMatrix(), aGlyph.getGC(), - aGlyph.getCurElement(), pPara, pFrame, false ); @@ -513,9 +509,7 @@ GraphicsContext& PDFIProcessor::getTransformGlyphContext( CharGlyph& rGlyph ) } void PDFIProcessor::drawCharGlyphs( rtl::OUString& rGlyphs, geometry::RealRectangle2D& rRect, - geometry::Matrix2D& , GraphicsContext aGC, - Element* , ParagraphElement* pPara, FrameElement* pFrame, bool bSpaceFlag ) diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index 4b66f4c31d54..349a4a9b34bc 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -128,9 +128,7 @@ namespace pdfi void drawCharGlyphs( rtl::OUString& rGlyphs, ::com::sun::star::geometry::RealRectangle2D& rRect, - ::com::sun::star::geometry::Matrix2D& rFontMatrix, GraphicsContext aGC, - Element* pCurElement, ParagraphElement* pPara, FrameElement* pFrame, bool bSpaceFlag ); diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index ccdadf1b15ef..481bb6756523 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -665,8 +665,7 @@ void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange) mxViewId->getResourceURL())); ::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration ( mpPresenterController->GetTheme()->GetNodeForViewStyle( - sStyleName, - PresenterConfigurationAccess::READ_WRITE)); + sStyleName)); if (pConfiguration.get()==NULL || ! pConfiguration->IsValid()) return; diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 7f0ed3abc432..8990416c19fc 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -381,8 +381,7 @@ bool PresenterTheme::ConvertToColor ( } ::boost::shared_ptr<PresenterConfigurationAccess> PresenterTheme::GetNodeForViewStyle ( - const ::rtl::OUString& rsStyleName, - const PresenterConfigurationAccess::WriteMode) const + const ::rtl::OUString& rsStyleName) const { if (mpTheme.get() == NULL) return ::boost::shared_ptr<PresenterConfigurationAccess>(); diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index b4b263efea41..26aa3e3d79b0 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -133,8 +133,7 @@ public: sal_uInt32& rColor); ::boost::shared_ptr<PresenterConfigurationAccess> GetNodeForViewStyle ( - const ::rtl::OUString& rsStyleName, - const PresenterConfigurationAccess::WriteMode) const; + const ::rtl::OUString& rsStyleName) const; private: css::uno::Reference<css::uno::XComponentContext> mxContext; diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx index 904cc620d05f..f20cf24d4f13 100644 --- a/sfx2/inc/arrdecl.hxx +++ b/sfx2/inc/arrdecl.hxx @@ -33,35 +33,35 @@ #include <vector> class SfxObjectShell; -SV_DECL_PTRARR( SfxObjectShellArr_Impl, SfxObjectShell*, 4, 4 ) +SV_DECL_PTRARR( SfxObjectShellArr_Impl, SfxObjectShell*, 4 ) class SfxViewFrame; -SV_DECL_PTRARR( SfxViewFrameArr_Impl, SfxViewFrame*, 4, 4 ) +SV_DECL_PTRARR( SfxViewFrameArr_Impl, SfxViewFrame*, 4 ) class SfxViewShell; -SV_DECL_PTRARR( SfxViewShellArr_Impl, SfxViewShell*, 4, 4 ) +SV_DECL_PTRARR( SfxViewShellArr_Impl, SfxViewShell*, 4 ) struct SfxTbxCtrlFactory; -SV_DECL_PTRARR_DEL( SfxTbxCtrlFactArr_Impl, SfxTbxCtrlFactory*, 8, 4 ) +SV_DECL_PTRARR_DEL( SfxTbxCtrlFactArr_Impl, SfxTbxCtrlFactory*, 8 ) struct SfxStbCtrlFactory; -SV_DECL_PTRARR_DEL( SfxStbCtrlFactArr_Impl, SfxStbCtrlFactory*, 8, 4 ) +SV_DECL_PTRARR_DEL( SfxStbCtrlFactArr_Impl, SfxStbCtrlFactory*, 8 ) struct SfxMenuCtrlFactory; -SV_DECL_PTRARR_DEL( SfxMenuCtrlFactArr_Impl, SfxMenuCtrlFactory*, 2, 2 ) +SV_DECL_PTRARR_DEL( SfxMenuCtrlFactArr_Impl, SfxMenuCtrlFactory*, 2 ) struct SfxChildWinFactory; -SV_DECL_PTRARR_DEL( SfxChildWinFactArr_Impl, SfxChildWinFactory*, 2, 2 ) +SV_DECL_PTRARR_DEL( SfxChildWinFactArr_Impl, SfxChildWinFactory*, 2 ) class SfxModule; -SV_DECL_PTRARR( SfxModuleArr_Impl, SfxModule*, 2, 2 ) +SV_DECL_PTRARR( SfxModuleArr_Impl, SfxModule*, 2 ) class SfxFilter; DECL_PTRARRAY( SfxFilterArr_Impl, SfxFilter*, 4, 4 ) class SfxFrame; typedef SfxFrame* SfxFramePtr; -SV_DECL_PTRARR( SfxFrameArr_Impl, SfxFramePtr, 4, 4 ) +SV_DECL_PTRARR( SfxFrameArr_Impl, SfxFramePtr, 4 ) typedef ::std::vector< SfxFilter* > SfxFilterList_Impl; diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx index d2fe396b6bf4..efadaccf046b 100644 --- a/sfx2/inc/orgmgr.hxx +++ b/sfx2/inc/orgmgr.hxx @@ -37,7 +37,7 @@ struct _FileListEntry; //========================================================================= -SV_DECL_PTRARR_SORT(_SfxObjectList, _FileListEntry*, 1, 4) +SV_DECL_PTRARR_SORT(_SfxObjectList, _FileListEntry*, 1) class SfxObjectList: public _SfxObjectList { diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx index 3c47eb2eea3d..529ef665927b 100644 --- a/sfx2/inc/sfx2/bindings.hxx +++ b/sfx2/inc/sfx2/bindings.hxx @@ -66,7 +66,7 @@ class SfxFoundCacheArr_Impl; class SfxWorkWindow; class SfxUnoControllerItem; typedef SfxUnoControllerItem* SfxUnoControllerItemPtr; -SV_DECL_PTRARR( SfxUnoControllerArr_Impl, SfxUnoControllerItemPtr, 20, 20 ) +SV_DECL_PTRARR( SfxUnoControllerArr_Impl, SfxUnoControllerItemPtr, 20 ) //________________________________________________________________________________________________________________ // defines diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx index 887ea6e1124e..61da6641f700 100644 --- a/sfx2/inc/sfx2/childwin.hxx +++ b/sfx2/inc/sfx2/childwin.hxx @@ -103,7 +103,7 @@ struct SfxChildWinContextFactory {} }; -SV_DECL_PTRARR_DEL( SfxChildWinContextArr_Impl, SfxChildWinContextFactory*, 2, 2 ) +SV_DECL_PTRARR_DEL( SfxChildWinContextArr_Impl, SfxChildWinContextFactory*, 2 ) struct SfxChildWinFactory { diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index de657426dfc6..c51763294388 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -73,7 +73,7 @@ namespace com //========================================================================= typedef SfxPoolItem* SfxPoolItemPtr; -SV_DECL_PTRARR_DEL( SfxItemPtrArray, SfxPoolItemPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( SfxItemPtrArray, SfxPoolItemPtr, 4 ) // fuer shell.cxx typedef SfxItemPtrArray SfxItemArray_Impl; diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx index 0258f95652d4..544c782f6918 100644 --- a/sfx2/inc/sfx2/linkmgr.hxx +++ b/sfx2/inc/sfx2/linkmgr.hxx @@ -57,10 +57,10 @@ class SvBaseLink; class SvBaseLinkRef; typedef SvBaseLinkRef* SvBaseLinkRefPtr; -SV_DECL_PTRARR( SvBaseLinks, SvBaseLinkRefPtr, 1, 1 ) +SV_DECL_PTRARR( SvBaseLinks, SvBaseLinkRefPtr, 1 ) typedef SvLinkSource* SvLinkSourcePtr; -SV_DECL_PTRARR( SvLinkSources, SvLinkSourcePtr, 1, 1 ) +SV_DECL_PTRARR( SvLinkSources, SvLinkSourcePtr, 1 ) class SFX2_DLLPUBLIC LinkManager { diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx index 1957b11f5cac..a9f9f9a4ad98 100644 --- a/sfx2/inc/sfx2/macrconf.hxx +++ b/sfx2/inc/sfx2/macrconf.hxx @@ -48,7 +48,7 @@ class SvStream; class SvxMacro; typedef SfxMacroInfo* SfxMacroInfoPtr; -SV_DECL_PTRARR(SfxMacroInfoArr_Impl, SfxMacroInfoPtr, 5, 5) +SV_DECL_PTRARR(SfxMacroInfoArr_Impl, SfxMacroInfoPtr, 5) class SFX2_DLLPUBLIC SfxMacroInfo { diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 85149bf12972..65be1fcb6120 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -237,7 +237,7 @@ public: }; -SV_DECL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl *, 4, 4 ) +SV_DECL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl *, 4 ) SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl *) //======================================================================== diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 0e8607d61e45..daec440c0c5a 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -318,7 +318,7 @@ void LinkManager::UpdateAllLinks( { // First make a copy of the array in order to update links // links in ... no contact between them! - SvPtrarr aTmpArr( 255, 50 ); + SvPtrarr aTmpArr( 255 ); sal_uInt16 n; for( n = 0; n < aLinkTbl.Count(); ++n ) { diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index eac6f02a4fd0..7fee276c527a 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -100,7 +100,7 @@ SvLinkSource_Entry_Impl::~SvLinkSource_Entry_Impl() } typedef SvLinkSource_Entry_Impl* SvLinkSource_Entry_ImplPtr; -SV_DECL_PTRARR_DEL( SvLinkSource_Array_Impl, SvLinkSource_Entry_ImplPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( SvLinkSource_Array_Impl, SvLinkSource_Entry_ImplPtr, 4 ) SV_IMPL_PTRARR( SvLinkSource_Array_Impl, SvLinkSource_Entry_ImplPtr ); class SvLinkSource_EntryIter_Impl diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index e80b9cbdfbe5..ec29ed93c2cb 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -208,7 +208,7 @@ struct SfxFoundCache_Impl //-------------------------------------------------------------------------- -SV_DECL_PTRARR_SORT_DEL(SfxFoundCacheArr_Impl, SfxFoundCache_Impl*, 16, 16 ) +SV_DECL_PTRARR_SORT_DEL(SfxFoundCacheArr_Impl, SfxFoundCache_Impl*, 16) SV_IMPL_OP_PTRARR_SORT(SfxFoundCacheArr_Impl, SfxFoundCache_Impl*); //========================================================================== diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 009f7f159c8d..74ce18457c3e 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -64,7 +64,7 @@ TYPEINIT0(SfxShell); //==================================================================== typedef SfxSlot* SfxSlotPtr; -SV_DECL_PTRARR_DEL( SfxVerbSlotArr_Impl, SfxSlotPtr, 4, 4) +SV_DECL_PTRARR_DEL( SfxVerbSlotArr_Impl, SfxSlotPtr, 4 ) SV_IMPL_PTRARR( SfxVerbSlotArr_Impl, SfxSlotPtr); using namespace com::sun::star; diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 91e6b22323bf..4c40b6734a00 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -66,7 +66,7 @@ struct SfxDock_Impl }; typedef SfxDock_Impl* SfxDockPtr; -SV_DECL_PTRARR_DEL( SfxDockArr_Impl, SfxDockPtr, 4, 4) +SV_DECL_PTRARR_DEL( SfxDockArr_Impl, SfxDockPtr, 4 ) SV_IMPL_PTRARR( SfxDockArr_Impl, SfxDockPtr); class SfxEmptySplitWin_Impl : public SplitWindow diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 1c51c408b845..a24cb892d859 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -428,7 +428,7 @@ void SfxTemplateDialogWrapper::SetParagraphFamily() } //========================================================================= -SV_DECL_PTRARR_DEL(ExpandedEntries, StringPtr,16,8) +SV_DECL_PTRARR_DEL(ExpandedEntries, StringPtr,16) SV_IMPL_PTRARR(ExpandedEntries, StringPtr) /* [Description] @@ -647,7 +647,7 @@ struct StyleTree_Impl }; typedef StyleTree_Impl* StyleTree_ImplPtr; -SV_DECL_PTRARR_DEL(StyleTreeArr_Impl, StyleTree_ImplPtr, 16, 8) +SV_DECL_PTRARR_DEL(StyleTreeArr_Impl, StyleTree_ImplPtr, 16) SV_IMPL_PTRARR(StyleTreeArr_Impl, StyleTree_ImplPtr) diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index bff67fa6ff03..ac5e93635fca 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -206,7 +206,8 @@ css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName) } css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( - css::uno::Reference< css::uno::XComponentContext > const &) + SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > + const &) { return static_cast< cppu::OWeakObject * >(new Service); } diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index 1d08c0dfd751..620321003720 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -39,7 +39,7 @@ namespace lang = css::lang ; //------------------------------------------------------------------------------ static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend( - const uno::Reference<uno::XComponentContext>&){ + SAL_UNUSED_PARAMETER const uno::Reference<uno::XComponentContext>&){ return * LocaleBackend::createInstance(); } diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 804bc8880d54..cdad68b5339e 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -70,7 +70,10 @@ extern "C" // component_getFactory //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* /*pSrvManager*/, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( + const sal_Char* pImplName, + SAL_UNUSED_PARAMETER uno_Interface* /*pSrvManager*/, + SAL_UNUSED_PARAMETER uno_Interface* /*pRegistryKey*/ ) { Reference< XSingleComponentFactory > xFactory; diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index dcca511be747..4fcc214b7615 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -69,7 +69,10 @@ extern "C" // component_getFactory //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* /*pSrvManager*/, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( + const sal_Char* pImplName, + SAL_UNUSED_PARAMETER uno_Interface* /*pSrvManager*/, + SAL_UNUSED_PARAMETER uno_Interface* /*pRegistryKey*/ ) { Reference< XSingleComponentFactory > xFactory; diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index 5084edb37bb7..fd8213bad65e 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -102,13 +102,13 @@ namespace /* private */ { timestamp_ = t; } - void set_is_private(const string_t& /*character*/) + void set_is_private(SAL_UNUSED_PARAMETER const string_t& /*character*/) { is_private_ = true; } void set_groups(const string_t& character) { groups_.push_back(character); } - void set_nothing(const string_t& /*character*/) + void set_nothing(SAL_UNUSED_PARAMETER const string_t& /*character*/) {} bool has_groups() const diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx index 40cc26800317..45c317c2ebff 100644 --- a/sot/inc/sot/object.hxx +++ b/sot/inc/sot/object.hxx @@ -40,79 +40,79 @@ #define TEST_INVARIANT #ifdef TEST_INVARIANT #define SO2_DECL_INVARIANT() \ - virtual void TestObjRef( sal_Bool bFree ); \ - void TestMemberObjRef( sal_Bool bFree ); \ - virtual void TestInvariant( sal_Bool bPrint ); \ - void TestMemberInvariant( sal_Bool bPrint ); + virtual void TestObjRef(); \ + void TestMemberObjRef(); \ + virtual void TestInvariant(); \ + void TestMemberInvariant(); #define SO2_IMPL_INVARIANT(ClassName) \ -void ClassName::TestObjRef( sal_Bool bFree ) \ +void ClassName::TestObjRef() \ { \ - TestMemberObjRef( bFree ); \ + TestMemberObjRef(); \ } \ -void ClassName::TestInvariant( sal_Bool bPrint ) \ +void ClassName::TestInvariant() \ { \ - TestMemberInvariant( bPrint ); \ + TestMemberInvariant(); \ } #define SO2_IMPL_INVARIANT1(ClassName,Super1) \ -void ClassName::TestObjRef( sal_Bool bFree ) \ +void ClassName::TestObjRef() \ { \ - TestMemberObjRef( bFree ); \ - Super1::TestObjRef( bFree ); \ + TestMemberObjRef(); \ + Super1::TestObjRef(); \ } \ -void ClassName::TestInvariant( sal_Bool bPrint ) \ +void ClassName::TestInvariant() \ { \ - TestMemberInvariant( bPrint ); \ - Super1::TestInvariant( bPrint ); \ + TestMemberInvariant(); \ + Super1::TestInvariant(); \ } #define SO2_IMPL_INVARIANT2(ClassName,Super1,Super2) \ -void ClassName::TestObjRef( sal_Bool bFree ) \ +void ClassName::TestObjRef() \ { \ - TestMemberObjRef( bFree ); \ - Super1::TestObjRef( bFree ); \ - Super2::TestObjRef( bFree ); \ + TestMemberObjRef(); \ + Super1::TestObjRef(); \ + Super2::TestObjRef(); \ } \ -void ClassName::TestInvariant( sal_Bool bPrint ) \ +void ClassName::TestInvariant() \ { \ - TestMemberInvariant( bPrint ); \ - Super1::TestInvariant( bPrint ); \ - Super2::TestInvariant( bPrint ); \ + TestMemberInvariant(); \ + Super1::TestInvariant(); \ + Super2::TestInvariant(); \ } #define SO2_IMPL_INVARIANT3(ClassName,Super1,Super2,Super3) \ -void ClassName::TestObjRef( sal_Bool bFree ) \ +void ClassName::TestObjRef() \ { \ - TestMemberObjRef( bFree ); \ - Super1::TestObjRef( bFree ); \ - Super2::TestObjRef( bFree ); \ - Super3::TestObjRef( bFree ); \ + TestMemberObjRef(); \ + Super1::TestObjRef(); \ + Super2::TestObjRef(); \ + Super3::TestObjRef(); \ } \ -void ClassName::TestInvariant( sal_Bool bPrint ) \ +void ClassName::TestInvariant() \ { \ - TestMemberInvariant( bPrint ); \ - Super1::TestInvariant( bPrint ); \ - Super2::TestInvariant( bPrint ); \ - Super3::TestInvariant( bPrint ); \ + TestMemberInvariant(); \ + Super1::TestInvariant(); \ + Super2::TestInvariant(); \ + Super3::TestInvariant(); \ } #define SO2_IMPL_INVARIANT4(ClassName,Super1,Super2,Super3,Super4) \ -void ClassName::TestObjRef( sal_Bool bFree ) \ +void ClassName::TestObjRef() \ { \ - TestMemberObjRef( bFree ); \ - Super1::TestObjRef( bFree ); \ - Super2::TestObjRef( bFree ); \ - Super3::TestObjRef( bFree ); \ - Super4::TestObjRef( bFree ); \ + TestMemberObjRef(); \ + Super1::TestObjRef(); \ + Super2::TestObjRef(); \ + Super3::TestObjRef(); \ + Super4::TestObjRef(); \ } \ -void ClassName::TestInvariant( sal_Bool bPrint ) \ +void ClassName::TestInvariant() \ { \ - TestMemberInvariant( bPrint ); \ - Super1::TestInvariant( bPrint ); \ - Super2::TestInvariant( bPrint ); \ - Super3::TestInvariant( bPrint ); \ - Super4::TestInvariant( bPrint ); \ + TestMemberInvariant(); \ + Super1::TestInvariant(); \ + Super2::TestInvariant(); \ + Super3::TestInvariant(); \ + Super4::TestInvariant(); \ } #ifdef DBG_UTIL diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 1a7e80805ad9..830c6beaaf10 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -202,7 +202,7 @@ void SotFactory::TestInvariant() std::list<SotObject*>::iterator it; for( it = pSotData->aObjectList.begin(); it != pSotData->aObjectList.end(); ++it ) - (*it)->TestInvariant( sal_False ); + (*it)->TestInvariant(); #endif } diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index e29d3e6038bf..052657ee3a1a 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -110,9 +110,9 @@ void FileList::Assign( const SvDataCopyStream& rCopyStream ) * e.g. DropQueryFile */ -SvStream& operator<<( SvStream& rOStm, const FileList& /*rFileList*/ ) +SvStream& operator<<( SvStream& rOStm, SAL_UNUSED_PARAMETER const FileList& ) { - OSL_FAIL("Not implemented!"); + OSL_FAIL("TODO: Not implemented!"); return rOStm; } diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 8f24951486e4..5f20b4108a89 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -1285,11 +1285,7 @@ sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, sal_u // ----------------------------------------------------------------------------- -static sal_Bool CheckTransferableContext_Impl( const Reference< XTransferable >* pxTransferable, const SotAction_Impl& -#ifdef WNT -rEntry -#endif -) +static sal_Bool CheckTransferableContext_Impl( const Reference< XTransferable >* pxTransferable, const SotAction_Impl& rEntry ) { DataFlavor aFlavor; sal_Bool bRet = sal_True; @@ -1333,6 +1329,8 @@ rEntry } break; } +#else + (void) rEntry; // avoid warnings #endif } } diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 73b24b7a8b37..ac8e1287a431 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -56,9 +56,7 @@ SO2_IMPL_INVARIANT(SotObject) |* |* Beschreibung: *************************************************************************/ -void SotObject::TestMemberObjRef( sal_Bool /*bFree*/ ) -{ -} +void SotObject::TestMemberObjRef() {} /************************************************************************* |* SotObject::TestMemberObjRef() @@ -66,9 +64,7 @@ void SotObject::TestMemberObjRef( sal_Bool /*bFree*/ ) |* Beschreibung: *************************************************************************/ #ifdef TEST_INVARIANT -void SotObject::TestMemberInvariant( sal_Bool /*bPrint*/ ) -{ -} +void SotObject::TestMemberInvariant() {} #endif /************************************************************************* diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx index a9f2f909e225..48e0f7de515b 100644 --- a/sot/source/sdstor/stgcache.cxx +++ b/sot/source/sdstor/stgcache.cxx @@ -291,7 +291,7 @@ StgPage* StgCache::Copy( sal_Int32 nNew, sal_Int32 nOld ) // Flush the cache whose owner is given. NULL flushes all. -sal_Bool StgCache::Commit( StgDirEntry* ) +sal_Bool StgCache::Commit() { StgPage* p = pElem1; if( p ) do @@ -338,9 +338,6 @@ sal_Bool StgCache::Commit( StgDirEntry* ) return sal_True; } -void StgCache::Revert( StgDirEntry* ) -{} - // Set a stream void StgCache::SetStrm( SvStream* p, sal_Bool bMy ) diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx index 9b47cffed6c8..1c0ad82b67e6 100644 --- a/sot/source/sdstor/stgcache.hxx +++ b/sot/source/sdstor/stgcache.hxx @@ -87,8 +87,7 @@ public: StgPage* Find( sal_Int32 ); // find a cached page StgPage* Get( sal_Int32, sal_Bool ); // get a cached page StgPage* Copy( sal_Int32, sal_Int32=STG_FREE ); // copy a page - sal_Bool Commit( StgDirEntry* = NULL ); // flush all pages - void Revert( StgDirEntry* = NULL ); // revert dirty pages + sal_Bool Commit(); // flush all pages void Clear(); // clear the cache }; diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index 4f9ef4684c0a..7bdade90a935 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -769,7 +769,6 @@ StgDirStrm::StgDirStrm( StgIo& r ) // the TOC pages can be removed. pEntry = (StgDirEntry*) this; // just for a bit pattern SetupEntry( 0, pRoot ); - rIo.Revert( pEntry ); pEntry = NULL; } } diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx index 40b4cea23903..0c36268c9b26 100644 --- a/sot/source/sdstor/stgio.cxx +++ b/sot/source/sdstor/stgio.cxx @@ -126,7 +126,7 @@ sal_Bool StgIo::CommitAll() // Store the data (all streams and the TOC) if( pTOC->Store() ) { - if( Commit( NULL ) ) + if( Commit() ) { aHdr.SetDataFATStart( pDataFAT->GetStart() ); aHdr.SetDataFATSize( pDataFAT->GetPages() ); diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 9cf5a4f65a80..478f649da5af 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -70,14 +70,10 @@ SO2_IMPL_BASIC_CLASS1_DLL(SotStorageStream,SotStorageStreamFactory,SotObject, SO2_IMPL_INVARIANT(SotStorageStream) -void SotStorageStream::TestMemberObjRef( sal_Bool /*bFree*/ ) -{ -} +void SotStorageStream::TestMemberObjRef() {} #ifdef TEST_INVARIANT -void SotStorageStream::TestMemberInvariant( sal_Bool /*bPrint*/ ) -{ -} +void SotStorageStream::TestMemberInvariant() {} #endif /************************************************************************ @@ -448,14 +444,10 @@ SO2_IMPL_INVARIANT(SotStorage) |* |* Beschreibung *************************************************************************/ -void SotStorage::TestMemberObjRef( sal_Bool /*bFree*/ ) -{ -} +void SotStorage::TestMemberObjRef() {} #ifdef TEST_INVARIANT -void SotStorage::TestMemberInvariant( sal_Bool /*bPrint*/ ) -{ -} +void SotStorage::TestMemberInvariant() {} #endif /************************************************************************ diff --git a/sot/source/unoolestorage/register.cxx b/sot/source/unoolestorage/register.cxx index ecc86b3d32d4..f95cad693f88 100644 --- a/sot/source/unoolestorage/register.cxx +++ b/sot/source/unoolestorage/register.cxx @@ -39,7 +39,9 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL sot_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL sot_component_getFactory( + const sal_Char * pImplName, void * pServiceManager, + SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index da291d219a03..a385426f73ff 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -1380,7 +1380,8 @@ void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUSt namespace stoc_bootstrap { //************************************************************************* -Reference<XInterface> SAL_CALL NestedRegistry_CreateInstance( const Reference<XComponentContext>& ) +Reference<XInterface> SAL_CALL NestedRegistry_CreateInstance( + SAL_UNUSED_PARAMETER const Reference<XComponentContext>& ) throw(Exception) { Reference<XInterface> xRet; diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 1cb278df6bc8..aad88991bfaf 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2899,7 +2899,8 @@ Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Referen extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * ) + const sal_Char * pImplName, void * pServiceManager, + SAL_UNUSED_PARAMETER void * ) { void * pRet = 0; diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 2fbdac03cb92..55a42d5bd832 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -120,7 +120,8 @@ public: }; //================================================================================================== -static Reference<XInterface> SAL_CALL NamingService_Impl_create( const Reference<XComponentContext> & ) +static Reference<XInterface> SAL_CALL NamingService_Impl_create( + SAL_UNUSED_PARAMETER const Reference<XComponentContext> & ) { return *new NamingService_Impl(); } diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 1c6c5569f213..f1fcf6c264b3 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -481,7 +481,7 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames() //============================================================================== static Reference< XInterface > SAL_CALL proxyfac_create( - Reference< XComponentContext > const & ) + SAL_UNUSED_PARAMETER Reference< XComponentContext > const & ) throw (Exception) { Reference< XInterface > xRet; diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index d396e08f9a64..f09b204e19fb 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -1300,7 +1300,8 @@ void SimpleRegistry::mergeKey( namespace stoc_bootstrap { css::uno::Reference< css::uno::XInterface > SimpleRegistry_CreateInstance( - css::uno::Reference< css::uno::XComponentContext > const &) + SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > + const &) { return static_cast< cppu::OWeakObject * >(new SimpleRegistry); } diff --git a/stoc/source/tdmanager/tdmgr_check.cxx b/stoc/source/tdmanager/tdmgr_check.cxx index 32d8ca1651a7..99f341cd8e12 100644 --- a/stoc/source/tdmanager/tdmgr_check.cxx +++ b/stoc/source/tdmanager/tdmgr_check.cxx @@ -209,11 +209,11 @@ void checkRestParam( Reference<reflection::XParameter> const & xNewParam, typeError( OUSTR("Different ... parameters specified!"), context ); } -void checkRestParam( Reference<reflection::XMethodParameter> const &, - Reference<reflection::XMethodParameter> const &, - OUString const & ) -{ -} +void checkRestParam( + SAL_UNUSED_PARAMETER Reference<reflection::XMethodParameter> const &, + SAL_UNUSED_PARAMETER Reference<reflection::XMethodParameter> const &, + SAL_UNUSED_PARAMETER OUString const & ) +{} template<typename T> void checkParameters( Sequence< Reference<T> > const & newParams, diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index 859b2cff16bc..d19c8a3a0232 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -934,7 +934,7 @@ namespace stoc_services { //************************************************************************* Reference< XInterface > SAL_CALL TypeConverter_Impl_CreateInstance( - const Reference< XComponentContext > & ) + SAL_UNUSED_PARAMETER const Reference< XComponentContext > & ) throw( RuntimeException ) { static Reference< XInterface > s_ref( (OWeakObject *) new stoc_tcv::TypeConverter_Impl() ); diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx index 3f9601d2e4b6..1b42111140c1 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx @@ -234,7 +234,8 @@ css::uno::Reference< css::uri::XUriReference > Parser::parse( namespace stoc_services { namespace UriSchemeParser_vndDOTsunDOTstarDOTexpand { css::uno::Reference< css::uno::XInterface > create( - css::uno::Reference< css::uno::XComponentContext > const &) + SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > + const &) SAL_THROW((css::uno::Exception)) { //TODO: single instance diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index 882bc7e79947..690458d1869e 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -457,7 +457,8 @@ namespace stoc_services { namespace UriSchemeParser_vndDOTsunDOTstarDOTscript { css::uno::Reference< css::uno::XInterface > create( - css::uno::Reference< css::uno::XComponentContext > const &) + SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > + const &) SAL_THROW((css::uno::Exception)) { //TODO: single instance diff --git a/store/source/object.cxx b/store/source/object.cxx index 96029db4619b..316cb4e614cb 100644 --- a/store/source/object.cxx +++ b/store/source/object.cxx @@ -72,7 +72,7 @@ void* OStoreObject::operator new (size_t n) /* * operator delete. */ -void OStoreObject::operator delete (void *p, size_t) +void OStoreObject::operator delete (void *p) { rtl_freeMemory (p); } diff --git a/store/source/object.hxx b/store/source/object.hxx index 5f985f5b66af..6f30372fdac4 100644 --- a/store/source/object.hxx +++ b/store/source/object.hxx @@ -78,7 +78,7 @@ public: /** Allocation. */ static void* operator new (size_t n); - static void operator delete (void *p, size_t); + static void operator delete (void *p); /** IStoreHandle. */ diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index e2fe649f743b..9e7308936b3c 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -857,7 +857,7 @@ public: { return rtl_allocateMemory (sal_uInt32(n)); } - static void operator delete (void * p, size_t) SAL_THROW(()) + static void operator delete (void * p) SAL_THROW(()) { rtl_freeMemory (p); } diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx index 2bdd46b78833..fc76cbfb12c1 100644 --- a/store/source/storbios.cxx +++ b/store/source/storbios.cxx @@ -199,16 +199,16 @@ struct SuperBlockPage { return rtl_allocateMemory (sal::static_int_cast<sal_Size>(n)); } - static void operator delete (void * p, size_t) SAL_THROW(()) + static void operator delete (void * p) SAL_THROW(()) { rtl_freeMemory (p); } - static void * operator new (size_t, sal_uInt16 nPageSize) SAL_THROW(()) + static void * operator new (SAL_UNUSED_PARAMETER size_t, sal_uInt16 nPageSize) SAL_THROW(()) { return rtl_allocateZeroMemory (sal::static_int_cast<sal_Size>(nPageSize)); } - static void operator delete (void * p, sal_uInt16) SAL_THROW(()) + static void operator delete (void * p, SAL_UNUSED_PARAMETER sal_uInt16) SAL_THROW(()) { rtl_freeMemory (p); } @@ -422,7 +422,8 @@ OStorePageBIOS::Ace::~Ace() } int -SAL_CALL OStorePageBIOS::Ace::constructor (void * obj, void * /* arg */) +SAL_CALL OStorePageBIOS::Ace::constructor ( + void * obj, SAL_UNUSED_PARAMETER void * /* arg */) { Ace * ace = static_cast<Ace*>(obj); ace->m_next = ace->m_prev = ace; @@ -782,8 +783,7 @@ storeError OStorePageBIOS::acquirePage ( * releasePage. * Precond: initialized. */ -storeError OStorePageBIOS::releasePage ( - const OStorePageDescriptor& rDescr, storeAccessMode /* eMode */) +storeError OStorePageBIOS::releasePage (const OStorePageDescriptor& rDescr) { // Acquire exclusive access. osl::MutexGuard aGuard (m_aMutex); diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx index 74cfdc131584..bccbce4733ac 100644 --- a/store/source/storbios.hxx +++ b/store/source/storbios.hxx @@ -99,8 +99,7 @@ public: storeError acquirePage ( const OStorePageDescriptor& rDescr, storeAccessMode eMode); - storeError releasePage ( - const OStorePageDescriptor& rDescr, storeAccessMode eMode); + storeError releasePage (const OStorePageDescriptor& rDescr); sal_uInt32 getRefererCount (void); diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx index 433b616e0aeb..cb9c636bfa79 100644 --- a/store/source/stordir.cxx +++ b/store/source/stordir.cxx @@ -93,7 +93,7 @@ OStoreDirectory_Impl::~OStoreDirectory_Impl (void) if (m_xManager.is()) { if (m_aDescr.m_nAddr != STORE_PAGE_NULL) - m_xManager->releasePage (m_aDescr, store_AccessReadOnly); + m_xManager->releasePage (m_aDescr); } rtl_destroyTextToUnicodeConverter (m_hTextCvt); } diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx index 44c14f19cdae..e2ef5bc4caf0 100644 --- a/store/source/stordir.hxx +++ b/store/source/stordir.hxx @@ -114,7 +114,7 @@ private: }; template<> inline OStoreDirectory_Impl* -SAL_CALL query (IStoreHandle *pHandle, OStoreDirectory_Impl*) +SAL_CALL query (IStoreHandle *pHandle, SAL_UNUSED_PARAMETER OStoreDirectory_Impl*) { if (pHandle && pHandle->isKindOf (OStoreDirectory_Impl::m_nTypeId)) { diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx index cb99d1fa197b..7cedac4dfd0c 100644 --- a/store/source/storlckb.cxx +++ b/store/source/storlckb.cxx @@ -72,9 +72,9 @@ OStoreLockBytes::~OStoreLockBytes (void) { OStorePageDescriptor aDescr (m_xNode->m_aDescr); if (m_bWriteable) - m_xManager->releasePage (aDescr, store_AccessReadWrite); + m_xManager->releasePage (aDescr); else - m_xManager->releasePage (aDescr, store_AccessReadOnly); + m_xManager->releasePage (aDescr); } } } diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx index 352095b72bc0..10013af71e83 100644 --- a/store/source/storlckb.hxx +++ b/store/source/storlckb.hxx @@ -150,7 +150,7 @@ private: }; template<> inline OStoreLockBytes* -SAL_CALL query (IStoreHandle *pHandle, OStoreLockBytes*) +SAL_CALL query (IStoreHandle *pHandle, SAL_UNUSED_PARAMETER OStoreLockBytes*) { if (pHandle && pHandle->isKindOf (OStoreLockBytes::m_nTypeId)) { diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx index 6804b622117a..c62cd2a8a927 100644 --- a/store/source/storpage.cxx +++ b/store/source/storpage.cxx @@ -783,7 +783,7 @@ storeError OStorePageManager::remove (const OStorePageKey &rKey) } // Release page write access. - eErrCode = base::releasePage (aDescr, store_AccessReadWrite); + eErrCode = base::releasePage (aDescr); // Release and free directory page. eErrCode = base::free (aPage.location()); diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx index 80841a618e72..c1de9ea2d717 100644 --- a/store/source/storpage.hxx +++ b/store/source/storpage.hxx @@ -205,7 +205,7 @@ inline sal_Bool OStorePageManager::isValid (void) const } template<> inline OStorePageManager* -SAL_CALL query (IStoreHandle *pHandle, OStorePageManager*) +SAL_CALL query (IStoreHandle *pHandle, SAL_UNUSED_PARAMETER OStorePageManager*) { if (pHandle && pHandle->isKindOf (OStorePageManager::m_nTypeId)) { 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 ) { } diff --git a/svtools/inc/svtools/svxbox.hxx b/svtools/inc/svtools/svxbox.hxx index 0759e212bb9f..81d8ff90e5db 100644 --- a/svtools/inc/svtools/svxbox.hxx +++ b/svtools/inc/svtools/svxbox.hxx @@ -41,7 +41,7 @@ class SvxBoxEntry; class SvxListBase; -SV_DECL_PTRARR( SvxEntryLst, SvxBoxEntry*, 10, 10 ) +SV_DECL_PTRARR( SvxEntryLst, SvxBoxEntry*, 10 ) // class SvxBoxEntry ----------------------------------------------------- diff --git a/svtools/source/edit/textdat2.hxx b/svtools/source/edit/textdat2.hxx index 579810ce37ab..945fd2336ca2 100644 --- a/svtools/source/edit/textdat2.hxx +++ b/svtools/source/edit/textdat2.hxx @@ -90,7 +90,7 @@ public: typedef TETextPortion* TextPortionPtr; -SV_DECL_PTRARR( TextPortionArray, TextPortionPtr, 0, 8 ) +SV_DECL_PTRARR( TextPortionArray, TextPortionPtr, 0 ) class TETextPortionList : public TextPortionArray { @@ -117,7 +117,7 @@ struct TEWritingDirectionInfo } }; -SV_DECL_VARARR( TEWritingDirectionInfos, TEWritingDirectionInfo, 0, 4 ) +SV_DECL_VARARR( TEWritingDirectionInfos, TEWritingDirectionInfo, 0 ) class TextLine { @@ -178,7 +178,7 @@ public: }; typedef TextLine* TextLinePtr; - SV_DECL_PTRARR_DEL( TextLines, TextLinePtr, 1, 4 ) + SV_DECL_PTRARR_DEL( TextLines, TextLinePtr, 1 ) inline sal_Bool TextLine::operator == ( const TextLine& rLine ) const { diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx index f3538908342a..eb738d1880cb 100644 --- a/svtools/source/edit/textdoc.hxx +++ b/svtools/source/edit/textdoc.hxx @@ -36,7 +36,7 @@ #include <tools/string.hxx> typedef TextCharAttrib* TextCharAttribPtr; -SV_DECL_PTRARR_DEL( TextCharAttribs, TextCharAttribPtr, 0, 4 ) +SV_DECL_PTRARR_DEL( TextCharAttribs, TextCharAttribPtr, 0 ) class TextCharAttribList : private TextCharAttribs { diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index a9f886592142..5a6f7b81af57 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -69,10 +69,10 @@ using namespace ::com::sun::star::uno; using namespace ::rtl; typedef TextView* TextViewPtr; -SV_DECL_PTRARR( TextViews, TextViewPtr, 0, 1 ) +SV_DECL_PTRARR( TextViews, TextViewPtr, 0 ) // SV_IMPL_PTRARR( TextViews, TextViewPtr ); -SV_DECL_VARARR_SORT( TESortedPositions, sal_uLong, 16, 8 ) +SV_DECL_VARARR_SORT( TESortedPositions, sal_uLong, 16 ) SV_IMPL_VARARR_SORT( TESortedPositions, sal_uLong ) #define RESDIFF 10 diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 7b2df1b5191d..4ff4af2a6bfb 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -56,7 +56,7 @@ public: ~SfxItemDesruptor_Impl(); }; -SV_DECL_PTRARR( SfxItemDesruptorList_Impl, SfxItemDesruptor_Impl*, 4, 4 ) +SV_DECL_PTRARR( SfxItemDesruptorList_Impl, SfxItemDesruptor_Impl*, 4 ) // ------------------------------------------------------------------------ SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ): diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index ffa8bf55f157..e5d284405cc1 100644 --- a/svx/inc/svx/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -64,7 +64,7 @@ struct SearchAttrItem // class SearchAttrItemList ---------------------------------------------- -SV_DECL_VARARR_VISIBILITY(SrchAttrItemList, SearchAttrItem, 8, 8, SVX_DLLPUBLIC) +SV_DECL_VARARR_VISIBILITY(SrchAttrItemList, SearchAttrItem, 8, SVX_DLLPUBLIC) class SVX_DLLPUBLIC SearchAttrItemList : private SrchAttrItemList { diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 4e733d52f307..fb2c0991d37b 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -229,7 +229,7 @@ public: // FmNavRequestSelectHint - jemand teilt dem NavigatorTree mit, dass er bestimmte Eintraege selektieren soll typedef FmEntryData* FmEntryDataPtr; -SV_DECL_PTRARR_SORT( FmEntryDataArray, FmEntryDataPtr, 16, 16 ) +SV_DECL_PTRARR_SORT( FmEntryDataArray, FmEntryDataPtr, 16 ) class FmNavRequestSelectHint : public SfxHint { @@ -420,7 +420,7 @@ namespace svxform //======================================================================== typedef SvLBoxEntry* SvLBoxEntryPtr; - SV_DECL_PTRARR_SORT( SvLBoxEntrySortedArray, SvLBoxEntryPtr, 16, 16 ) + SV_DECL_PTRARR_SORT( SvLBoxEntrySortedArray, SvLBoxEntryPtr, 16 ) class NavigatorTree : public SvTreeListBox, public SfxListener { diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 152997a60893..e2313e23d14f 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -75,7 +75,7 @@ #include <set> #include <vector> -SV_DECL_PTRARR(SdrObjArray, SdrObject*, 32, 16) +SV_DECL_PTRARR(SdrObjArray, SdrObject*, 32) // SV_DECL_OBJARR(FmFormArray, ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>, 32, 16); DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > ,FmFormArray); @@ -584,7 +584,7 @@ public: }; // ======================================================================== -SV_DECL_PTRARR_DEL(StatusForwarderArray, SfxStatusForwarder*, 16, 0) +SV_DECL_PTRARR_DEL(StatusForwarderArray, SfxStatusForwarder*, 16) class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl { protected: diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index cc2dfe34cc99..485c5f5e6158 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -241,7 +241,7 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/ if( pIStm ) { - pIStm->SetStreamCharSet(GetSOLoadTextEncoding(eCharSet, (sal_uInt16)pIStm->GetVersion())); + pIStm->SetStreamCharSet(GetSOLoadTextEncoding(eCharSet)); char cRTF[5]; cRTF[4] = 0; diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index 619af8bf3186..68f45bb7e430 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -177,7 +177,7 @@ Reference< XMultiServiceFactory > createApplicationServiceManager() // --- class EditApp ------------------------------------------------- -SV_DECL_PTRARR_DEL( StringList, String*, 0, 4 ); +SV_DECL_PTRARR_DEL( StringList, String*, 0 ); SV_IMPL_PTRARR( StringList, String* ); StringList aSimpleHistory; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 3c16000c5f89..47da13e48fea 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -145,7 +145,7 @@ struct SwDSParam : public SwDBData } }; typedef SwDSParam* SwDSParamPtr; -SV_DECL_PTRARR_DEL(SwDSParamArr, SwDSParamPtr, 0, 5) +SV_DECL_PTRARR_DEL(SwDSParamArr, SwDSParamPtr, 0) struct SwMergeDescriptor { diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index edf59c301851..8fb1c1b376a6 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -241,7 +241,7 @@ namespace sfx2 { // PageDescriptor-interface, Array because of inlines. typedef SwPageDesc* SwPageDescPtr; -SV_DECL_PTRARR_DEL( SwPageDescs, SwPageDescPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( SwPageDescs, SwPageDescPtr, 4 ) // forward declaration void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem ); diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 94374909b8e0..ab10e5bfe189 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -49,42 +49,41 @@ namespace com { namespace sun { namespace star { namespace i18n { #include <svl/svarray.hxx> typedef SwFieldType* SwFldTypePtr; -#define GROW_FLDTYPES 16 // PageDescriptor-interface // typedef SwPageDesc * SwPageDescPtr; -// SV_DECL_PTRARR_DEL(SwPageDescs, SwPageDescPtr,1,1); +// SV_DECL_PTRARR_DEL(SwPageDescs, SwPageDescPtr,1); typedef SwFrmFmt* SwFrmFmtPtr; -SV_DECL_PTRARR_DEL(SwFrmFmts,SwFrmFmtPtr,4,4) +SV_DECL_PTRARR_DEL(SwFrmFmts,SwFrmFmtPtr,4) // Specific frame formats (frames, DrawObjects). -SV_DECL_PTRARR_DEL(SwSpzFrmFmts,SwFrmFmtPtr,0,4) +SV_DECL_PTRARR_DEL(SwSpzFrmFmts,SwFrmFmtPtr,0) typedef SwCharFmt* SwCharFmtPtr; -SV_DECL_PTRARR_DEL(SwCharFmts,SwCharFmtPtr,4,4) +SV_DECL_PTRARR_DEL(SwCharFmts,SwCharFmtPtr,4) -SV_DECL_PTRARR_DEL( SwFldTypes, SwFldTypePtr, INIT_FLDTYPES, GROW_FLDTYPES ) +SV_DECL_PTRARR_DEL( SwFldTypes, SwFldTypePtr, INIT_FLDTYPES ) typedef SwTOXType* SwTOXTypePtr; -SV_DECL_PTRARR_DEL( SwTOXTypes, SwTOXTypePtr, 0, 1 ) +SV_DECL_PTRARR_DEL( SwTOXTypes, SwTOXTypePtr, 0 ) // Array of Undo-history. typedef SwSectionFmt* SwSectionFmtPtr; -SV_DECL_PTRARR_DEL(SwSectionFmts,SwSectionFmtPtr,0,4) +SV_DECL_PTRARR_DEL(SwSectionFmts,SwSectionFmtPtr,0) typedef SwNumRule* SwNumRulePtr; -SV_DECL_PTRARR_DEL_VISIBILITY( SwNumRuleTbl, SwNumRulePtr, 0, 5, SW_DLLPUBLIC ) +SV_DECL_PTRARR_DEL_VISIBILITY( SwNumRuleTbl, SwNumRulePtr, 0, SW_DLLPUBLIC ) typedef SwRedline* SwRedlinePtr; -SV_DECL_PTRARR_SORT_DEL( _SwRedlineTbl, SwRedlinePtr, 0, 16 ) +SV_DECL_PTRARR_SORT_DEL( _SwRedlineTbl, SwRedlinePtr, 0 ) class SwRedlineTbl : private _SwRedlineTbl { public: - SwRedlineTbl( sal_uInt8 nSize = 0, sal_uInt8 nG = 16 ) - : _SwRedlineTbl( nSize, nG ) {} + SwRedlineTbl( sal_uInt8 nSize = 0 ) + : _SwRedlineTbl( nSize ) {} ~SwRedlineTbl() {} sal_Bool SavePtrInArr( SwRedlinePtr p ) { return _SwRedlineTbl::Insert( p ); } @@ -114,10 +113,10 @@ public: }; typedef SwUnoCrsr* SwUnoCrsrPtr; -SV_DECL_PTRARR_DEL( SwUnoCrsrTbl, SwUnoCrsrPtr, 0, 4 ) +SV_DECL_PTRARR_DEL( SwUnoCrsrTbl, SwUnoCrsrPtr, 0 ) typedef SwOLENode* SwOLENodePtr; -SV_DECL_PTRARR(SwOLENodes,SwOLENodePtr,16,16) +SV_DECL_PTRARR(SwOLENodes,SwOLENodePtr,16) #endif //_DOCARY_HXX diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx index ef46ae19bb42..3ebf359d8814 100644 --- a/sw/inc/edglbldc.hxx +++ b/sw/inc/edglbldc.hxx @@ -71,7 +71,7 @@ public: typedef SwGlblDocContent* SwGlblDocContentPtr; -SV_DECL_PTRARR_SORT_DEL( SwGlblDocContents, SwGlblDocContentPtr, 10, 10 ) +SV_DECL_PTRARR_SORT_DEL( SwGlblDocContents, SwGlblDocContentPtr, 10 ) diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx index 8fc4f8fe2f20..18c21067f14a 100644 --- a/sw/inc/edimp.hxx +++ b/sw/inc/edimp.hxx @@ -62,7 +62,7 @@ struct SwPamRange { return nStart < rRg.nStart ? sal_True : sal_False; } }; -SV_DECL_VARARR_SORT( _SwPamRanges, SwPamRange, 0, 1 ) +SV_DECL_VARARR_SORT( _SwPamRanges, SwPamRange, 0 ) class SwPamRanges : private _SwPamRanges { diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index f374987dba9d..a16330a8f6f4 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -139,7 +139,7 @@ struct SwGetINetAttr : sText( rTxt ), rINetAttr( rAttr ) {} }; -SV_DECL_PTRARR_DEL( SwGetINetAttrs, SwGetINetAttr*, 0, 5 ) +SV_DECL_PTRARR_DEL( SwGetINetAttrs, SwGetINetAttr*, 0 ) // Types of forms of content. #define CNT_TXT 0x0001 diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index a565244b89ba..d3679e84ef18 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -58,12 +58,12 @@ struct _SeqFldLstElem : sDlgEntry( rStr ), nSeqNo( nNo ) {} }; -SV_DECL_PTRARR_DEL( _SwSeqFldList, _SeqFldLstElem*, 10, 10 ) +SV_DECL_PTRARR_DEL( _SwSeqFldList, _SeqFldLstElem*, 10 ) class SW_DLLPUBLIC SwSeqFldList : public _SwSeqFldList { public: - SwSeqFldList() : _SwSeqFldList( 10, 10 ) {} + SwSeqFldList() : _SwSeqFldList( 10 ) {} sal_Bool InsertSort( _SeqFldLstElem* ); sal_Bool SeekEntry( const _SeqFldLstElem& , sal_uInt16* pPos = 0 ); diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx index 9640afb8a675..5e88a69cd1c7 100644 --- a/sw/inc/flypos.hxx +++ b/sw/inc/flypos.hxx @@ -56,7 +56,7 @@ public: }; typedef SwPosFlyFrm* SwPosFlyFrmPtr; -SV_DECL_PTRARR_SORT_VISIBILITY( SwPosFlyFrms, SwPosFlyFrmPtr, 0, 40, SW_DLLPUBLIC ) +SV_DECL_PTRARR_SORT_VISIBILITY( SwPosFlyFrms, SwPosFlyFrmPtr, 0, SW_DLLPUBLIC ) #endif // _FLYPOS_HXX diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index c0cdd0c7279f..7e1cc64eb8e2 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -66,7 +66,7 @@ public: }; typedef SwColumn* SwColumnPtr; -SV_DECL_PTRARR_DEL( SwColumns, SwColumnPtr, 0, 2 ) +SV_DECL_PTRARR_DEL( SwColumns, SwColumnPtr, 0 ) enum SwColLineAdj { diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 95b4af9faf41..16db7c64f1b9 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -154,7 +154,7 @@ public: }; typedef SwTxtFmtColl* SwTxtFmtCollPtr; -SV_DECL_PTRARR(SwTxtFmtColls,SwTxtFmtCollPtr,2,4) +SV_DECL_PTRARR(SwTxtFmtColls,SwTxtFmtCollPtr,2) class SwGrfFmtColl: public SwFmtColl { @@ -177,7 +177,7 @@ public: }; typedef SwGrfFmtColl* SwGrfFmtCollPtr; -SV_DECL_PTRARR(SwGrfFmtColls,SwGrfFmtCollPtr,2,4) +SV_DECL_PTRARR(SwGrfFmtColls,SwGrfFmtCollPtr,2) // FEATURE::CONDCOLL // Conditional styles. @@ -237,7 +237,7 @@ public: }; typedef SwCollCondition* SwCollConditionPtr; -SV_DECL_PTRARR_DEL( SwFmtCollConditions, SwCollConditionPtr, 0, 5 ) +SV_DECL_PTRARR_DEL( SwFmtCollConditions, SwCollConditionPtr, 0 ) class SW_DLLPUBLIC SwConditionTxtFmtColl : public SwTxtFmtColl { diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx index d3ae3c8ca764..055d6d54921d 100644 --- a/sw/inc/ftnidx.hxx +++ b/sw/inc/ftnidx.hxx @@ -42,7 +42,7 @@ class SwSectionNode; typedef SwTxtFtn* SwTxtFtnPtr; -SV_DECL_PTRARR_SORT( _SwFtnIdxs, SwTxtFtnPtr, 0, 10 ) +SV_DECL_PTRARR_SORT( _SwFtnIdxs, SwTxtFtnPtr, 0 ) class SwFtnIdxs : public _SwFtnIdxs { @@ -62,7 +62,7 @@ class SwUpdFtnEndNtAtEnd std::vector<sal_uInt16> aFtnNums, aEndNums; public: - SwUpdFtnEndNtAtEnd() : aFtnSects( 0, 4 ), aEndSects( 0, 4 ) {} + SwUpdFtnEndNtAtEnd() : aFtnSects( 0 ), aEndSects( 0 ) {} static const SwSectionNode* FindSectNdWithEndAttr( const SwTxtFtn& rTxtFtn ); diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index b1fb71325b07..37bcc839aca7 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -44,7 +44,7 @@ class SwModuleOptions; class InsCaptionOpt; typedef InsCaptionOpt* InsCaptionOptPtr; -SV_DECL_PTRARR_SORT_DEL(InsCapOptArr, InsCaptionOptPtr, 0, 5) +SV_DECL_PTRARR_SORT_DEL(InsCapOptArr, InsCaptionOptPtr, 0) class InsCaptionOptArr : public InsCapOptArr { diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index d560637b4ae5..22c52ee337be 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -84,7 +84,7 @@ struct SwPosition; typedef SwNode * SwNodePtr; typedef sal_Bool (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs ); -SV_DECL_PTRARR_SORT( SwOutlineNodes, SwNodePtr, 0, 10 ) +SV_DECL_PTRARR_SORT( SwOutlineNodes, SwNodePtr, 0 ) class SW_DLLPUBLIC SwNodes : private BigPtrArray diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index 8496aa015e91..6f0d896f7e46 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -72,8 +72,8 @@ MakeRedlineTxtAttr( SwDoc & rDoc, SfxPoolItem& rAttr ); // Class SwpHtStart/End -SV_DECL_PTRARR_SORT(SwpHtStart,SwTxtAttr*,1,1) -SV_DECL_PTRARR_SORT(SwpHtEnd,SwTxtAttr*,1,1) +SV_DECL_PTRARR_SORT(SwpHtStart,SwTxtAttr*,1) +SV_DECL_PTRARR_SORT(SwpHtEnd,SwTxtAttr*,1) // Class SwpHintsArr diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx index baf5faf6cdbf..414d57c8e80d 100644 --- a/sw/inc/rubylist.hxx +++ b/sw/inc/rubylist.hxx @@ -49,7 +49,7 @@ public: }; typedef SwRubyListEntry* SwRubyListEntryPtr; -SV_DECL_PTRARR_DEL( SwRubyList, SwRubyListEntryPtr, 0, 32 ) +SV_DECL_PTRARR_DEL( SwRubyList, SwRubyListEntryPtr, 0 ) #endif //_RUBYLIST_HXX diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 9a6452a424fd..89bb7423705c 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -59,7 +59,7 @@ class SwTOXBase; SV_DECL_REF( SwServerObject ) #endif -SV_DECL_PTRARR( SwSections, SwSection*, 0, 4 ) +SV_DECL_PTRARR( SwSections, SwSection*, 0 ) enum SectionType { CONTENT_SECTION, TOX_HEADER_SECTION, diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx index 6436e0feaffa..35e5982d52a3 100644 --- a/sw/inc/sortopt.hxx +++ b/sw/inc/sortopt.hxx @@ -49,7 +49,7 @@ struct SW_DLLPUBLIC SwSortKey sal_Bool bIsNumeric; }; -SV_DECL_PTRARR(SwSortKeys, SwSortKey*, 3, 1) +SV_DECL_PTRARR(SwSortKeys, SwSortKey*, 3) struct SW_DLLPUBLIC SwSortOptions { diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx index 392b9086050e..b0f63f805e74 100644 --- a/sw/inc/swregion.hxx +++ b/sw/inc/swregion.hxx @@ -32,7 +32,7 @@ #include "swrect.hxx" -SV_DECL_VARARR( SwRects, SwRect, 20, 8 ) +SV_DECL_VARARR( SwRects, SwRect, 20 ) class SwRegionRects : public SwRects { @@ -41,8 +41,7 @@ class SwRegionRects : public SwRects inline void InsertRect( const SwRect &rRect, const sal_uInt16 nPos, sal_Bool &rDel); public: - SwRegionRects( const SwRect& rStartRect, sal_uInt16 nInit = 20, - sal_uInt16 nGrow = 8 ); + SwRegionRects( const SwRect& rStartRect, sal_uInt16 nInit = 20 ); // For punching from aOrigin. void operator-=( const SwRect& rRect ); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index fb1d253b3879..e97de4260cee 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -72,13 +72,13 @@ struct Parm; SV_DECL_REF( SwServerObject ) #endif -SV_DECL_PTRARR_DEL(SwTableLines, SwTableLine*, 10, 20) -SV_DECL_PTRARR_DEL(SwTableBoxes, SwTableBox*, 25, 50) +SV_DECL_PTRARR_DEL(SwTableLines, SwTableLine*, 10) +SV_DECL_PTRARR_DEL(SwTableBoxes, SwTableBox*, 25) // Save content-bearing box-pointers additionally in a sorted array // (for calculation in table). typedef SwTableBox* SwTableBoxPtr; -SV_DECL_PTRARR_SORT( SwTableSortBoxes, SwTableBoxPtr, 25, 50 ) +SV_DECL_PTRARR_SORT( SwTableSortBoxes, SwTableBoxPtr, 25 ) typedef SwTableLine* SwTableLinePtr; class SW_DLLPUBLIC SwTable: public SwClient //Client of FrmFmt. diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 574280a652f3..6ab318a27439 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -245,7 +245,7 @@ public: }; typedef SwTableAutoFmt* SwTableAutoFmtPtr ; -SV_DECL_PTRARR_DEL( _SwTableAutoFmtTbl, SwTableAutoFmtPtr, 1, 5 ) +SV_DECL_PTRARR_DEL( _SwTableAutoFmtTbl, SwTableAutoFmtPtr, 1 ) class SW_DLLPUBLIC SwTableAutoFmtTbl : public _SwTableAutoFmtTbl { diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 668988aff351..5ecc65b8df12 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -49,7 +49,7 @@ class SwTable; class SwUndoTblMerge; class SwCellFrm; -SV_DECL_PTRARR( SwCellFrms, SwCellFrm*, 16, 16 ) +SV_DECL_PTRARR( SwCellFrms, SwCellFrm*, 16 ) class SwSelBoxes : private std::map<sal_uLong, SwTableBox*> @@ -128,8 +128,8 @@ sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); sal_Bool HasProtectedCells( const SwSelBoxes& rBoxes ); // Check if selection is balanced. -SV_DECL_PTRARR( SwChartBoxes, SwTableBoxPtr, 16, 16) -SV_DECL_PTRARR_DEL( SwChartLines, SwChartBoxes*, 25, 50) +SV_DECL_PTRARR( SwChartBoxes, SwTableBoxPtr, 16) +SV_DECL_PTRARR_DEL( SwChartLines, SwChartBoxes*, 25 ) sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd, SwChartLines* pGetCLines = 0 ); @@ -174,7 +174,7 @@ public: SwTabFrm *GetTable() { return pTable; } }; -SV_DECL_PTRARR_DEL( SwSelUnions, SwSelUnion*, 10, 20 ) +SV_DECL_PTRARR_DEL( SwSelUnions, SwSelUnion*, 10 ) // Gets the tables involved in a table selection and the union-rectangles of the selections // - also for split tables. @@ -192,8 +192,8 @@ void MakeSelUnions( SwSelUnions&, const SwLayoutFrm *pStart, class _FndBox; class _FndLine; -SV_DECL_PTRARR_DEL( _FndBoxes, _FndBox*, 10, 20 ) -SV_DECL_PTRARR_DEL( _FndLines, _FndLine*,10, 20 ) +SV_DECL_PTRARR_DEL( _FndBoxes, _FndBox*, 10 ) +SV_DECL_PTRARR_DEL( _FndLines, _FndLine*,10 ) class _FndBox { diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 1729cb93945d..171ce842f6a2 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -57,7 +57,7 @@ class SwTOXMark; class SwTxtTOXMark; class SwDoc; -SV_DECL_PTRARR(SwTOXMarks, SwTOXMark*, 0, 10) +SV_DECL_PTRARR(SwTOXMarks, SwTOXMark*, 0) /*-------------------------------------------------------------------- Description: Entry of content index, alphabetical index or user defined index diff --git a/sw/inc/unoevtlstnr.hxx b/sw/inc/unoevtlstnr.hxx index fff19f686126..8db97ebe2ec6 100644 --- a/sw/inc/unoevtlstnr.hxx +++ b/sw/inc/unoevtlstnr.hxx @@ -41,7 +41,7 @@ namespace com{namespace sun{namespace star{ // Managing the EventListeners. typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > * XEventListenerPtr; -SV_DECL_PTRARR(SwEvtLstnrArray, XEventListenerPtr, 4, 4) +SV_DECL_PTRARR(SwEvtLstnrArray, XEventListenerPtr, 4) class SwEventListenerContainer { diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 42d646f26b0a..5aef8c46e7c5 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -134,7 +134,7 @@ class SwRenderData; class ViewShell; typedef UnoActionContext* UnoActionContextPtr; -SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4) +SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4) /****************************************************************************** diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 1eebe328022b..78e296047a69 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -90,12 +90,12 @@ void SwCache::Check() |*************************************************************************/ -SwCache::SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize +SwCache::SwCache( const sal_uInt16 nInitSize #ifdef DBG_UTIL , const rtl::OString &rNm #endif ) : - SwCacheObjArr( (sal_uInt8)nInitSize, (sal_uInt8)nGrowSize ), + SwCacheObjArr( (sal_uInt8)nInitSize ), pRealFirst( 0 ), pFirst( 0 ), pLast( 0 ), diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx index e6c423cb725c..89b87e292a9c 100644 --- a/sw/source/core/bastyp/swregion.cxx +++ b/sw/source/core/bastyp/swregion.cxx @@ -38,9 +38,8 @@ SV_IMPL_VARARR( SwRects, SwRect ); |* SwRegionRects::SwRegionRects() |*************************************************************************/ -SwRegionRects::SwRegionRects( const SwRect &rStartRect, sal_uInt16 nInit, - sal_uInt16 nGrow ) : - SwRects( (sal_uInt8)nInit, (sal_uInt8)nGrow ), +SwRegionRects::SwRegionRects( const SwRect &rStartRect, sal_uInt16 nInit ) : + SwRects( (sal_uInt8)nInit ), aOrigin( rStartRect ) { Insert( aOrigin, 0 ); diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index e88eda064ea6..2febc4b23ee0 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; -SV_DECL_PTRARR_SORT( SwpFmts, SwFmt*, 0, 4 ) +SV_DECL_PTRARR_SORT( SwpFmts, SwFmt*, 0 ) SV_IMPL_PTRARR_SORT( SwpFmts, SwFmt* ) // Sonderbehandlung fuer SvxFontItem, nur den Namen vergleichen: diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index c9d3aab4716e..79c563c12664 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -228,7 +228,7 @@ sal_Bool SwAutoCompleteString::RemoveDocument(const SwDoc& rDoc) } SwAutoCompleteWord::SwAutoCompleteWord( sal_uInt16 nWords, sal_uInt16 nMWrdLen ) - : aWordLst( 0, 255 ), aLRULst( 0, 255 ), + : aWordLst( 0 ), aLRULst( 0 ), pImpl(new SwAutoCompleteWord_Impl(*this)), nMaxCount( nWords ), nMinWrdLen( nMWrdLen ), diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 2ff6e81c2dd8..26a2ad86f9f6 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -161,7 +161,7 @@ struct _SaveRedline } }; -SV_DECL_PTRARR_DEL( _SaveRedlines, _SaveRedline*, 0, 4 ) +SV_DECL_PTRARR_DEL( _SaveRedlines, _SaveRedline*, 0 ) SV_IMPL_VARARR( _SaveFlyArr, _SaveFly ) SV_IMPL_PTRARR( _SaveRedlines, _SaveRedline* ) @@ -677,7 +677,7 @@ _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx { if( !pSavArr ) { - pSavArr = new SvPtrarr( 2, 2 ); + pSavArr = new SvPtrarr( 2 ); pSavIdx = new SwNodeIndex( rInsIdx, -1 ); } void* p = (void*)pEnd; @@ -881,7 +881,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags ) _SaveFlyInRange( rPaM, rPos.nNode, aSaveFlyArr, 0 != ( DOC_MOVEALLFLYS & eMvFlags ) ); // save redlines (if DOC_MOVEREDLINES is used) - _SaveRedlines aSaveRedl( 0, 4 ); + _SaveRedlines aSaveRedl( 0 ); if( DOC_MOVEREDLINES & eMvFlags && GetRedlineTbl().Count() ) { lcl_SaveRedlines( rPaM, aSaveRedl ); @@ -1130,8 +1130,8 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos, GetFtnIdxs(), aTmpFntIdx ); } - _SaveRedlines aSaveRedl( 0, 4 ); - SvPtrarr aSavRedlInsPosArr( 0, 4 ); + _SaveRedlines aSaveRedl( 0 ); + SvPtrarr aSavRedlInsPosArr( 0 ); if( DOC_MOVEREDLINES & eMvFlags && GetRedlineTbl().Count() ) { lcl_SaveRedlines( rRange, aSaveRedl ); diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index cb7aa3780f37..69a8a045b93d 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2168,7 +2168,7 @@ void SwDocUpdtFld::InsDelFldInFldLst( sal_Bool bIns, const SwTxtFld& rFld ) { if( !bIns ) // if list is present and deleted return; // don't do a thing - pFldSortLst = new _SetGetExpFlds( 64, 16 ); + pFldSortLst = new _SetGetExpFlds( 64 ); } if( bIns ) // insert anew: @@ -2195,7 +2195,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) { // new version: walk all fields of the attribute pool delete pFldSortLst; - pFldSortLst = new _SetGetExpFlds( 64, 16 ); + pFldSortLst = new _SetGetExpFlds( 64 ); /// consider and unhide sections /// with hide condition, only in mode GETFLD_ALL (<eGetMode == GETFLD_ALL>) diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index bc7c6a9095d7..be89526e3047 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -176,7 +176,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c // If it isn't a OutlineNumbering, then use an own array and collect the Nodes. if( pSplitColl->GetAttrOutlineLevel() == 0 )//<-end,zhaojianwei, 0814 { - pOutlNds = new SwOutlineNodes( 8, 8 ); + pOutlNds = new SwOutlineNodes( 8 ); SwIterator<SwTxtNode,SwFmtColl> aIter( *pSplitColl ); for( SwTxtNode* pTNd = aIter.First(); pTNd; pTNd = aIter.Next() ) if( pTNd->GetNodes().IsDocNodes() ) diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index fb78a4ff1f01..17264ca8f92d 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -2048,7 +2048,7 @@ void SwDoc::SetAllUniqueFlyNames() if( 255 < ( n = GetSpzFrmFmts()->Count() )) n = 255; - SwSpzFrmFmts aArr( (sal_Int8)n, 10 ); + SwSpzFrmFmts aArr( (sal_Int8)n ); SwFrmFmtPtr pFlyFmt; sal_Bool bLoadedFlag = sal_True; // something for the Layout diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 21194b148fe3..d3e1ad526c61 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -252,7 +252,7 @@ SwDoc::SwDoc() maListStyleLists(), pRedlineTbl( new SwRedlineTbl ), pAutoFmtRedlnComment( 0 ), - pUnoCrsrTbl( new SwUnoCrsrTbl( 0, 16 ) ), + pUnoCrsrTbl( new SwUnoCrsrTbl( 0 ) ), pPgPViewPrtData( 0 ), pExtInputRing( 0 ), pLayouter( 0 ), diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 243964c3474f..ae671ba0e066 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -3547,7 +3547,7 @@ void SwRedline::MoveFromSection() { SwDoc* pDoc = GetDoc(); const SwRedlineTbl& rTbl = pDoc->GetRedlineTbl(); - SvPtrarr aBeforeArr( 16, 16 ), aBehindArr( 16, 16 ); + SvPtrarr aBeforeArr( 16 ), aBehindArr( 16 ); sal_uInt16 nMyPos = rTbl.GetPos( this ); OSL_ENSURE( this, "this is not in the array?" ); sal_Bool bBreak = sal_False; diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 1aebb1625a5a..b1c91998e651 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -580,7 +580,7 @@ sal_Bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes ) if( !bDelNodes ) { - SwSections aArr( 0, 4 ); + SwSections aArr( 0 ); sal_uInt16 nCnt = pFmt->GetChildSections( aArr, SORTSECT_NOT, sal_False ); for( sal_uInt16 n = 0; n < nCnt; ++n ) { diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index e73a4ba0e8c5..b46220c551b4 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -213,7 +213,7 @@ void lcl_ClearArea( const SwFrm &rFrm, OutputDevice &rOut, const SwRect& rPtArea, const SwRect &rGrfArea ) { - SwRegionRects aRegion( rPtArea, 4, 4 ); + SwRegionRects aRegion( rPtArea, 4 ); aRegion -= rGrfArea; if ( aRegion.Count() ) diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index aa619aa5d40d..e3515990181d 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -78,7 +78,7 @@ using namespace ::com::sun::star; #endif typedef SwTableLine* SwTableLinePtr; -SV_DECL_PTRARR_SORT( SwSortTableLines, SwTableLinePtr, 16, 16 ) +SV_DECL_PTRARR_SORT( SwSortTableLines, SwTableLinePtr, 16 ) SV_IMPL_PTRARR_SORT( SwSortTableLines, SwTableLinePtr ); SV_IMPL_PTRARR( _SwShareBoxFmts, SwShareBoxFmt* ) @@ -277,7 +277,7 @@ _CpyTabFrm& _CpyTabFrm::operator=( const _CpyTabFrm& rCpyTabFrm ) return *this; } -SV_DECL_VARARR_SORT( _CpyTabFrms, _CpyTabFrm, 0, 50 ) +SV_DECL_VARARR_SORT( _CpyTabFrms, _CpyTabFrm, 0 ) SV_IMPL_VARARR_SORT( _CpyTabFrms, _CpyTabFrm ) void lcl_DelCpyTabFrmFmts( _CpyTabFrm& rArr ); @@ -3527,7 +3527,7 @@ sal_Bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType, const SvxLRSpaceItem& rLR = GetFrmFmt()->GetLRSpace(); _FndBox* pFndBox = 0; // fuers Einfuegen/Loeschen - SwTableSortBoxes aTmpLst( 0, 5 ); // fuers Undo + SwTableSortBoxes aTmpLst( 0 ); // fuers Undo sal_Bool bBigger, bRet = sal_False, bLeft = nsTblChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) || @@ -4260,7 +4260,7 @@ sal_Bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType, pBaseLine = pBaseLine->GetUpper()->GetUpper(); _FndBox* pFndBox = 0; // fuers Einfuegen/Loeschen - SwTableSortBoxes aTmpLst( 0, 5 ); // fuers Undo + SwTableSortBoxes aTmpLst( 0 ); // fuers Undo sal_Bool bBigger, bRet = sal_False, bTop = nsTblChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) || diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index e3e01083301d..07bf4a4f2024 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -232,7 +232,7 @@ struct _MapTblFrmFmt {} }; -SV_DECL_VARARR( _MapTblFrmFmts, _MapTblFrmFmt, 0, 10 ) +SV_DECL_VARARR( _MapTblFrmFmts, _MapTblFrmFmt, 0 ) SV_IMPL_VARARR( _MapTblFrmFmts, _MapTblFrmFmt ); SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const @@ -1474,7 +1474,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg, //Alle kopierten (also die neu erzeugten) Rahmen in ein weiteres Array //stopfen. Dort sizten sie passend zu den Originalen, damit hinterher //die Chains entsprechend aufgebaut werden koennen. - SvPtrarr aNewArr( 10, 10 ); + SvPtrarr aNewArr( 10 ); for ( sal_uInt16 n = 0; n < aArr.Count(); ++n ) { diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index ba7581fa0c9d..f759441830c1 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -471,7 +471,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts, pNdTbl->SetRowsToRepeat( nRowsToRepeat ); pNdTbl->SetTableModel( bNewModel ); - SvPtrarr aBoxFmtArr( 0, 16 ); + SvPtrarr aBoxFmtArr( 0 ); SwTableBoxFmt* pBoxFmt = 0; if( !bDfltBorders && !pTAFmt ) { @@ -758,7 +758,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts, if( pTAFmt || ( rInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER) ) { sal_uInt8 nBoxArrLen = pTAFmt ? 16 : 4; - SvPtrarr aBoxFmtArr( nBoxArrLen, 0 ); + SvPtrarr aBoxFmtArr( nBoxArrLen ); { for( sal_uInt8 i = 0; i < nBoxArrLen; ++i ) aBoxFmtArr.Insert( (void*)0, i ); @@ -1680,7 +1680,7 @@ sal_Bool SwDoc::InsertCol( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, sal_Bool b if( rTbl.ISA( SwDDETable )) return sal_False; - SwTableSortBoxes aTmpLst( 0, 5 ); + SwTableSortBoxes aTmpLst( 0 ); SwUndoTblNdsChg* pUndo = 0; if (GetIDocumentUndoRedo().DoesUndo()) { @@ -1743,7 +1743,7 @@ sal_Bool SwDoc::InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, sal_Bool b if( rTbl.ISA( SwDDETable )) return sal_False; - SwTableSortBoxes aTmpLst( 0, 5 ); + SwTableSortBoxes aTmpLst( 0 ); SwUndoTblNdsChg* pUndo = 0; if (GetIDocumentUndoRedo().DoesUndo()) { @@ -2142,7 +2142,7 @@ sal_Bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert, sal_uInt16 n return sal_False; std::vector<sal_uLong> aNdsCnts; - SwTableSortBoxes aTmpLst( 0, 5 ); + SwTableSortBoxes aTmpLst( 0 ); SwUndoTblNdsChg* pUndo = 0; if (GetIDocumentUndoRedo().DoesUndo()) { @@ -3265,7 +3265,7 @@ class _SplitTable_Para public: _SplitTable_Para( SwTableNode* pNew, SwTable& rOld ) - : aSrc( 16, 16 ), aDest( 16, 16 ), pNewTblNd( pNew ), rOldTbl( rOld ) + : aSrc( 16 ), aDest( 16 ), pNewTblNd( pNew ), rOldTbl( rOld ) {} sal_uInt16 SrcFmt_GetPos( void* pFmt ) const { return aSrc.GetPos( pFmt ); } diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 817b1acdb13f..9e8ea04e1108 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -328,7 +328,7 @@ void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew ) SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln Lines. ::lcl_CollectLines( aRowArr, rCursor, false ); if( aRowArr.Count() ) @@ -338,7 +338,7 @@ void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew ) GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd)); } - SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ), 255 ); + SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ) ); for( sal_uInt16 i = 0; i < aRowArr.Count(); ++i ) ::lcl_ProcessRowAttr( aFmtCmp, (SwTableLine*)aRowArr[i], rNew ); @@ -360,7 +360,7 @@ void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz ) const SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln der Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln der Lines. ::lcl_CollectLines( aRowArr, rCursor, false ); if( aRowArr.Count() ) @@ -388,7 +388,7 @@ void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew ) SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln Lines. ::lcl_CollectLines( aRowArr, rCursor, true ); if( aRowArr.Count() ) @@ -398,7 +398,7 @@ void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew ) GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd)); } - SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ), 255 ); + SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ) ); for ( sal_uInt16 i = 0; i < aRowArr.Count(); ++i ) ::lcl_ProcessRowSize( aFmtCmp, (SwTableLine*)aRowArr[i], rNew ); SwTblFmtCmp::Delete( aFmtCmp ); @@ -419,7 +419,7 @@ void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ) const SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln der Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln der Lines. ::lcl_CollectLines( aRowArr, rCursor, true ); if( aRowArr.Count() ) @@ -444,7 +444,7 @@ sal_Bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, sal_Bool bTstOnly ) SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln der Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln der Lines. ::lcl_CollectLines( aRowArr, rCursor, true ); if( 1 < aRowArr.Count() ) @@ -472,7 +472,7 @@ sal_Bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, sal_Bool bTstOnly ) new SwUndoAttrTbl(*pTblNd)); } - SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ), 255 ); + SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ) ); for( i = 0; i < aRowArr.Count(); ++i ) ::lcl_ProcessRowSize( aFmtCmp, (SwTableLine*)aRowArr[i], aNew ); SwTblFmtCmp::Delete( aFmtCmp ); @@ -493,7 +493,7 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln Lines. ::lcl_CollectLines( aRowArr, rCursor, true ); if( aRowArr.Count() ) @@ -503,7 +503,7 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd)); } - SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ), 255 ); + SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ) ); for( sal_uInt16 i = 0; i < aRowArr.Count(); ++i ) ::lcl_ProcessRowAttr( aFmtCmp, (SwTableLine*)aRowArr[i], rNew ); @@ -523,7 +523,7 @@ sal_Bool SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln Lines. ::lcl_CollectLines( aRowArr, rCursor, true ); if( aRowArr.Count() ) @@ -596,7 +596,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ) GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTbl(*pTblNd) ); } - SvPtrarr aFmtCmp( 255, 255 ); + SvPtrarr aFmtCmp( 255 ); const SvxBoxItem* pSetBox; const SvxBoxInfoItem *pSetBoxInfo; @@ -651,7 +651,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ) const SwRect &rUnion = pUnion->GetUnion(); const sal_Bool bLast = i == aUnions.Count() - 1 ? sal_True : sal_False; - SvPtrarr aCellArr( 255, 255 ); + SvPtrarr aCellArr( 255 ); ::lcl_CollectCells( aCellArr, pUnion->GetUnion(), pTab ); //Alle Zellenkanten, die mit dem UnionRect uebereinstimmen oder @@ -847,7 +847,7 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor, { SwSelUnion *pUnion = aUnions[i]; SwTabFrm *pTab = pUnion->GetTable(); - SvPtrarr aCellArr( 255, 255 ); + SvPtrarr aCellArr( 255 ); ::lcl_CollectCells( aCellArr, pUnion->GetUnion(), pTab ); for ( sal_uInt16 j = 0; j < aCellArr.Count(); ++j ) @@ -933,7 +933,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const const sal_Bool bFirst = i == 0 ? sal_True : sal_False; const sal_Bool bLast = i == aUnions.Count() - 1 ? sal_True : sal_False; - SvPtrarr aCellArr( 255, 255 ); + SvPtrarr aCellArr( 255 ); ::lcl_CollectCells( aCellArr, rUnion, (SwTabFrm*)pTab ); for ( sal_uInt16 j = 0; j < aCellArr.Count(); ++j ) @@ -1123,7 +1123,7 @@ void SwDoc::SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew ) GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTbl(*pTblNd) ); } - SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aBoxes.size()) ), 255 ); + SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aBoxes.size()) ) ); for( SwSelBoxes::const_iterator it = aBoxes.begin(); it != aBoxes.end(); ++it ) { SwTableBox *pBox = it->second; diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index ab7c0727c0a5..08f475e10b02 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -261,7 +261,7 @@ SwFrm* SwNode2LayImpl::NextFrm() void SwNode2LayImpl::SaveUpperFrms() { - pUpperFrms = new SvPtrarr( 0, 20 ); + pUpperFrms = new SvPtrarr( 0 ); SwFrm* pFrm; while( 0 != (pFrm = NextFrm()) ) { diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index dfc0e6f0887e..518de823fd08 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -54,7 +54,7 @@ extern sal_Bool CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, sal_Bool bChkSection ); -SV_DECL_PTRARR(SwSttNdPtrs,SwStartNode*,2,2) +SV_DECL_PTRARR(SwSttNdPtrs,SwStartNode*,2) // Funktion zum bestimmen des hoechsten Levels innerhalb des Bereiches @@ -472,7 +472,7 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, sal_uLong nInsPos = 0; // Cnt fuer das TmpArray // das Array bildet einen Stack, es werden alle StartOfSelction's gesichert - SwSttNdPtrs aSttNdStack( 1, 5 ); + SwSttNdPtrs aSttNdStack( 1 ); // setze den Start-Index SwNodeIndex aIdx( aIndex ); @@ -1102,7 +1102,7 @@ void SwNodes::SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEn SwNode * pAktNode; SwNodeIndex aTmpIdx( aStart, +1 ); // das Array bildet einen Stack, es werden alle StartOfSelction's gesichert - SwSttNdPtrs aSttNdStack( 1, 5 ); + SwSttNdPtrs aSttNdStack( 1 ); SwStartNode* pTmp = aStart.GetNode().GetStartNode(); aSttNdStack.C40_INSERT( SwStartNode, pTmp, 0 ); diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 2a4d66d3d677..d0bed29cf951 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -57,12 +57,12 @@ using rtl::OUString; typedef SwAuthEntry* SwAuthEntryPtr; -SV_DECL_PTRARR_DEL( SwAuthDataArr, SwAuthEntryPtr, 5, 5 ) +SV_DECL_PTRARR_DEL( SwAuthDataArr, SwAuthEntryPtr, 5 ) SV_IMPL_PTRARR( SwAuthDataArr, SwAuthEntryPtr ) typedef SwTOXSortKey* TOXSortKeyPtr; -SV_DECL_PTRARR_DEL( SortKeyArr, TOXSortKeyPtr, 5, 5 ) +SV_DECL_PTRARR_DEL( SortKeyArr, TOXSortKeyPtr, 5 ) SV_IMPL_PTRARR( SortKeyArr, TOXSortKeyPtr ) SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy) @@ -84,7 +84,7 @@ SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc) : SwFieldType( RES_AUTHORITY ), m_pDoc(pDoc), m_pDataArr(new SwAuthDataArr ), - m_pSortKeyArr(new SortKeyArr(3, 3)), + m_pSortKeyArr(new SortKeyArr(3)), m_cPrefix('['), m_cSuffix(']'), m_bIsSequence(sal_False), @@ -96,7 +96,7 @@ SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc) SwAuthorityFieldType::SwAuthorityFieldType( const SwAuthorityFieldType& rFType) : SwFieldType( RES_AUTHORITY ), m_pDataArr(new SwAuthDataArr ), - m_pSortKeyArr(new SortKeyArr(3, 3)), + m_pSortKeyArr(new SortKeyArr(3)), m_cPrefix(rFType.m_cPrefix), m_cSuffix(rFType.m_cSuffix), m_bIsSequence(rFType.m_bIsSequence), diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 2f588ae0d32a..1da184926fe1 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -2153,7 +2153,7 @@ void SwRefPageGetFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* if( !pNew && !pOld && GetDepends() ) { // sammel erstmal alle SetPageRefFelder ein. - _SetGetExpFlds aTmpLst( 10, 5 ); + _SetGetExpFlds aTmpLst( 10 ); if( MakeSetList( aTmpLst ) ) { SwIterator<SwFmtFld,SwFieldType> aIter( *this ); @@ -2301,7 +2301,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm, OSL_ENSURE( !pFrm->IsInDocBody(), "Flag ist nicht richtig, Frame steht im DocBody" ); // sammel erstmal alle SetPageRefFelder ein. - _SetGetExpFlds aTmpLst( 10, 5 ); + _SetGetExpFlds aTmpLst( 10 ); if( !pGetType->MakeSetList( aTmpLst ) ) return ; diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 98111d0850f6..e031700c4407 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -117,7 +117,7 @@ sal_Bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos, if( !pFrm || !pMyFrm || pFrm == pMyFrm ) return sal_False; - SvPtrarr aRefArr( 10, 10 ), aArr( 10, 10 ); + SvPtrarr aRefArr( 10 ), aArr( 10 ); ::lcl_GetLayTree( pFrm, aRefArr ); ::lcl_GetLayTree( pMyFrm, aArr ); @@ -928,7 +928,7 @@ public: String GetName() { return aName; } }; -SV_DECL_PTRARR_DEL( _RefIdsMaps, _RefIdsMap*, 5, 5 ) +SV_DECL_PTRARR_DEL( _RefIdsMaps, _RefIdsMap*, 5 ) SV_IMPL_PTRARR( _RefIdsMaps, _RefIdsMap* ) /// Get a sorted list of the field IDs from a document. diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 1729c4e17503..deb79100dcc5 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -103,7 +103,7 @@ struct _CmpLPt }; -SV_DECL_VARARR_SORT( _MergePos, _CmpLPt, 0, 40 ) +SV_DECL_VARARR_SORT( _MergePos, _CmpLPt, 0 ) SV_IMPL_VARARR_SORT( _MergePos, _CmpLPt ) SV_IMPL_PTRARR( _FndBoxes, _FndBox* ) @@ -1576,7 +1576,7 @@ void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart, while ( rpEnd->GetNext() ) rpEnd = (SwLayoutFrm*)rpEnd->GetNext(); - SvPtrarr aSttArr( 8, 8 ), aEndArr( 8, 8 ); + SvPtrarr aSttArr( 8 ), aEndArr( 8 ); const SwLayoutFrm *pTmp; for( pTmp = rpStart; (FRM_CELL|FRM_ROW) & pTmp->GetType(); pTmp = pTmp->GetUpper() ) diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx index 5c08c87532c0..1c1a90d2eda5 100644 --- a/sw/source/core/inc/UndoCore.hxx +++ b/sw/source/core/inc/UndoCore.hxx @@ -50,7 +50,7 @@ namespace sw { typedef SwRedlineSaveData* SwRedlineSaveDataPtr; -SV_DECL_PTRARR_DEL( SwRedlineSaveDatas, SwRedlineSaveDataPtr, 8, 8 ) +SV_DECL_PTRARR_DEL( SwRedlineSaveDatas, SwRedlineSaveDataPtr, 8 ) namespace sw { diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index e40bc537951c..03407472e1f1 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -67,8 +67,8 @@ struct SwSortUndoElement ~SwSortUndoElement(); }; -SV_DECL_PTRARR_DEL(SwSortList, SwSortUndoElement*, 10,30) -SV_DECL_PTRARR(SwUndoSortList, SwNodeIndex*, 10,30) +SV_DECL_PTRARR_DEL(SwSortList, SwSortUndoElement*, 10) +SV_DECL_PTRARR(SwUndoSortList, SwNodeIndex*, 10) class SwUndoSort : public SwUndo, private SwUndRng { diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx index 1a4b0a9252c0..ea3965e962ac 100644 --- a/sw/source/core/inc/blink.hxx +++ b/sw/source/core/inc/blink.hxx @@ -61,7 +61,7 @@ public: }; typedef SwBlinkPortion* SwBlinkPortionPtr; -SV_DECL_PTRARR_SORT_DEL(SwBlinkList, SwBlinkPortionPtr, 0, 10) +SV_DECL_PTRARR_SORT_DEL(SwBlinkList, SwBlinkPortionPtr, 0) class SwBlink { diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index 26d19dc4d859..30410b71af44 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -118,7 +118,7 @@ public: }; typedef _SetGetExpFld* _SetGetExpFldPtr; -SV_DECL_PTRARR_SORT_DEL( _SetGetExpFlds, _SetGetExpFldPtr, 0, 10 ) +SV_DECL_PTRARR_SORT_DEL( _SetGetExpFlds, _SetGetExpFldPtr, 0 ) // Struktur zum Speichern der Strings aus SetExp-String-Feldern diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index aa2d096f3cb8..e3df48b2c1a2 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -56,8 +56,8 @@ typedef const _FndBox* _FndBoxPtr; typedef SwSortElement* SwSortElementPtr; typedef const SwTableBox* SwMovedBoxPtr; -SV_DECL_PTRARR_SORT(SwSortElements, SwSortElementPtr, 0, 1 ) -SV_DECL_PTRARR(SwMovedBoxes, SwMovedBoxPtr, 10, 10 ) +SV_DECL_PTRARR_SORT(SwSortElements, SwSortElementPtr, 0) +SV_DECL_PTRARR(SwMovedBoxes, SwMovedBoxPtr, 10) /*-------------------------------------------------------------------- Beschreibung: Funktionen zum Moven von Boxen diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx index afcdb2c11d4e..5b57925efe73 100644 --- a/sw/source/core/inc/doctxm.hxx +++ b/sw/source/core/inc/doctxm.hxx @@ -43,7 +43,7 @@ struct SwTOXSortTabBase; typedef SwTOXSortTabBase* SwTOXSortTabBasePtr; -SV_DECL_PTRARR(SwTOXSortTabBases, SwTOXSortTabBasePtr, 0, 5 ) +SV_DECL_PTRARR(SwTOXSortTabBases, SwTOXSortTabBasePtr, 0) /*-------------------------------------------------------------------- Beschreibung: Ring der speziellen Verzeichnisse diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 606b92eaf043..7087b0626335 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -51,7 +51,7 @@ class SwFntCache : public SwCache { public: - inline SwFntCache() : SwCache(50,50 + inline SwFntCache() : SwCache(50 #ifdef DBG_UTIL , rtl::OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache")) #endif diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index 0fdac74399fe..6e99ade46633 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -111,7 +111,7 @@ struct _SaveFly { } }; -SV_DECL_VARARR( _SaveFlyArr, _SaveFly, 0, 10 ) +SV_DECL_VARARR( _SaveFlyArr, _SaveFly, 0 ) void _RestFlyInRange( _SaveFlyArr& rArr, const SwNodeIndex& rSttIdx, const SwNodeIndex* pInsPos ); @@ -182,7 +182,7 @@ public: const SwFmtAnchor* GetAnchor() const { return pAnchor; } }; -SV_DECL_VARARR_SORT( _ZSortFlys, _ZSortFly, 0, 10 ) +SV_DECL_VARARR_SORT( _ZSortFlys, _ZSortFly, 0 ) class SwTblNumFmtMerge diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx index 42db71134c45..095c63e3ec92 100644 --- a/sw/source/core/inc/noteurl.hxx +++ b/sw/source/core/inc/noteurl.hxx @@ -54,7 +54,7 @@ public: }; typedef SwURLNote* SwURLNotePtr; -SV_DECL_PTRARR_DEL(SwURLNoteList, SwURLNotePtr, 0, 5) +SV_DECL_PTRARR_DEL(SwURLNoteList, SwURLNotePtr, 0) class SwNoteURL { diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index c0187acd06b8..f030c236f422 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -354,7 +354,7 @@ public: #endif typedef SwHistoryHint* SwHistoryHintPtr; -SV_DECL_PTRARR_DEL( SwpHstry, SwHistoryHintPtr, 0, 2 ) +SV_DECL_PTRARR_DEL( SwpHstry, SwHistoryHintPtr, 0 ) class SwHistory { @@ -366,7 +366,7 @@ class SwHistory sal_uInt16 m_nEndDiff; public: - SwHistory( sal_uInt16 nInitSz = 0, sal_uInt16 nGrowSz = 2 ); + SwHistory( sal_uInt16 nInitSz = 0 ); ~SwHistory(); // delete History from nStart to array end diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index bc16e528915a..f9a080513867 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -154,7 +154,7 @@ public: }; typedef SwSectionFrm* SwSectionFrmPtr; -SV_DECL_PTRARR_SORT( SwDestroyList, SwSectionFrmPtr, 1, 5) +SV_DECL_PTRARR_SORT( SwDestroyList, SwSectionFrmPtr, 1 ) inline const SwSectionFrm *SwSectionFrm::GetFollow() const { diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 1ac9455abff7..9a4d2f31612e 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -63,7 +63,7 @@ public: int operator< ( const SwBlockName& r ) { return aShort < r.aShort; } }; -SV_DECL_PTRARR_SORT( SwBlockNames, SwBlockName*, 10, 10 ) +SV_DECL_PTRARR_SORT( SwBlockNames, SwBlockName*, 10 ) class SwImpBlocks diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 1341175aedf8..aba30d131f6e 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -61,7 +61,7 @@ class SwCacheObj; -SV_DECL_PTRARR_DEL(SwCacheObjArr,SwCacheObj*,1,1) +SV_DECL_PTRARR_DEL(SwCacheObjArr,SwCacheObj*,1) class SwCache : public SwCacheObjArr { @@ -105,8 +105,7 @@ public: //nur sal_uInt8 hineinstecken!!! #ifdef DBG_UTIL - SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize, - const rtl::OString &rNm ); + SwCache( const sal_uInt16 nInitSize, const rtl::OString &rNm ); ~SwCache(); #else SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize ); diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index 06c013b281fe..49b553f94d70 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -46,7 +46,7 @@ class SwFontCache : public SwCache { public: - inline SwFontCache() : SwCache(50,50 + inline SwFontCache() : SwCache(50 #ifdef DBG_UTIL , "Global AttributSet/Font-Cache pSwFontCache" #endif diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 1db055b9b1e1..746fd49467b5 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -183,7 +183,7 @@ class SwShareBoxFmt public: SwShareBoxFmt( const SwFrmFmt& rFmt ) - : pOldFmt( &rFmt ), aNewFmts( 1, 4 ) + : pOldFmt( &rFmt ), aNewFmts( 1 ) {} const SwFrmFmt& GetOldFormat() const { return *pOldFmt; } @@ -196,7 +196,7 @@ public: }; -SV_DECL_PTRARR_DEL( _SwShareBoxFmts, SwShareBoxFmt*, 8, 8 ) +SV_DECL_PTRARR_DEL( _SwShareBoxFmts, SwShareBoxFmt*, 8 ) class SwShareBoxFmts { diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 75ad22213c79..5b3e79d3e793 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -64,7 +64,7 @@ struct SwTOXSource {} }; -SV_DECL_VARARR( SwTOXSources, SwTOXSource, 0, 10 ) +SV_DECL_VARARR( SwTOXSources, SwTOXSource, 0 ) class SwTOXInternational { diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 49a66be6a70e..5c379e56ebc6 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -813,7 +813,7 @@ SwFmtCol::SwFmtCol( const SwFmtCol& rCpy ) aLineColor( rCpy.aLineColor), nLineHeight( rCpy.GetLineHeight() ), eAdj( rCpy.GetLineAdj() ), - aColumns( (sal_Int8)rCpy.GetNumCols(), 1 ), + aColumns( (sal_Int8)rCpy.GetNumCols() ), nWidth( rCpy.GetWishWidth() ), bOrtho( rCpy.IsOrtho() ) { diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index e1cff3cc8e03..9bc3957f674e 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1156,7 +1156,7 @@ void AppendAllObjs( const SwSpzFrmFmts *pTbl, const SwFrm* pSib ) //uebrigbleiben, weil wir weder zeichengebunde Rahmen verbinden noch //Objecte die in zeichengebundenen verankert sind. - SwSpzFrmFmts aCpy( 255, 255 ); + SwSpzFrmFmts aCpy( 255 ); aCpy.Insert( pTbl, 0 ); sal_uInt16 nOldCnt = USHRT_MAX; diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index d485bc1fb8e4..7d3ea8302ad5 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -2018,7 +2018,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, //(der Inhalt zu einem Attribut kann ueber mehrere Seiten verteilt sein) //und ausschneiden. - SvPtrarr aNotFtnArr( 20, 20 ); //Zur Robustheit werden hier die nicht + SvPtrarr aNotFtnArr( 20 ); //Zur Robustheit werden hier die nicht //dazugehoerigen Fussnoten eingetragen. //Wenn eine Fussnote zweimal angefasst wird //ists vorbei! So kommt die Funktion auch @@ -2377,7 +2377,7 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest, OSL_ENSURE( pDestBoss, "+SwPageFrm::MoveFtns: no destination boss" ); if( pDestBoss ) // robust { - SvPtrarr aFtnArr( 5, 5 ); + SvPtrarr aFtnArr( 5 ); pDestBoss->_CollectFtns( pDest, pFtn, aFtnArr ); if ( aFtnArr.Count() ) { @@ -2888,7 +2888,7 @@ sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, if( !pStart ) pStart = ContainsCntnt(); - SvPtrarr aFtnArr( 5, 5 ); + SvPtrarr aFtnArr( 5 ); while ( IsAnLower( pStart ) ) { @@ -2912,7 +2912,7 @@ sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, if( pStart && pOldBoss->IsInSct() && ( pOldChief = pOldBoss->FindSctFrm() ) != ( pNewChief = pNewBoss->FindSctFrm() ) ) { - pFtnArr = new SvPtrarr( 5, 5 ); + pFtnArr = new SvPtrarr( 5 ); pOldChief = pOldBoss->FindFtnBossFrm( sal_True ); pNewChief = pNewBoss->FindFtnBossFrm( sal_True ); while( pOldChief->IsAnLower( pStart ) ) diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx index 6028735c5fd7..1a6d4cb45184 100644 --- a/sw/source/core/layout/layhelp.hxx +++ b/sw/source/core/layout/layhelp.hxx @@ -57,7 +57,7 @@ class SvStream; class SwFlyCache; typedef SwFlyCache* SwFlyCachePtr; -SV_DECL_PTRARR_DEL( SwPageFlyCache, SwFlyCachePtr, 0, 4 ) +SV_DECL_PTRARR_DEL( SwPageFlyCache, SwFlyCachePtr, 0 ) class SwLayCacheImpl : public std::vector<sal_uLong> { diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 3105bce2cc3f..344b388c0656 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -128,7 +128,7 @@ void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn ) } } if( !pEndArr ) - pEndArr = new SvPtrarr( 5, 5 ); // deleted from the SwLayouter + pEndArr = new SvPtrarr( 5 ); // deleted from the SwLayouter pEndArr->Insert( (VoidPtr)pFtn, pEndArr->Count() ); } diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index a1675a9e2ffa..1e9b0e88b27a 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -363,7 +363,7 @@ TYPEINIT1(SwCntntFrm,SwFrm); //rtti fuer SwCntntFrm void _FrmInit() { SwRootFrm::pVout = new SwLayVout(); - SwCache *pNew = new SwCache( 100, 100 + SwCache *pNew = new SwCache( 100 #ifdef DBG_UTIL , "static SwBorderAttrs::pCache" #endif @@ -395,7 +395,7 @@ void _FrmFinit() |*************************************************************************/ typedef CurrShell* CurrShellPtr; -SV_DECL_PTRARR_SORT(SwCurrShells,CurrShellPtr,4,4) +SV_DECL_PTRARR_SORT(SwCurrShells,CurrShellPtr,4) SV_IMPL_PTRARR_SORT(SwCurrShells,CurrShellPtr) CurrShell::CurrShell( ViewShell *pNew ) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 074a54aad479..e7d16a3969d5 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -195,7 +195,7 @@ public: sal_Bool MakeUnion( const SwRect &rRect ); }; -SV_DECL_VARARR( SwLRects, SwLineRect, 100, 100 ) +SV_DECL_VARARR( SwLRects, SwLineRect, 100 ) class SwLineRects : public SwLRects { @@ -500,7 +500,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) static const long nAdd = 20; - SvPtrarr aCheck( 64, 64 ); + SvPtrarr aCheck( 64 ); for ( int i = 0; i < (int)Count(); ++i ) { @@ -3984,7 +3984,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, const long nWidth = ::lcl_AlignWidth ( rShadow.GetWidth() ); const long nHeight = ::lcl_AlignHeight( rShadow.GetWidth() ); - SwRects aRegion( 2, 2 ); + SwRects aRegion( 2 ); SwRect aOut( rOutRect ); const sal_Bool bCnt = IsCntntFrm(); @@ -4206,7 +4206,7 @@ void SwFrm::PaintBorderLine( const SwRect& rRect, if ( pPage->GetSortedObjs() ) { - SwRegionRects aRegion( aOut, 4, 1 ); + SwRegionRects aRegion( aOut, 4 ); ::lcl_SubtractFlys( this, pPage, aOut, aRegion ); for ( sal_uInt16 i = 0; i < aRegion.Count(); ++i ) pLines->AddLineRect( aRegion[i], pColor, nStyle, pTab, nSubCol ); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 575d959dcc0a..580e0452bf89 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -898,7 +898,7 @@ String SwOLEObj::GetDescription() SwOLELRUCache::SwOLELRUCache() - : SvPtrarr( 64, 16 ), + : SvPtrarr( 64 ), utl::ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Cache"))), nLRU_InitSize( 20 ), bInUnload( sal_False ) diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index c13630d748fc..3c0b4c156542 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -432,7 +432,7 @@ void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) void SwTable::AdjustWidths( const long nOld, const long nNew ) { - SvPtrarr aFmtArr( (sal_uInt8)aLines[0]->GetTabBoxes().Count(), 1 ); + SvPtrarr aFmtArr( (sal_uInt8)aLines[0]->GetTabBoxes().Count() ); ::lcl_ModifyLines( aLines, nOld, nNew, aFmtArr, true ); } @@ -699,7 +699,7 @@ struct Parm SwShareBoxFmts aShareFmts; Parm( const SwTabCols &rN, const SwTabCols &rO ) : - rNew( rN ), rOld( rO ), nNewWish(0), nOldWish(0), aBoxArr( 10, 1 ){} + rNew( rN ), rOld( rO ), nNewWish(0), nOldWish(0), aBoxArr( 10 ){} }; inline sal_Bool BoxInArr( SvPtrarr& rArr, SwTableBox* pBox ) { @@ -1555,7 +1555,7 @@ sal_Bool SwTable::IsTblComplex() const SwTableLine::SwTableLine( SwTableLineFmt *pFmt, sal_uInt16 nBoxes, SwTableBox *pUp ) : SwClient( pFmt ), - aBoxes( (sal_uInt8)nBoxes, 1 ), + aBoxes( (sal_uInt8)nBoxes ), pUpper( pUp ) { } @@ -1698,7 +1698,7 @@ SwTwips SwTableLine::GetTableLineHeight( bool& bLayoutAvailable ) const |*************************************************************************/ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, sal_uInt16 nLines, SwTableLine *pUp ) : SwClient( 0 ), - aLines( (sal_uInt8)nLines, 1 ), + aLines( (sal_uInt8)nLines ), pSttNd( 0 ), pUpper( pUp ), pImpl( 0 ) @@ -1709,7 +1709,7 @@ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, sal_uInt16 nLines, SwTableLine *pUp SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwNodeIndex &rIdx, SwTableLine *pUp ) : SwClient( 0 ), - aLines( 0, 0 ), + aLines( 0 ), pUpper( pUp ), pImpl( 0 ) { @@ -1728,7 +1728,7 @@ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwNodeIndex &rIdx, SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwStartNode& rSttNd, SwTableLine *pUp ) : SwClient( 0 ), - aLines( 0, 0 ), + aLines( 0 ), pSttNd( &rSttNd ), pUpper( pUp ), pImpl( 0 ) diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx index 96eecc946e13..187a99694808 100644 --- a/sw/source/core/text/txtinit.cxx +++ b/sw/source/core/text/txtinit.cxx @@ -70,7 +70,7 @@ void _TextInit() { pFntCache = new SwFntCache; // Cache for SwSubFont -> SwFntObj = { Font aFont, Font* pScrFont, Font* pPrtFont, OutputDevice* pPrinter, ... } pSwFontCache = new SwFontCache; // Cache for SwTxtFmtColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray } - SwCache *pTxtCache = new SwCache( 250, 100 // Cache for SwTxtFrm -> SwTxtLine = { SwParaPortion* pLine } + SwCache *pTxtCache = new SwCache( 250 // Cache for SwTxtFrm -> SwTxtLine = { SwParaPortion* pLine } #ifdef DBG_UTIL , "static SwTxtFrm::pTxtCache" #endif diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 42220ebce1c5..2691f28adf97 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -94,11 +94,11 @@ using namespace ::com::sun::star; -SV_DECL_PTRARR( TmpHints, SwTxtAttr*, 0, 4 ) +SV_DECL_PTRARR( TmpHints, SwTxtAttr*, 0 ) TYPEINIT1( SwTxtNode, SwCntntNode ) -SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) +SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1) // Leider ist das SwpHints nicht ganz wasserdicht: // Jeder darf an den Hints rumfummeln, ohne die Sortierreihenfolge diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 027e95ef003e..cdb85b9fab5c 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -1014,8 +1014,8 @@ void SwHistoryChangeCharFmt::SetInDoc(SwDoc * pDoc, bool ) -SwHistory::SwHistory( sal_uInt16 nInitSz, sal_uInt16 nGrowSz ) - : m_SwpHstry( (sal_uInt8)nInitSz, (sal_uInt8)nGrowSz ) +SwHistory::SwHistory( sal_uInt16 nInitSz ) + : m_SwpHstry( (sal_uInt8)nInitSz ) , m_nEndDiff( 0 ) {} diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index 353631b13e2b..4267874ef771 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -40,7 +40,7 @@ #include <rolbck.hxx> -SV_DECL_PTRARR_DEL( _SfxPoolItems, SfxPoolItem*, 16, 16 ) +SV_DECL_PTRARR_DEL( _SfxPoolItems, SfxPoolItem*, 16 ) SV_IMPL_PTRARR( _SfxPoolItems, SfxPoolItem* ); diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 96351fb93978..6243bead3f5c 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -85,17 +85,17 @@ extern void ClearFEShellTabCols(); typedef SfxItemSet* SfxItemSetPtr; -SV_DECL_PTRARR_DEL( SfxItemSets, SfxItemSetPtr, 10, 5 ) +SV_DECL_PTRARR_DEL( SfxItemSets, SfxItemSetPtr, 10 ) typedef SwUndoSaveSection* SwUndoSaveSectionPtr; -SV_DECL_PTRARR_DEL( SwUndoSaveSections, SwUndoSaveSectionPtr, 0, 10 ) +SV_DECL_PTRARR_DEL( SwUndoSaveSections, SwUndoSaveSectionPtr, 0 ) typedef SwUndoMove* SwUndoMovePtr; -SV_DECL_PTRARR_DEL( SwUndoMoves, SwUndoMovePtr, 0, 10 ) +SV_DECL_PTRARR_DEL( SwUndoMoves, SwUndoMovePtr, 0 ) struct SwTblToTxtSave; typedef SwTblToTxtSave* SwTblToTxtSavePtr; -SV_DECL_PTRARR_DEL( SwTblToTxtSaves, SwTblToTxtSavePtr, 0, 10 ) +SV_DECL_PTRARR_DEL( SwTblToTxtSaves, SwTblToTxtSavePtr, 0 ) struct _UndoTblCpyTbl_Entry { @@ -110,7 +110,7 @@ struct _UndoTblCpyTbl_Entry ~_UndoTblCpyTbl_Entry(); }; typedef _UndoTblCpyTbl_Entry* _UndoTblCpyTbl_EntryPtr; -SV_DECL_PTRARR_DEL( _UndoTblCpyTbl_Entries, _UndoTblCpyTbl_EntryPtr, 0, 10 ) +SV_DECL_PTRARR_DEL( _UndoTblCpyTbl_Entries, _UndoTblCpyTbl_EntryPtr, 0 ) class _SaveBox; class _SaveLine; @@ -1354,7 +1354,7 @@ void _SaveBox::SaveCntntAttrs( SwDoc* pDoc ) else { sal_uLong nEnd = pDoc->GetNodes()[ nSttNode ]->EndOfSectionIndex(); - Ptrs.pCntntAttrs = new SfxItemSets( (sal_uInt8)(nEnd - nSttNode - 1 ), 5 ); + Ptrs.pCntntAttrs = new SfxItemSets( (sal_uInt8)(nEnd - nSttNode - 1 ) ); for( sal_uLong n = nSttNode + 1; n < nEnd; ++n ) { SwCntntNode* pCNd = pDoc->GetNodes()[ n ]->GetCntntNode(); @@ -1733,7 +1733,7 @@ void SwUndoTblNdsChg::SaveSection( SwStartNode* pSttNd ) { OSL_ENSURE( IsDelBox(), "falsche Action" ); if( pDelSects.get() == NULL ) - pDelSects.reset( new SwUndoSaveSections( 10, 5 ) ); + pDelSects.reset( new SwUndoSaveSections( 10 ) ); SwTableNode* pTblNd = pSttNd->FindTableNode(); SwUndoSaveSection* pSave = new SwUndoSaveSection; @@ -2861,7 +2861,7 @@ sal_Bool SwUndoTblCpyTbl::InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes, SwTableNode* pTblNd = (SwTableNode*)rTbl.GetTabSortBoxes()[0]-> GetSttNd()->FindTableNode(); - SwTableSortBoxes aTmpLst( 0, 5 ); + SwTableSortBoxes aTmpLst( 0 ); pInsRowUndo = new SwUndoTblNdsChg( UNDO_TABLE_INSROW, rBoxes, *pTblNd, 0, 0, nCnt, sal_True, sal_False ); aTmpLst.Insert( &rTbl.GetTabSortBoxes(), 0, rTbl.GetTabSortBoxes().Count() ); diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 2f88674d8585..c12ac1413fe2 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -730,7 +730,7 @@ SwFieldType* SwXFieldMaster::GetFldType(sal_Bool bDontCreate) const } typedef SwFmtFld* SwFmtFldPtr; -SV_DECL_PTRARR(SwDependentFields, SwFmtFldPtr, 5, 5) +SV_DECL_PTRARR(SwDependentFields, SwFmtFldPtr, 5) SV_IMPL_PTRARR(SwDependentFields, SwFmtFldPtr) uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index d347c0cf93c5..12664bde6d34 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -106,7 +106,7 @@ struct PropValData #define API_COL_LINE_DASHED 3 typedef PropValData* PropValDataPtr; -SV_DECL_PTRARR(PropValDataArr, PropValDataPtr, 5, 5 ) +SV_DECL_PTRARR(PropValDataArr, PropValDataPtr, 5) SV_IMPL_PTRARR(PropValDataArr, PropValDataPtr) diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 0babb76e5d6f..2fe88b73baed 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -321,7 +321,7 @@ void StgReader::SetFltName( const String& rFltNm ) SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, sal_Bool bNDoc ) : bNewDoc( bNDoc ) { - pNumRuleTbl = new SwNumRuleTbl( 8, 8 ); + pNumRuleTbl = new SwNumRuleTbl( 8 ); if( !bNDoc ) pNumRuleTbl->Insert( &rDoc.GetNumRuleTbl(), 0 ); } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 73de8423589c..25b3b1132ff1 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -1208,7 +1208,7 @@ HTMLSttEndPos::~HTMLSttEndPos() } typedef HTMLSttEndPos *HTMLSttEndPosPtr; -SV_DECL_PTRARR( _HTMLEndLst, HTMLSttEndPosPtr, 5, 5 ) +SV_DECL_PTRARR( _HTMLEndLst, HTMLSttEndPosPtr, 5 ) enum HTMLOnOffState { HTML_NOT_SUPPORTED, // nicht unterst. Attribut HTML_REAL_VALUE, // Attribut mit Wert diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 45dfe8e683c3..e03b1d4d3f1d 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -313,7 +313,7 @@ void SwHTMLWriter::CollectFlyFrms() "number of browser configurations has changed" ); sal_uInt8 nSz = (sal_uInt8)Min( pDoc->GetSpzFrmFmts()->Count(), sal_uInt16(255) ); - SwPosFlyFrms aFlyPos( nSz, nSz ); + SwPosFlyFrms aFlyPos( nSz ); pDoc->GetAllFlyFmts( aFlyPos, bWriteAll ? 0 : pCurPam, sal_True ); for( sal_uInt16 i=0; i< aFlyPos.Count(); i++ ) diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index ff86a532dc97..5e0d945cfd92 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -129,7 +129,7 @@ public: }; typedef SwHTMLPosFlyFrm *SwHTMLPosFlyFrmPtr; -SV_DECL_PTRARR_SORT( SwHTMLPosFlyFrms, SwHTMLPosFlyFrmPtr, 10, 10 ) +SV_DECL_PTRARR_SORT( SwHTMLPosFlyFrms, SwHTMLPosFlyFrmPtr, 10 ) #endif diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index f10de6ebc07e..ba2c5a721c05 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -41,7 +41,7 @@ #include "wrthtml.hxx" typedef SwTxtFtn *SwTxtFtnPtr; -SV_DECL_PTRARR( SwHTMLTxtFtns, SwTxtFtnPtr, 1, 1 ) +SV_DECL_PTRARR( SwHTMLTxtFtns, SwTxtFtnPtr, 1 ) struct SwHTMLFootEndNote_Impl { diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 42eebd5225a0..2612ef575c45 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -278,7 +278,7 @@ public: // Row of a HTML table typedef HTMLTableCell* HTMLTableCellPtr; -SV_DECL_PTRARR_DEL(HTMLTableCells,HTMLTableCellPtr,5,5) +SV_DECL_PTRARR_DEL(HTMLTableCells,HTMLTableCellPtr,5) class HTMLTableRow { @@ -378,12 +378,12 @@ public: // HTML table typedef HTMLTableRow* HTMLTableRowPtr; -SV_DECL_PTRARR_DEL(HTMLTableRows,HTMLTableRowPtr,5,5) +SV_DECL_PTRARR_DEL(HTMLTableRows,HTMLTableRowPtr,5) typedef HTMLTableColumn* HTMLTableColumnPtr; -SV_DECL_PTRARR_DEL(HTMLTableColumns,HTMLTableColumnPtr,5,5) +SV_DECL_PTRARR_DEL(HTMLTableColumns,HTMLTableColumnPtr,5) -SV_DECL_PTRARR(SdrObjects,SdrObject *,1,1) +SV_DECL_PTRARR(SdrObjects,SdrObject *,1) class HTMLTable { diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index b559b74be3a7..887db2500490 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2589,7 +2589,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, SwCntntNode* pCNd; sal_uInt16 n; - _HTMLAttrs aFields( 5, 5 ); + _HTMLAttrs aFields( 5 ); for( n = aSetAttrTab.Count(); n; ) { diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index f751719ff423..54a6f0e3073c 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -72,7 +72,7 @@ extern HTMLOptionEnum aHTMLImgVAlignTable[]; class _HTMLAttr; typedef _HTMLAttr *_HTMLAttrPtr; -SV_DECL_PTRARR( _HTMLAttrs, _HTMLAttrPtr, 5, 5 ) +SV_DECL_PTRARR( _HTMLAttrs, _HTMLAttrPtr, 5 ) class _HTMLAttr { @@ -332,16 +332,16 @@ public: }; typedef _HTMLAttrContext *_HTMLAttrContextPtr; -SV_DECL_PTRARR( _HTMLAttrContexts, _HTMLAttrContextPtr, 5, 5 ) +SV_DECL_PTRARR( _HTMLAttrContexts, _HTMLAttrContextPtr, 5 ) class HTMLTable; class SwCSS1Parser; class SwHTMLNumRuleInfo; typedef ImageMap *ImageMapPtr; -SV_DECL_PTRARR_DEL( ImageMaps, ImageMapPtr, 1, 1 ) +SV_DECL_PTRARR_DEL( ImageMaps, ImageMapPtr, 1 ) typedef SwFrmFmt *SwFrmFmtPtr; -SV_DECL_PTRARR( SwHTMLFrmFmts, SwFrmFmtPtr, 2, 2 ) +SV_DECL_PTRARR( SwHTMLFrmFmts, SwFrmFmtPtr, 2 ) #define HTML_CNTXT_PROTECT_STACK 0x0001 #define HTML_CNTXT_STRIP_PARA 0x0002 diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 633ad33dd1b9..96e2d06ef2ec 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -189,11 +189,11 @@ const sal_uInt32 HTML_FRMOPTS_GENIMG = // der HTML-Writer struct HTMLControl; -SV_DECL_PTRARR_SORT_DEL( HTMLControls, HTMLControl*, 1, 1 ) -SV_DECL_PTRARR( INetFmts, SwFmtINetFmt*, 1, 1 ) +SV_DECL_PTRARR_SORT_DEL( HTMLControls, HTMLControl*, 1 ) +SV_DECL_PTRARR( INetFmts, SwFmtINetFmt*, 1 ) struct SwHTMLFmtInfo; -SV_DECL_PTRARR_SORT_DEL( SwHTMLFmtInfos, SwHTMLFmtInfo*, 1, 1 ) +SV_DECL_PTRARR_SORT_DEL( SwHTMLFmtInfos, SwHTMLFmtInfo*, 1 ) class IDocumentStylePoolAccess; diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index c9b51bc8f189..73245119d527 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -164,7 +164,7 @@ namespace sw } }; - SV_DECL_PTRARR_SORT_DEL(AuthorInfos, AuthorInfo_Ptr,16,16) + SV_DECL_PTRARR_SORT_DEL(AuthorInfos, AuthorInfo_Ptr,16) /** Clips a value to MAX/MIN 16bit value to make it safe for use as a position value to give to writer. i.e. +-57.8cm. Sometimes diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 2e5d21ab3ade..86b295a43ff7 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -106,7 +106,7 @@ public: }; typedef SwWriteTableCell *SwWriteTableCellPtr; -SV_DECL_PTRARR_DEL( SwWriteTableCells, SwWriteTableCellPtr, 5, 5 ) +SV_DECL_PTRARR_DEL( SwWriteTableCells, SwWriteTableCellPtr, 5 ) //----------------------------------------------------------------------- @@ -175,7 +175,7 @@ inline int SwWriteTableRow::operator<( const SwWriteTableRow& rRow ) const } typedef SwWriteTableRow *SwWriteTableRowPtr; -SV_DECL_PTRARR_SORT_DEL( SwWriteTableRows, SwWriteTableRowPtr, 5, 5 ) +SV_DECL_PTRARR_SORT_DEL( SwWriteTableRows, SwWriteTableRowPtr, 5 ) //----------------------------------------------------------------------- @@ -233,7 +233,7 @@ inline int SwWriteTableCol::operator<( const SwWriteTableCol& rCol ) const typedef SwWriteTableCol *SwWriteTableColPtr; -SV_DECL_PTRARR_SORT_DEL( SwWriteTableCols, SwWriteTableColPtr, 5, 5 ) +SV_DECL_PTRARR_SORT_DEL( SwWriteTableCols, SwWriteTableColPtr, 5 ) //----------------------------------------------------------------------- diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx index 2fa62f0c370d..b2233bb7c0e4 100644 --- a/sw/source/filter/rtf/rtftbl.cxx +++ b/sw/source/filter/rtf/rtftbl.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star; typedef SwTableBoxFmt* SwTableBoxFmtPtr; -SV_DECL_PTRARR( SwBoxFrmFmts, SwTableBoxFmtPtr, 25, 50 ) +SV_DECL_PTRARR( SwBoxFrmFmts, SwTableBoxFmtPtr, 25 ) class SwShareBoxFmts; extern void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* = 0, diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 5378d07f3bf2..8099617c957e 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -226,7 +226,7 @@ SwRTFParser::SwRTFParser(SwDoc* pD, maCharStyleMapper(*pD), maSegments(*this), maInsertedTables(*pD), - aTblFmts(0, 10), + aTblFmts(0), mpBookmarkStart(0), mpRedlineStack(0), pAuthorInfos(0), diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx index b908bf6c46a8..31c2bae865b7 100644 --- a/sw/source/filter/rtf/swparrtf.hxx +++ b/sw/source/filter/rtf/swparrtf.hxx @@ -147,7 +147,7 @@ struct SwListEntry }; typedef SwFlySave* SwFlySavePtr; -SV_DECL_PTRARR_DEL( SwFlySaveArr, SwFlySavePtr, 0, 20 ) +SV_DECL_PTRARR_DEL( SwFlySaveArr, SwFlySavePtr, 0 ) typedef std::deque< SwListEntry > SwListArr; struct DocPageInformation diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 4f5cac8528d8..d5c19d868c13 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -108,7 +108,7 @@ void Writer_Impl::InsertBkmk(const ::sw::mark::IMark& rBkmk) SvPtrarr* pArr = pBkmkNodePos->Get( nNd ); if( !pArr ) { - pArr = new SvPtrarr( 1, 4 ); + pArr = new SvPtrarr( 1 ); pBkmkNodePos->Insert( nNd, pArr ); } @@ -121,7 +121,7 @@ void Writer_Impl::InsertBkmk(const ::sw::mark::IMark& rBkmk) pArr = pBkmkNodePos->Get( nNd ); if( !pArr ) { - pArr = new SvPtrarr( 1, 4 ); + pArr = new SvPtrarr( 1 ); pBkmkNodePos->Insert( nNd, pArr ); } pArr->Insert( p, pArr->Count() ); @@ -473,7 +473,7 @@ void Writer::_AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ) { if (!m_pImpl->pFontRemoveLst) { - m_pImpl->pFontRemoveLst = new SvPtrarr( 0, 10 ); + m_pImpl->pFontRemoveLst = new SvPtrarr( 0 ); } void* p = (void*)pItem; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 86e9a4a02fe6..93eb6368a898 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -857,7 +857,7 @@ void WW8Export::AppendFlyInFlys(const sw::Frame& rFrmFmt, MSWord_SdrAttrIter::MSWord_SdrAttrIter( MSWordExportBase& rWr, const EditTextObject& rEditObj, sal_uInt8 nTyp ) : MSWordAttrIter( rWr ), pEditObj(&rEditObj), pEditPool(0), - aTxtAtrArr(), aChrTxtAtrArr( 0, 4 ), aChrSetArr( 0, 4 ), + aTxtAtrArr(), aChrTxtAtrArr( 0 ), aChrSetArr( 0 ), mnTyp(nTyp) { NextPara( 0 ); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 21dc7c71be1c..8f4d6cdea5c1 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1893,7 +1893,7 @@ void MSWordExportBase::WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader ) // WW8_WrPlcFtnEdn ist die Klasse fuer Fuss- und Endnoten //------------------------------------------------------------------------------ WW8_WrPlcSubDoc::WW8_WrPlcSubDoc() - : aCntnt( 0, 16 ), pTxtPos( 0 ) + : aCntnt( 0 ), pTxtPos( 0 ) { } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index c5b7afbe0f45..083854f84cca 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -229,7 +229,7 @@ public: SV_IMPL_PTRARR( WW8_WrFkpPtrs, WW8_FkpPtr ) typedef WW8_WrPc* WW8_WrPcPtr; -SV_DECL_PTRARR_DEL( WW8_WrPcPtrs, WW8_WrPcPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( WW8_WrPcPtrs, WW8_WrPcPtr, 4 ) SV_IMPL_PTRARR( WW8_WrPcPtrs, WW8_WrPcPtr ) static void WriteDop( WW8Export& rWrt ) @@ -1377,7 +1377,7 @@ void WW8_WrtBookmarks::MoveFieldMarks(sal_uLong nFrom, sal_uLong nTo) void WW8Export::AppendBookmarks( const SwTxtNode& rNd, xub_StrLen nAktPos, xub_StrLen nLen ) { - SvPtrarr aArr( 8, 8 ); + SvPtrarr aArr( 8 ); sal_uInt16 nCntnt; xub_StrLen nAktEnd = nAktPos + nLen; if( GetWriter().GetBookmarks( rNd, nAktPos, nAktEnd, aArr )) diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index c886e22a9358..a1827bf41264 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1215,7 +1215,7 @@ public: }; typedef WW8_WrFkp* WW8_FkpPtr; // Plc fuer Chpx und Papx ( incl PN-Plc ) -SV_DECL_PTRARR( WW8_WrFkpPtrs, WW8_FkpPtr, 4, 4 ) +SV_DECL_PTRARR( WW8_WrFkpPtrs, WW8_FkpPtr, 4 ) class WW8_WrPlcPn // Plc fuer Page Numbers { diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 989a5dbba71f..98bd41092fc7 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -148,8 +148,8 @@ typedef WW8LFOInfo* WW8LFOInfo_Ptr; struct WW8OleMap; typedef WW8OleMap* WW8OleMap_Ptr; -SV_DECL_PTRARR_DEL(WW8LFOInfos,WW8LFOInfo_Ptr,16,16) -SV_DECL_PTRARR_SORT_DEL(WW8OleMaps, WW8OleMap_Ptr,16,16) +SV_DECL_PTRARR_DEL(WW8LFOInfos,WW8LFOInfo_Ptr,16) +SV_DECL_PTRARR_SORT_DEL(WW8OleMaps, WW8OleMap_Ptr,16) class WW8Reader : public StgReader { diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index b72fcd55ab51..adb44728a292 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -97,7 +97,7 @@ public: typedef WW8SelBoxInfo* WW8SelBoxInfoPtr; -SV_DECL_PTRARR_DEL(WW8MergeGroups, WW8SelBoxInfoPtr, 16,16) +SV_DECL_PTRARR_DEL(WW8MergeGroups, WW8SelBoxInfoPtr, 16) SV_IMPL_PTRARR(WW8MergeGroups, WW8SelBoxInfoPtr) struct WW8TabBandDesc diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 5e54d6bd8b1b..decfcb8f7151 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -273,7 +273,7 @@ TYPEINIT1( SwXMLConditionContext_Impl, XMLTextStyleContext ); // --------------------------------------------------------------------- typedef SwXMLConditionContext_Impl *SwXMLConditionContextPtr; -SV_DECL_PTRARR( SwXMLConditions_Impl, SwXMLConditionContextPtr, 5, 2 ) +SV_DECL_PTRARR( SwXMLConditions_Impl, SwXMLConditionContextPtr, 5 ) class SwXMLTextStyleContext_Impl : public XMLTextStyleContext { diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 0a77c1b03c79..64b051f9fadf 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -105,7 +105,7 @@ sal_Int32 SwXMLTableColumnCmpWidth_Impl( const SwXMLTableColumn_Impl& r1, // --------------------------------------------------------------------- typedef SwXMLTableColumn_Impl *SwXMLTableColumnPtr; -SV_DECL_PTRARR_SORT_DEL( SwXMLTableColumns_Impl, SwXMLTableColumnPtr, 5, 5 ) +SV_DECL_PTRARR_SORT_DEL( SwXMLTableColumns_Impl, SwXMLTableColumnPtr, 5 ) SV_IMPL_OP_PTRARR_SORT( SwXMLTableColumns_Impl, SwXMLTableColumnPtr ) DECLARE_CONTAINER_SORT( SwXMLTableColumnsSortByWidth_Impl, diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 43a284b60d14..cda279eca911 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -287,7 +287,7 @@ inline void SwXMLTableCell_Impl::Dispose() // --------------------------------------------------------------------- typedef SwXMLTableCell_Impl* SwXMLTableCellPtr; -SV_DECL_PTRARR_DEL(SwXMLTableCells_Impl,SwXMLTableCellPtr,5,5) +SV_DECL_PTRARR_DEL(SwXMLTableCells_Impl,SwXMLTableCellPtr,5) SV_IMPL_PTRARR(SwXMLTableCells_Impl,SwXMLTableCellPtr) class SwXMLTableRow_Impl @@ -1271,7 +1271,7 @@ public: typedef SwXMLTableRow_Impl* SwXMLTableRowPtr; -SV_DECL_PTRARR_DEL(SwXMLTableRows_Impl,SwXMLTableRowPtr,5,5) +SV_DECL_PTRARR_DEL(SwXMLTableRows_Impl,SwXMLTableRowPtr,5) SV_IMPL_PTRARR(SwXMLTableRows_Impl,SwXMLTableRowPtr) SwXMLTableCell_Impl *SwXMLTableContext::GetCell( sal_uInt32 nRow, diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 3cf79b4077cf..87616026c93e 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -336,7 +336,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) pSh->SetNewDoc(); // Avoid performance problems // Remember Flys of this site - SvPtrarr aFlyArr(0, 5); + SvPtrarr aFlyArr(0); if( ENV_NEWDOC != nMode && !bEnvChange ) pSh->GetPageObjs( aFlyArr ); diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx index ba73043798bd..b6b29ab965cf 100644 --- a/sw/source/ui/app/mainwn.cxx +++ b/sw/source/ui/app/mainwn.cxx @@ -70,7 +70,7 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue, SwProgress *pProgress = 0; if ( !pProgressContainer ) - pProgressContainer = new SvPtrarr( 2, 2 ); + pProgressContainer = new SvPtrarr( 2 ); else { if ( 0 != (pProgress = lcl_SwFindProgress( pDocShell )) ) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 5a7f3dcf95da..49104bf098ce 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -176,7 +176,7 @@ struct _DB_Column }; typedef _DB_Column* _DB_ColumnPtr; -SV_DECL_PTRARR_DEL( _DB_Columns, _DB_ColumnPtr, 32, 32 ) +SV_DECL_PTRARR_DEL( _DB_Columns, _DB_ColumnPtr, 32 ) SV_IMPL_PTRARR( _DB_Columns, _DB_ColumnPtr ) SV_IMPL_OP_PTRARR_SORT( SwInsDBColumns, SwInsDBColumnPtr ) @@ -1025,7 +1025,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, ++nRows; // prepare the array for the selected columns - SwInsDBColumns_SAR aColFlds( 255 >= nCols ? (sal_uInt8)nCols : 255, 5 ); + SwInsDBColumns_SAR aColFlds( 255 >= nCols ? (sal_uInt8)nCols : 255 ); for( n = 0; n < nCols; ++n ) { sal_uInt16 nFndPos; diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index 4e025dd1316b..27faa2a4c587 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -74,7 +74,7 @@ struct SwConnectionData }; typedef SwConnectionData* SwConnectionDataPtr; -SV_DECL_PTRARR_DEL( SwConnectionArr, SwConnectionDataPtr, 32, 32 ) +SV_DECL_PTRARR_DEL( SwConnectionArr, SwConnectionDataPtr, 32 ) SV_IMPL_PTRARR( SwConnectionArr, SwConnectionDataPtr ) class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener > diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 284ee74ed0c8..44a627143654 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -823,7 +823,7 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG ) // are copied (ClearRedo!) const SwSectionFmts& rDocFmts = rSh.GetDoc()->GetSections(); - SwSectionFmts aOrigArray( 0, 5 ); + SwSectionFmts aOrigArray( 0 ); aOrigArray.Insert( &rDocFmts, 0 ); rSh.StartAllAction(); @@ -1148,7 +1148,7 @@ IMPL_LINK( SwEditRegionDlg, OptionsHdl, PushButton *, EMPTYARG ) aSet.Put( pSectRepr->GetLRSpace() ); const SwSectionFmts& rDocFmts = rSh.GetDoc()->GetSections(); - SwSectionFmts aOrigArray( 0, 5 ); + SwSectionFmts aOrigArray( 0 ); aOrigArray.Insert( &rDocFmts, 0 ); SwSectionFmt* pFmt = aOrigArray[pSectRepr->GetArrPos()]; diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index 2fa3c324daeb..b3e81a9e9267 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -82,7 +82,7 @@ struct TextBlockInfo_Impl String sGroupName; }; typedef TextBlockInfo_Impl* TextBlockInfo_ImplPtr; -SV_DECL_PTRARR_DEL( TextBlockInfoArr, TextBlockInfo_ImplPtr, 0, 4 ) +SV_DECL_PTRARR_DEL( TextBlockInfoArr, TextBlockInfo_ImplPtr, 0 ) SV_IMPL_PTRARR( TextBlockInfoArr, TextBlockInfo_ImplPtr ) SV_IMPL_REF( SwDocShell ) diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx index 3fdab60bd00b..79dbce3e089c 100644 --- a/sw/source/ui/envelp/labimp.hxx +++ b/sw/source/ui/envelp/labimp.hxx @@ -111,7 +111,7 @@ public: }; -SV_DECL_PTRARR_DEL( SwLabRecs, SwLabRec*, 110, 10 ) +SV_DECL_PTRARR_DEL( SwLabRecs, SwLabRec*, 110 ) #endif diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 9b7485cf9a62..7b879f9fa99f 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -86,7 +86,7 @@ struct SwInsDBColumn }; typedef SwInsDBColumn* SwInsDBColumnPtr; -SV_DECL_PTRARR_SORT_DEL( SwInsDBColumns, SwInsDBColumnPtr, 32, 32 ) +SV_DECL_PTRARR_SORT_DEL( SwInsDBColumns, SwInsDBColumnPtr, 32 ) class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index 727191d1b068..7cb847327f06 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.hxx @@ -52,7 +52,7 @@ struct AutoTextGroup typedef AutoTextGroup* AutoTextGroupPtr; -SV_DECL_PTRARR(AutoTextGroups, AutoTextGroupPtr, 4, 4) +SV_DECL_PTRARR(AutoTextGroups, AutoTextGroupPtr, 4) class SwGlossaryList : public AutoTimer { diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index abb955da098c..81d678b20b91 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -63,18 +63,18 @@ struct SwRedlineDataParent }; typedef SwRedlineDataParent* SwRedlineDataParentPtr; -SV_DECL_PTRARR_DEL(SwRedlineDataParentArr, SwRedlineDataParentPtr, 10, 20) +SV_DECL_PTRARR_DEL(SwRedlineDataParentArr, SwRedlineDataParentPtr, 10) -SV_DECL_PTRARR_SORT(SwRedlineDataParentSortArr, SwRedlineDataParentPtr, 10, 20) +SV_DECL_PTRARR_SORT(SwRedlineDataParentSortArr, SwRedlineDataParentPtr, 10) typedef SwRedlineDataChild* SwRedlineDataChildPtr; -SV_DECL_PTRARR_DEL(SwRedlineDataChildArr, SwRedlineDataChildPtr, 4, 4) +SV_DECL_PTRARR_DEL(SwRedlineDataChildArr, SwRedlineDataChildPtr, 4) typedef SvLBoxEntry* SvLBoxEntryPtr; -SV_DECL_PTRARR(SvLBoxEntryArr, SvLBoxEntryPtr, 100, 100) +SV_DECL_PTRARR(SvLBoxEntryArr, SvLBoxEntryPtr, 100) class SW_DLLPUBLIC SwRedlineAcceptDlg { diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index ca006c2bc940..15103d0b6f49 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -66,7 +66,7 @@ namespace sfx2 *************************************************************************/ class SectRepr; typedef SectRepr* SectReprPtr; -SV_DECL_PTRARR_SORT( SectReprArr, SectReprPtr, 0, 4 ) +SV_DECL_PTRARR_SORT( SectReprArr, SectReprPtr, 0 ) class SwEditRegionDlg : public SfxModalDialog { diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 9788146dde63..d0f718caa5f8 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -38,7 +38,7 @@ class SwBoxEntry; class Window; -SV_DECL_PTRARR_DEL(SwEntryLst, SwBoxEntry*, 10, 10) +SV_DECL_PTRARR_DEL(SwEntryLst, SwBoxEntry*, 10) /*-------------------------------------------------------------------- Description: SwBoxEntry diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx index 5f2f87009da6..cfb846fafc2b 100644 --- a/sw/source/ui/inc/uinums.hxx +++ b/sw/source/ui/inc/uinums.hxx @@ -39,7 +39,7 @@ class SvStream; #define MAX_NUM_RULES 9 typedef SfxPoolItem* SfxPoolItemPtr; -SV_DECL_PTRARR_DEL( _SwNumFmtsAttrs, SfxPoolItemPtr, 5,0 ) +SV_DECL_PTRARR_DEL( _SwNumFmtsAttrs, SfxPoolItemPtr, 5 ) class SW_DLLPUBLIC SwNumRulesWithName { diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index 0e11b99e946a..5655b6c4fda2 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -56,7 +56,7 @@ class SdrObject; class SwView; typedef ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > * XSelectionChangeListenerPtr; -SV_DECL_PTRARR_DEL( SelectionChangeListenerArr, XSelectionChangeListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( SelectionChangeListenerArr, XSelectionChangeListenerPtr, 4 ) class SwXTextView : public ::com::sun::star::view::XSelectionSupplier, diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index b4fc42aa29e3..61c308b377d9 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -157,7 +157,7 @@ struct AutoMarkEntry bWord(sal_False){} }; typedef AutoMarkEntry* AutoMarkEntryPtr; -SV_DECL_PTRARR_DEL(AutoMarkEntryArr, AutoMarkEntryPtr, 0, 4) +SV_DECL_PTRARR_DEL(AutoMarkEntryArr, AutoMarkEntryPtr, 0) SV_IMPL_PTRARR(AutoMarkEntryArr, AutoMarkEntryPtr); typedef ::svt::EditBrowseBox SwEntryBrowseBox_Base; diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 1fd421c1a105..32a383fb895f 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -105,7 +105,7 @@ using namespace ::com::sun::star::container; #define NAVI_BOOKMARK_DELIM (sal_Unicode)1 typedef SwContent* SwContentPtr; -SV_DECL_PTRARR_SORT_DEL( SwContentArr, SwContentPtr, 0,4) +SV_DECL_PTRARR_SORT_DEL( SwContentArr, SwContentPtr, 0 ) SV_IMPL_OP_PTRARR_SORT(SwContentArr, SwContentPtr) sal_Bool SwContentTree::bIsInDrag = sal_False; diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index 9ada864e4e3d..485406f3b1cb 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -305,7 +305,7 @@ void SwGlossaryList::Update() { std::vector<String> aFoundGroupNames; std::vector<String*> aFiles; - SvPtrarr aDateTimeArr( 16, 16 ); + SvPtrarr aDateTimeArr( 16 ); SWUnoHelper::UCB_GetFileListOfFolder( *(*pPathArr)[nPath], aFiles, &sExt, &aDateTimeArr ); diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 46435fb7e2d6..968c5f1f216b 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -1297,7 +1297,8 @@ extern "C" { //================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * ) + const sal_Char * pImplName, void * pServiceManager, + SAL_UNUSED_PARAMETER void * ) { void * pRet = 0; diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 22a6ef0b4496..48435782781e 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -448,7 +448,8 @@ void Impl2::setatt1( double _att1 )throw (::com::sun::star::uno::RuntimeExceptio } css::uno::Reference< css::uno::XInterface > SAL_CALL create( - css::uno::Reference< css::uno::XComponentContext > const &) + SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > + const &) SAL_THROW((css::uno::Exception)) { return static_cast< ::cppu::OWeakObject * >(new Impl); @@ -468,7 +469,8 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() { } css::uno::Reference< css::uno::XInterface > SAL_CALL create2( - css::uno::Reference< css::uno::XComponentContext > const &) + SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > + const &) SAL_THROW((css::uno::Exception)) { return static_cast< ::cppu::OWeakObject * >(new Impl2); diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index ae2272401d4d..0df13f51ca26 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -1183,7 +1183,8 @@ Sequence< OUString > Test_Impl::getSupportedServiceNames() // ... //================================================================================================== -static Reference< XInterface > SAL_CALL Test_Impl_create( const Reference< XMultiServiceFactory > & ) +static Reference< XInterface > SAL_CALL Test_Impl_create( + SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & ) { return Reference< XInterface >( (XBridgeTest *)new Test_Impl() ); } @@ -1193,7 +1194,8 @@ static Reference< XInterface > SAL_CALL Test_Impl_create( const Reference< XMult extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * ) + const sal_Char * pImplName, SAL_UNUSED_PARAMETER void * pServiceManager, + SAL_UNUSED_PARAMETER void * ) { void * pRet = 0; diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx index 4160e190062c..7a4f2e42e9d5 100644 --- a/tools/inc/tools/fsys.hxx +++ b/tools/inc/tools/fsys.hxx @@ -174,8 +174,7 @@ private: protected: // Implementation - FileStat( const void *pInfo, // CInfoPBRec - const void *pVolInfo ); // ParamBlockRec + FileStat( SAL_UNUSED_PARAMETER const void *pInfo ); // CInfoPBRec public: FileStat(); @@ -229,27 +228,18 @@ friend class FileCopier; private: TOOLS_DLLPRIVATE DirEntry( const rtl::OString& rInitName, - DirEntryFlag aDirFlag, - FSysPathStyle eStyle ); + DirEntryFlag aDirFlag ); friend class Dir; friend class FileStat; friend const char* ImpCheckDirEntry( const void* p ); - TOOLS_DLLPRIVATE FSysError ImpParseName( const rtl::OString& rIntiName, - FSysPathStyle eParser ); -#if defined(WNT) - TOOLS_DLLPRIVATE FSysError ImpParseOs2Name( const rtl::OString& rPfad, - FSysPathStyle eStyle ); -#else - TOOLS_DLLPRIVATE FSysError ImpParseUnixName( const rtl::OString& rPfad, - FSysPathStyle eStyle ); -#endif + TOOLS_DLLPRIVATE FSysError ImpParseName( const rtl::OString& rIntiName ); TOOLS_DLLPRIVATE const DirEntry* ImpGetTopPtr() const; TOOLS_DLLPRIVATE DirEntry* ImpGetTopPtr(); protected: - void ImpTrim( FSysPathStyle eStyle ); + void ImpTrim(); const rtl::OString& ImpTheName() const; DirEntryFlag ImpTheFlag() const { return eFlag; }; DirEntry* ImpChangeParent( DirEntry* pNewParent, sal_Bool bNormalize = sal_True ); diff --git a/tools/inc/tools/globname.hxx b/tools/inc/tools/globname.hxx index c6587cc5c12f..f0bf3e7a0625 100644 --- a/tools/inc/tools/globname.hxx +++ b/tools/inc/tools/globname.hxx @@ -41,12 +41,14 @@ struct ImpSvGlobalName sal_uInt8 szData[ 16 ]; sal_uInt16 nRefCount; + enum Empty { EMPTY }; + ImpSvGlobalName() { nRefCount = 0; } ImpSvGlobalName( const ImpSvGlobalName & rObj ); - ImpSvGlobalName( int ); + ImpSvGlobalName( Empty ); sal_Bool operator == ( const ImpSvGlobalName & rObj ) const; }; diff --git a/tools/inc/tools/link.hxx b/tools/inc/tools/link.hxx index 02187e339187..974119355359 100644 --- a/tools/inc/tools/link.hxx +++ b/tools/inc/tools/link.hxx @@ -66,7 +66,7 @@ typedef long (*PSTUB)( void*, void* ); long Class::Method( Class* pThis, ArgType ArgName ) #define IMPL_STATIC_LINK_NOINSTANCE( Class, Method, ArgType, ArgName ) \ - long Class::Method( Class*, ArgType ArgName ) + long Class::Method( SAL_UNUSED_PARAMETER Class*, ArgType ArgName ) #define LINK( Inst, Class, Member ) \ Link( (Class*)Inst, (PSTUB)&Class::LinkStub##Member ) diff --git a/tools/inc/tools/tenccvt.hxx b/tools/inc/tools/tenccvt.hxx index a5840d77b34d..e89136317a6d 100644 --- a/tools/inc/tools/tenccvt.hxx +++ b/tools/inc/tools/tenccvt.hxx @@ -29,7 +29,6 @@ #define _TOOLS_TENCCVT_HXX #include <rtl/textenc.h> -#include <tools/solar.h> #include "tools/toolsdllapi.h" // ---------------------------------------- @@ -51,8 +50,8 @@ TOOLS_DLLPUBLIC rtl_TextEncoding GetExtendedTextEncoding( rtl_TextEncoding eEnco // is returned (normally windows-1252). TOOLS_DLLPUBLIC rtl_TextEncoding GetOneByteTextEncoding( rtl_TextEncoding eEncoding ); -TOOLS_DLLPUBLIC rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 nVersion = SOFFICE_FILEFORMAT_50 ); -TOOLS_DLLPUBLIC rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 nVersion = SOFFICE_FILEFORMAT_50 ); +TOOLS_DLLPUBLIC rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding ); +TOOLS_DLLPUBLIC rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding ); /* * Given a Unicode character, return a legacy Microsoft Encoding which diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 2f726d03fe66..df3f16392a01 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -335,15 +335,9 @@ rtl::OString ImplCutPath( const rtl::OString& rStr, sal_Int32 nMax, char cAccDel return aCutPath.makeStringAndClear(); } -#if defined(WNT) -/************************************************************************* -|* -|* DirEntry::ImpParseOs2Name() -|* -*************************************************************************/ - -FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eStyle ) +FSysError DirEntry::ImpParseName( const rtl::OString& rPfad ) { +#if defined(WNT) DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); // die einzelnen Namen auf einen Stack packen @@ -374,7 +368,7 @@ FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eS if ( aPfad.GetChar(nPos) == '\\' || aPfad.GetChar(nPos) == '/' ) break; aName = rtl::OUStringToOString(aPfad.Copy( 2, nPos-2 ), osl_getThreadTextEncoding()); - aStack.Push( new DirEntry( aName, FSYS_FLAG_ABSROOT, eStyle ) ); + aStack.Push( new DirEntry( aName, FSYS_FLAG_ABSROOT ) ); } // ist der Name die Root des aktuellen Drives? else if ( nPos == 0 && aPfad.Len() > 0 && @@ -402,7 +396,7 @@ FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eS return FSYS_ERR_MISPLACEDCHAR; } // Root-Directory des Drive - aStack.Push( new DirEntry( aName, FSYS_FLAG_ABSROOT, eStyle ) ); + aStack.Push( new DirEntry( aName, FSYS_FLAG_ABSROOT ) ); } else { @@ -419,7 +413,7 @@ FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eS // liegt jetzt nichts mehr auf dem Stack? if ( aStack.Empty() ) - aStack.Push( new DirEntry( aName, FSYS_FLAG_RELROOT, eStyle ) ); + aStack.Push( new DirEntry( aName, FSYS_FLAG_RELROOT ) ); } } @@ -459,7 +453,7 @@ FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eS else { // normalen Entries kommen auf den Stack - DirEntry *pNew = new DirEntry( aName, FSYS_FLAG_NORMAL, eStyle ); + DirEntry *pNew = new DirEntry( aName, FSYS_FLAG_NORMAL ); if ( !pNew->IsValid() ) { aName = rPfad; @@ -512,27 +506,115 @@ FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eS if ( nErr ) aName = rPfad; return nErr; -} -#endif +#else + DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); -/************************************************************************* -|* -|* DirEntry::ImpParseName() -|* -*************************************************************************/ + // die einzelnen Namen auf einen Stack packen + DirEntryStack aStack; + rtl::OString aPfad(rPfad); + do + { + // den Namen vor dem ersten "/" abspalten, + // falls '/' am Anfang, ist der Name '/', + // der Rest immer ohne die fuehrenden '/'. + // den ersten '/' suchen + sal_uInt16 nPos; + for ( nPos = 0; + nPos < aPfad.getLength() && aPfad[nPos] != '/'; + nPos++ ) + /* do nothing */; -FSysError DirEntry::ImpParseName( const rtl::OString& rbInitName, - FSysPathStyle eStyle ) -{ - if ( eStyle == FSYS_STYLE_HOST ) - eStyle = DEFSTYLE; + // ist der Name die Root des aktuellen Drives? + if ( nPos == 0 && !aPfad.isEmpty() && ( aPfad[0] == '/' ) ) + { + // Root-Directory des aktuellen Drives + aStack.Push( new DirEntry( FSYS_FLAG_ABSROOT ) ); + } + else + { + // den Namen ohne Trenner abspalten + aName = aPfad.copy(0, nPos); -#if defined(WNT) - return ImpParseOs2Name( rbInitName, eStyle ); -#else - return ImpParseUnixName( rbInitName, eStyle ); + // stellt der Name die aktuelle Directory dar? + if ( aName == "." ) + /* do nothing */; + +#ifdef UNX + // stellt der Name das User-Dir dar? + else if ( aName == "~" ) + { + DirEntry aHome( String( (const char *) getenv( "HOME" ), osl_getThreadTextEncoding()) ); + for ( sal_uInt16 n = aHome.Level(); n; --n ) + aStack.Push( new DirEntry( aHome[ (sal_uInt16) n-1 ] ) ); + } #endif + // stellt der Name die Parent-Directory dar? + else if ( aName == ".." ) + { + // ist nichts, ein Parent oder eine relative Root + // auf dem Stack? + if ( ( aStack.Empty() ) || ( aStack.Top()->eFlag == FSYS_FLAG_PARENT ) ) + { + // fuehrende Parents kommen auf den Stack + aStack.Push( new DirEntry(rtl::OString(), FSYS_FLAG_PARENT) ); + } + // ist es eine absolute Root + else if ( aStack.Top()->eFlag == FSYS_FLAG_ABSROOT ) + { + // die hat keine Parent-Directory + return FSYS_ERR_NOTEXISTS; + } + else + // sonst hebt der Parent den TOS auf + delete aStack.Pop(); + } + else + { + DirEntry *pNew = NULL; + // normalen Entries kommen auf den Stack + pNew = new DirEntry( aName, FSYS_FLAG_NORMAL ); + if ( !pNew->IsValid() ) + { + aName = rPfad; + ErrCode eErr = pNew->GetError(); + delete pNew; + return eErr; + } + aStack.Push( pNew ); + } + } + + // den Restpfad bestimmen + aPfad = nPos < aPfad.getLength() + ? aPfad.copy(nPos + 1) : rtl::OString(); + while ( !aPfad.isEmpty() && ( aPfad[0] == '/' ) ) + aPfad = aPfad.copy(1); + } + while (!aPfad.isEmpty()); + + // Haupt-Entry (selbst) zuweisen + if ( aStack.Empty() ) + { + eFlag = FSYS_FLAG_CURRENT; + aName = rtl::OString(); + } + else + { + eFlag = aStack.Top()->eFlag; + aName = aStack.Top()->aName; + delete aStack.Pop(); + } + + // die Parent-Entries vom Stack holen + DirEntry** pTemp = &pParent; + while ( !aStack.Empty() ) + { + *pTemp = aStack.Pop(); + pTemp = &( (*pTemp)->pParent ); + } + return FSYS_ERR_OK; +#endif } /************************************************************************* @@ -559,7 +641,7 @@ static FSysPathStyle GetStyle( FSysPathStyle eStyle ) |* *************************************************************************/ -void DirEntry::ImpTrim( FSysPathStyle /* eStyle */ ) +void DirEntry::ImpTrim() { // Wildcards werden nicht geclipt if ( ( aName.indexOf( '*' ) != -1 ) || @@ -588,8 +670,7 @@ void DirEntry::ImpTrim( FSysPathStyle /* eStyle */ ) |* *************************************************************************/ -DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag, - FSysPathStyle eStyle ) : +DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag ) : #ifdef FEAT_FSYS_DOUBLESPEED pStat( 0 ), #endif @@ -601,7 +682,7 @@ DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag, eFlag = eDirFlag; nError = FSYS_ERR_OK; - ImpTrim( eStyle ); + ImpTrim(); } /************************************************************************* @@ -683,7 +764,7 @@ DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle ) #endif } - nError = ImpParseName( aTmpName, eStyle ); + nError = ImpParseName( aTmpName ); if ( nError != FSYS_ERR_OK ) eFlag = FSYS_FLAG_INVALID; @@ -729,7 +810,7 @@ DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle ) } #endif - nError = ImpParseName( aTmpName, eStyle ); + nError = ImpParseName( aTmpName ); if ( nError != FSYS_ERR_OK ) eFlag = FSYS_FLAG_INVALID; @@ -1700,125 +1781,6 @@ const DirEntry &DirEntry::operator[]( sal_uInt16 nParentLevel ) const return *pRes; } -#if !defined(WNT) -/************************************************************************* -|* -|* DirEntry::ImpParseUnixName() -|* -*************************************************************************/ - -FSysError DirEntry::ImpParseUnixName( const rtl::OString& rPfad, FSysPathStyle eStyle ) -{ - DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); - - // die einzelnen Namen auf einen Stack packen - DirEntryStack aStack; - rtl::OString aPfad(rPfad); - do - { - // den Namen vor dem ersten "/" abspalten, - // falls '/' am Anfang, ist der Name '/', - // der Rest immer ohne die fuehrenden '/'. - // den ersten '/' suchen - sal_uInt16 nPos; - for ( nPos = 0; - nPos < aPfad.getLength() && aPfad[nPos] != '/'; - nPos++ ) - /* do nothing */; - - // ist der Name die Root des aktuellen Drives? - if ( nPos == 0 && !aPfad.isEmpty() && ( aPfad[0] == '/' ) ) - { - // Root-Directory des aktuellen Drives - aStack.Push( new DirEntry( FSYS_FLAG_ABSROOT ) ); - } - else - { - // den Namen ohne Trenner abspalten - aName = aPfad.copy(0, nPos); - - // stellt der Name die aktuelle Directory dar? - if ( aName == "." ) - /* do nothing */; - -#ifdef UNX - // stellt der Name das User-Dir dar? - else if ( aName == "~" ) - { - DirEntry aHome( String( (const char *) getenv( "HOME" ), osl_getThreadTextEncoding()) ); - for ( sal_uInt16 n = aHome.Level(); n; --n ) - aStack.Push( new DirEntry( aHome[ (sal_uInt16) n-1 ] ) ); - } -#endif - // stellt der Name die Parent-Directory dar? - else if ( aName == ".." ) - { - // ist nichts, ein Parent oder eine relative Root - // auf dem Stack? - if ( ( aStack.Empty() ) || ( aStack.Top()->eFlag == FSYS_FLAG_PARENT ) ) - { - // fuehrende Parents kommen auf den Stack - aStack.Push( new DirEntry(rtl::OString(), FSYS_FLAG_PARENT, eStyle) ); - } - // ist es eine absolute Root - else if ( aStack.Top()->eFlag == FSYS_FLAG_ABSROOT ) - { - // die hat keine Parent-Directory - return FSYS_ERR_NOTEXISTS; - } - else - // sonst hebt der Parent den TOS auf - delete aStack.Pop(); - } - else - { - DirEntry *pNew = NULL; - // normalen Entries kommen auf den Stack - pNew = new DirEntry( aName, FSYS_FLAG_NORMAL, eStyle ); - if ( !pNew->IsValid() ) - { - aName = rPfad; - ErrCode eErr = pNew->GetError(); - delete pNew; - return eErr; - } - aStack.Push( pNew ); - } - } - - // den Restpfad bestimmen - aPfad = nPos < aPfad.getLength() - ? aPfad.copy(nPos + 1) : rtl::OString(); - while ( !aPfad.isEmpty() && ( aPfad[0] == '/' ) ) - aPfad = aPfad.copy(1); - } - while (!aPfad.isEmpty()); - - // Haupt-Entry (selbst) zuweisen - if ( aStack.Empty() ) - { - eFlag = FSYS_FLAG_CURRENT; - aName = rtl::OString(); - } - else - { - eFlag = aStack.Top()->eFlag; - aName = aStack.Top()->aName; - delete aStack.Pop(); - } - - // die Parent-Entries vom Stack holen - DirEntry** pTemp = &pParent; - while ( !aStack.Empty() ) - { - *pTemp = aStack.Pop(); - pTemp = &( (*pTemp)->pParent ); - } - - return FSYS_ERR_OK; -} -#endif - #define MAX_EXT_MAX 250 #define MAX_LEN_MAX 255 #define INVALID_CHARS_DEF "\\/\"':|^<>?*" diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 9cea604c99a4..b53caac54763 100644 --- a/tools/source/fsys/unx.cxx +++ b/tools/source/fsys/unx.cxx @@ -324,7 +324,7 @@ sal_uInt16 DirReader_Impl::Read() 0 == strcmp( pDosEntry->d_name, "." ) ? FSYS_FLAG_CURRENT : 0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT : FSYS_FLAG_NORMAL; - DirEntry *pTemp = new DirEntry(rtl::OString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX); + DirEntry *pTemp = new DirEntry(rtl::OString(pDosEntry->d_name), eFlag); if ( pParent ) pTemp->ImpChangeParent( new DirEntry( *pParent ), sal_False); FileStat aStat( *pTemp ); @@ -356,7 +356,7 @@ sal_uInt16 DirReader_Impl::Read() |* *************************************************************************/ -FileStat::FileStat( const void *, const void * ): +FileStat::FileStat( const void * ): aDateCreated(0), aTimeCreated(0), aDateModified(0), @@ -371,7 +371,7 @@ FileStat::FileStat( const void *, const void * ): |* FileStat::Update() |* *************************************************************************/ -sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool ) +sal_Bool FileStat::Update( const DirEntry& rDirEntry, SAL_UNUSED_PARAMETER sal_Bool ) { nSize = 0; diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx index 932973cb82e5..98784801a026 100644 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -238,7 +238,7 @@ USHORT DirReader_Impl::Init() { sDrive[0] = c; sRoot[0] = c; - DirEntry* pDrive = new DirEntry( sDrive, FSYS_FLAG_VOLUME, FSYS_STYLE_HOST ); + DirEntry* pDrive = new DirEntry( sDrive, FSYS_FLAG_VOLUME ); if ( pDir->aNameMask.Matches( String(rtl::OStringToOUString(sDrive, osl_getThreadTextEncoding())) ) && GetDriveType( sRoot ) != 1 ) { if ( pDir->pStatLst ) //Status fuer Sort gewuenscht? @@ -313,7 +313,7 @@ USHORT DirReader_Impl::Read() : 0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT : FSYS_FLAG_NORMAL; DirEntry *pTemp = new DirEntry( rtl::OString(pDosEntry->d_name), - eFlag, FSYS_STYLE_NTFS ); + eFlag ); #ifdef FEAT_FSYS_DOUBLESPEED pTemp->ImpSetStat( new FileStat( (void*) pDosDir, (void*) 0 ) ); #endif @@ -404,8 +404,7 @@ void FileStat::ImpInit( void* p ) |* *************************************************************************/ -FileStat::FileStat( const void *pInfo, // struct dirent - const void * ): // dummy +FileStat::FileStat( const void *pInfo ): // struct dirent aDateCreated(0), aTimeCreated(0), aDateModified(0), diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx index 12333c6a94f5..6a57099b0db7 100644 --- a/tools/source/ref/globname.cxx +++ b/tools/source/ref/globname.cxx @@ -44,7 +44,7 @@ ImpSvGlobalName::ImpSvGlobalName( const ImpSvGlobalName & rObj ) } /************** class ImpSvGlobalName ************************************/ -ImpSvGlobalName::ImpSvGlobalName( int ) +ImpSvGlobalName::ImpSvGlobalName( Empty ) { nRefCount = 1; memset( szData, 0, sizeof( szData ) ); @@ -63,7 +63,7 @@ sal_Bool ImpSvGlobalName::operator == ( const ImpSvGlobalName & rObj ) const *************************************************************************/ SvGlobalName::SvGlobalName() { - static ImpSvGlobalName aNoName( 0 ); + static ImpSvGlobalName aNoName( ImpSvGlobalName::EMPTY ); pImp = &aNoName; pImp->nRefCount++; diff --git a/tools/source/string/tenccvt.cxx b/tools/source/string/tenccvt.cxx index 7abb0c4b5327..6022443f6421 100644 --- a/tools/source/string/tenccvt.cxx +++ b/tools/source/string/tenccvt.cxx @@ -83,14 +83,14 @@ rtl_TextEncoding GetOneByteTextEncoding( rtl_TextEncoding eEncoding ) // ----------------------------------------------------------------------- -rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 /* nVersion = SOFFICE_FILEFORMAT_50 */ ) +rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding ) { return GetExtendedCompatibilityTextEncoding( GetOneByteTextEncoding( eEncoding ) ); } // ----------------------------------------------------------------------- -rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 /* nVersion = SOFFICE_FILEFORMAT_50 */ ) +rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding ) { return GetExtendedTextEncoding( GetOneByteTextEncoding( eEncoding ) ); } diff --git a/unotools/inc/unotools/loghelper.hxx b/unotools/inc/unotools/loghelper.hxx index bae5c7ed09c4..24f66bd91d38 100644 --- a/unotools/inc/unotools/loghelper.hxx +++ b/unotools/inc/unotools/loghelper.hxx @@ -30,14 +30,7 @@ namespace css = ::com::sun::star; -class LogHelper -{ -public: - LogHelper(); - ~LogHelper(); - - static void logIt(const css::uno::Exception&){} -}; +namespace LogHelper { inline void logIt(const css::uno::Exception& ex) { @@ -48,6 +41,8 @@ inline void logIt(const css::uno::Exception& ex) OSL_FAIL(::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); } +} + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/inc/unotools/ucbstreamhelper.hxx b/unotools/inc/unotools/ucbstreamhelper.hxx index 8c20fd506c7b..f309b018cff8 100644 --- a/unotools/inc/unotools/ucbstreamhelper.hxx +++ b/unotools/inc/unotools/ucbstreamhelper.hxx @@ -67,13 +67,13 @@ namespace utl { public: static SvStream* CreateStream( const String& rFileName, StreamMode eOpenMode, - UcbLockBytesHandler* pHandler=0, sal_Bool bForceSynchron=sal_True ); + UcbLockBytesHandler* pHandler=0 ); static SvStream* CreateStream( const String& rFileName, StreamMode eOpenMode, NS_UNO::Reference < NS_TASK::XInteractionHandler >, - UcbLockBytesHandler* pHandler=0, sal_Bool bForceSynchron=sal_True ); + UcbLockBytesHandler* pHandler=0 ); static SvStream* CreateStream( const String& rFileName, StreamMode eOpenMode, sal_Bool bFileExists, - UcbLockBytesHandler* pHandler=0, sal_Bool bForceSynchron=sal_True ); + UcbLockBytesHandler* pHandler=0 ); static SvStream* CreateStream( NS_UNO::Reference < NS_IO::XInputStream > xStream ); static SvStream* CreateStream( NS_UNO::Reference < NS_IO::XStream > xStream ); static SvStream* CreateStream( NS_UNO::Reference < NS_IO::XInputStream > xStream, sal_Bool bCloseStream ); diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index cabdaf7582da..b65a1cce01b5 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1491,9 +1491,10 @@ FontToSubsFontConverter CreateFontToSubsFontConverter( // ----------------------------------------------------------------------- -void DestroyFontToSubsFontConverter( FontToSubsFontConverter ) +void DestroyFontToSubsFontConverter( + SAL_UNUSED_PARAMETER FontToSubsFontConverter ) { - // nothing to do for now, because we use static ImplCvtChars + //TODO: nothing to do for now, because we use static ImplCvtChars } // ----------------------------------------------------------------------- diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx index da570ed39d1e..7f478f561a25 100644 --- a/unotools/source/ucbhelper/XTempFile.hxx +++ b/unotools/source/ucbhelper/XTempFile.hxx @@ -35,7 +35,6 @@ #include <com/sun/star/io/XTempFile.hpp> #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase5.hxx> #include <cppuhelper/propertysetmixin.hxx> @@ -142,7 +141,7 @@ public: static ::rtl::OUString getImplementationName_Static (); static ::com::sun::star::uno::Sequence < ::rtl::OUString > getSupportedServiceNames_Static(); - static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleComponentFactory > createServiceFactory_Static( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory ); + static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleComponentFactory > createServiceFactory_Static(); private: OTempFileService( OTempFileService & ); diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index a313a1fac18a..18bffcbd7c7a 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1591,7 +1591,7 @@ void UcbLockBytes::Cancel() } //---------------------------------------------------------------------------- -IMPL_LINK( UcbLockBytes, DataAvailHdl, void*, EMPTYARG ) +IMPL_LINK( UcbLockBytes, DataAvailHdl, SAL_UNUSED_PARAMETER void*, EMPTYARG ) { if ( hasInputStream_Impl() && m_xHandler.Is() ) m_xHandler->Handle( UcbLockBytesHandler::DATA_AVAILABLE, this ); diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index b042078145c7..d7ac3bcb62c7 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -53,7 +53,7 @@ namespace utl static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode, Reference < XInteractionHandler > xInteractionHandler, - UcbLockBytesHandler* pHandler, sal_Bool /*bForceSynchron*/, sal_Bool bEnsureFileExists ) + UcbLockBytesHandler* pHandler, sal_Bool bEnsureFileExists ) { SvStream* pStream = NULL; ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get(); @@ -150,23 +150,23 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode //============================================================================ SvStream* UcbStreamHelper::CreateStream( const String& rFileName, StreamMode eOpenMode, - UcbLockBytesHandler* pHandler, sal_Bool bForceSynchron ) + UcbLockBytesHandler* pHandler ) { - return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), pHandler, bForceSynchron, sal_True /* bEnsureFileExists */ ); + return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), pHandler, sal_True /* bEnsureFileExists */ ); } SvStream* UcbStreamHelper::CreateStream( const String& rFileName, StreamMode eOpenMode, Reference < XInteractionHandler > xInteractionHandler, - UcbLockBytesHandler* pHandler, sal_Bool bForceSynchron ) + UcbLockBytesHandler* pHandler ) { - return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler, pHandler, bForceSynchron, sal_True /* bEnsureFileExists */ ); + return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler, pHandler, sal_True /* bEnsureFileExists */ ); } SvStream* UcbStreamHelper::CreateStream( const String& rFileName, StreamMode eOpenMode, sal_Bool bFileExists, - UcbLockBytesHandler* pHandler, sal_Bool bForceSynchron ) + UcbLockBytesHandler* pHandler ) { - return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), pHandler, bForceSynchron, !bFileExists ); + return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), pHandler, !bFileExists ); } SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream ) diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 4301dff0c6d4..7866ca802f12 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -472,7 +472,7 @@ throw ( ::css::uno::RuntimeException ) return static_cast< ::cppu::OWeakObject * >( new OTempFileService(context) ); } -::css::uno::Reference < ::css::lang::XSingleComponentFactory > OTempFileService::createServiceFactory_Static( ::css::uno::Reference < ::css::lang::XMultiServiceFactory > const & ) +::css::uno::Reference < ::css::lang::XSingleComponentFactory > OTempFileService::createServiceFactory_Static() { return ::cppu::createSingleComponentFactory( XTempFile_createInstance, getImplementationName_Static(), getSupportedServiceNames_Static() ); } @@ -485,7 +485,8 @@ throw ( ::css::uno::RuntimeException ) * @return a component factory (generic uno interface) */ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL utl_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const sal_Char * pImplName, void * pServiceManager, + SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { void * pRet = 0; ::css::uno::Reference< ::css::lang::XMultiServiceFactory > xSMgr( @@ -493,7 +494,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL utl_component_getFactory( ::css::uno::Reference< ::css::lang::XSingleComponentFactory > xFactory; if (OTempFileService::getImplementationName_Static().compareToAscii( pImplName ) == 0) - xFactory = OTempFileService::createServiceFactory_Static ( xSMgr ); + xFactory = OTempFileService::createServiceFactory_Static(); if ( xFactory.is() ) { diff --git a/vigra/makefile.mk b/vigra/makefile.mk index db08373faf52..c8e4f7779809 100644 --- a/vigra/makefile.mk +++ b/vigra/makefile.mk @@ -50,6 +50,11 @@ TARFILE_NAME=vigra1.4.0 TARFILE_MD5=ea91f2fb4212a21d708aced277e6e85a PATCH_FILES=$(TARFILE_NAME).patch +# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h): +.IF "$(COM)" == "GCC" +PATCH_FILES += vigra1.4.0-unused-parameters.patch +.END + CONFIGURE_DIR= CONFIGURE_ACTION= diff --git a/vigra/vigra1.4.0-unused-parameters.patch b/vigra/vigra1.4.0-unused-parameters.patch new file mode 100644 index 000000000000..f32317865ea8 --- /dev/null +++ b/vigra/vigra1.4.0-unused-parameters.patch @@ -0,0 +1,31 @@ +--- misc/vigra1.4.0/include/vigra/basicimage.hxx 2012-01-19 22:49:11.232074631 +0100 ++++ misc/build/vigra1.4.0/include/vigra/basicimage.hxx 2012-01-19 22:48:12.997439136 +0100 +@@ -72,7 +72,7 @@ + difference_type offset_; + }; + +- static void initialize(BaseType &) {} ++ static void initialize(__attribute__ ((unused)) BaseType &) {} + + static reference dereference(BaseType const & d) + { return const_cast<reference>(*(*d.line_start_ + d.offset_)); } +--- misc/vigra1.4.0/include/vigra/diff2d.hxx 2012-01-19 22:49:11.280074335 +0100 ++++ misc/build/vigra1.4.0/include/vigra/diff2d.hxx 2012-01-19 22:49:00.129144170 +0100 +@@ -60,7 +60,7 @@ + typedef Diff const * pointer; + typedef std::random_access_iterator_tag iterator_category; + +- static void initialize(BaseType &) {} ++ static void initialize(__attribute__ ((unused)) BaseType &) {} + + static reference dereference(BaseType const & d) + { return d; } +@@ -102,7 +102,7 @@ + typedef Diff const * pointer; + typedef std::random_access_iterator_tag iterator_category; + +- static void initialize(BaseType & /*d*/) {} ++ static void initialize(__attribute__ ((unused)) BaseType & /*d*/) {} + + static reference dereference(BaseType const & d) + { return d; } diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx index 24e069222523..259b44cc4300 100644 --- a/xmlhelp/source/cxxhelp/provider/services.cxx +++ b/xmlhelp/source/cxxhelp/provider/services.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star; extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, - void * /*pRegistryKey*/ ) + SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 43dff8fd1c9c..c0f2dfa3fc1f 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -753,7 +753,7 @@ fileOpen(const char *URI) { } static void * -zipOpen(const char * /*URI*/) { +zipOpen(SAL_UNUSED_PARAMETER const char *) { rtl::OUString language,jar,path; if( ugblData->m_pInitial->get_eid().getLength() ) diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx index 7fd94e89409c..0d5a97022b4d 100644 --- a/xmloff/source/core/i18nmap.cxx +++ b/xmloff/source/core/i18nmap.cxx @@ -70,7 +70,7 @@ public: }; typedef SvI18NMapEntry_Impl *SvI18NMapEntry_ImplPtr; -SV_DECL_PTRARR_SORT_DEL( SvI18NMap_Impl, SvI18NMapEntry_ImplPtr, 20, 5 ) +SV_DECL_PTRARR_SORT_DEL( SvI18NMap_Impl, SvI18NMapEntry_ImplPtr, 20 ) SV_IMPL_OP_PTRARR_SORT( SvI18NMap_Impl, SvI18NMapEntry_ImplPtr ) // --------------------------------------------------------------------- diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 3b73a6ffee6a..2af9a831c162 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -223,7 +223,7 @@ public: }; typedef SvXMLImportContext *SvXMLImportContextPtr; -SV_DECL_PTRARR( SvXMLImportContexts_Impl, SvXMLImportContextPtr, 20, 5 ) +SV_DECL_PTRARR( SvXMLImportContexts_Impl, SvXMLImportContextPtr, 20 ) SV_IMPL_PTRARR( SvXMLImportContexts_Impl, SvXMLImportContextPtr ) SvXMLImportContext *SvXMLImport::CreateContext( sal_uInt16 nPrefix, diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx index 3ec2847e060c..d9f291a96321 100644 --- a/xmloff/source/core/xmltkmap.cxx +++ b/xmloff/source/core/xmltkmap.cxx @@ -73,7 +73,7 @@ public: }; typedef SvXMLTokenMapEntry_Impl *SvXMLTokenMapEntry_ImplPtr; -SV_DECL_PTRARR_SORT_DEL( SvXMLTokenMap_Impl, SvXMLTokenMapEntry_ImplPtr, 5, 5 ) +SV_DECL_PTRARR_SORT_DEL( SvXMLTokenMap_Impl, SvXMLTokenMapEntry_ImplPtr, 5 ) SV_IMPL_OP_PTRARR_SORT( SvXMLTokenMap_Impl, SvXMLTokenMapEntry_ImplPtr ) // --------------------------------------------------------------------- diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 2deb42136292..ea923d820d12 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -116,7 +116,7 @@ struct SvXMLEmbeddedTextEntry }; typedef SvXMLEmbeddedTextEntry* SvXMLEmbeddedTextEntryPtr; -SV_DECL_PTRARR_DEL( SvXMLEmbeddedTextEntryArr, SvXMLEmbeddedTextEntryPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( SvXMLEmbeddedTextEntryArr, SvXMLEmbeddedTextEntryPtr, 4 ) //------------------------------------------------------------------------- diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 25f88162befd..ea896d969022 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -70,7 +70,7 @@ struct SvXMLNumFmtEntry }; typedef SvXMLNumFmtEntry* SvXMLNumFmtEntryPtr; -SV_DECL_PTRARR_DEL( SvXMLNumFmtEntryArr, SvXMLNumFmtEntryPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( SvXMLNumFmtEntryArr, SvXMLNumFmtEntryPtr, 4 ) struct SvXMLEmbeddedElement { @@ -86,7 +86,7 @@ struct SvXMLEmbeddedElement }; typedef SvXMLEmbeddedElement* SvXMLEmbeddedElementPtr; -SV_DECL_PTRARR_SORT_DEL( SvXMLEmbeddedElementArr, SvXMLEmbeddedElementPtr, 0, 4 ) +SV_DECL_PTRARR_SORT_DEL( SvXMLEmbeddedElementArr, SvXMLEmbeddedElementPtr, 0 ) //------------------------------------------------------------------------- diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 12531da3f1d2..de1ce74e35fc 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -1086,8 +1086,7 @@ SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::~SvxXMLListLevelStyleLabelAl // --------------------------------------------------------------------- typedef SvxXMLListLevelStyleContext_Impl *SvxXMLListLevelStyleContext_ImplPtr; -SV_DECL_PTRARR( SvxXMLListStyle_Impl, SvxXMLListLevelStyleContext_ImplPtr, - 10, 5 ) +SV_DECL_PTRARR( SvxXMLListStyle_Impl, SvxXMLListLevelStyleContext_ImplPtr, 10 ) void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index 6bf7c23654fb..ca57577d073d 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -185,7 +185,7 @@ SvXMLImportContext *SvxXMLTabStopContext_Impl::CreateChildContext( typedef SvxXMLTabStopContext_Impl *SvxXMLTabStopContext_Impl_ImplPtr; -SV_DECL_PTRARR( SvxXMLTabStopArray_Impl, SvxXMLTabStopContext_Impl_ImplPtr, 20, 5 ) +SV_DECL_PTRARR( SvxXMLTabStopArray_Impl, SvxXMLTabStopContext_Impl_ImplPtr, 20 ) // --- diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 72bdc98cef26..dcd3ab523558 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -285,7 +285,7 @@ XMLTextColumnSepContext_Impl::~XMLTextColumnSepContext_Impl() // -------------------------------------------------------------------------- typedef XMLTextColumnContext_Impl *XMLTextColumnContext_ImplPtr; -SV_DECL_PTRARR( XMLTextColumnsArray_Impl, XMLTextColumnContext_ImplPtr, 5, 5 ) +SV_DECL_PTRARR( XMLTextColumnsArray_Impl, XMLTextColumnContext_ImplPtr, 5 ) TYPEINIT1( XMLTextColumnsContext, XMLElementPropertyContext ); diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index fc9599933adf..409016e5049c 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -65,7 +65,7 @@ // OD 2004-04-21 #i26791# #include <txtparaimphint.hxx> typedef XMLHint_Impl *XMLHint_ImplPtr; -SV_DECL_PTRARR_DEL( XMLHints_Impl, XMLHint_ImplPtr, 5, 5 ) +SV_DECL_PTRARR_DEL( XMLHints_Impl, XMLHint_ImplPtr, 5 ) SV_IMPL_PTRARR( XMLHints_Impl, XMLHint_ImplPtr ) // OD 2004-04-21 #i26791# #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index a8a9e68d7077..5b6315cda78c 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -892,7 +892,7 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler( //------------------------------------------------------------------------------ Reference< XInterface > SAL_CALL create_DocumentHandlerImpl( - Reference< XComponentContext > const & ) + SAL_UNUSED_PARAMETER Reference< XComponentContext > const & ) SAL_THROW( (Exception) ) { return static_cast< ::cppu::OWeakObject * >( diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx index 50a9d2393393..89a4ee013173 100644 --- a/xmlscript/source/xmldlg_imexp/exp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx @@ -166,8 +166,7 @@ public: { addAttribute( rAttrName, ::rtl::OUString::valueOf(bValue) ); } void addNumberFormatAttr( css::uno::Reference< css::beans::XPropertySet > - const & xFormatProperties, - ::rtl::OUString const & rAttrName ); + const & xFormatProperties ); void readEvents() SAL_THROW( (css::uno::Exception) ); void readDialogModel( StyleBag * all_styles ) diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 9bbaeed3f650..1c3432f99b1d 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -1135,8 +1135,7 @@ void ElementDescriptor::readFormattedFieldModel( StyleBag * all_styles ) if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("FormatsSupplier") ) ) >>= xSupplier) { addNumberFormatAttr( - xSupplier->getNumberFormats()->getByKey( nKey ), - OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value-min") ) ); + xSupplier->getNumberFormats()->getByKey( nKey ) ); } } readBoolAttr( diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index 031ac053154a..2084860bbc58 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -572,8 +572,7 @@ Reference< xml::sax::XAttributeList > Style::createElement() //__________________________________________________________________________________________________ void ElementDescriptor::addNumberFormatAttr( - Reference< beans::XPropertySet > const & xFormatProperties, - OUString const & /*rAttrName*/ ) + Reference< beans::XPropertySet > const & xFormatProperties ) { Reference< beans::XPropertyState > xState( xFormatProperties, UNO_QUERY ); OUString sFormat; |