summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-01-21 15:21:16 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-01-21 15:21:16 +0100
commit7c704c78d3c652504c064b4ac7af55a2c1ee49bb (patch)
tree623358cf25839219ef4fd90eea4f3eaa55389a1f /sfx2
parent0d5167915b47df7c3e450614ea50d845ba959df3 (diff)
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.
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/arrdecl.hxx18
-rw-r--r--sfx2/inc/orgmgr.hxx2
-rw-r--r--sfx2/inc/sfx2/bindings.hxx2
-rw-r--r--sfx2/inc/sfx2/childwin.hxx2
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx2
-rw-r--r--sfx2/inc/sfx2/linkmgr.hxx4
-rw-r--r--sfx2/inc/sfx2/macrconf.hxx2
-rw-r--r--sfx2/source/appl/appdde.cxx2
-rw-r--r--sfx2/source/appl/linkmgr2.cxx2
-rw-r--r--sfx2/source/appl/linksrc.cxx2
-rw-r--r--sfx2/source/control/bindings.cxx2
-rw-r--r--sfx2/source/control/shell.cxx2
-rw-r--r--sfx2/source/dialog/splitwin.cxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx4
14 files changed, 24 insertions, 24 deletions
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)