From 7c704c78d3c652504c064b4ac7af55a2c1ee49bb Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 21 Jan 2012 15:21:16 +0100 Subject: Removed some unused parameters; added SAL_UNUSED_PARAMETER. SAL_UNUSED_PARAMETER (expanding to __attribute__ ((unused)) for GCC) is used to annotate legitimately unused parameters, so that static analysis tools can tell legitimately unused parameters from truly unnecessary ones. To that end, some patches for external modules are also added, that are only applied when compiling with GCC and add necessary __attribute__ ((unused)) in headers. --- xmloff/source/core/i18nmap.cxx | 2 +- xmloff/source/core/xmlimp.cxx | 2 +- xmloff/source/core/xmltkmap.cxx | 2 +- xmloff/source/style/xmlnumfe.cxx | 2 +- xmloff/source/style/xmlnumfi.cxx | 4 ++-- xmloff/source/style/xmlnumi.cxx | 3 +-- xmloff/source/style/xmltabi.cxx | 2 +- xmloff/source/text/XMLTextColumnsContext.cxx | 2 +- xmloff/source/text/txtparai.cxx | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) (limited to 'xmloff') 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 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 -- cgit v1.2.3