From abc6071b7a8af354a56c91e4caecd8afc79f55cc Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 25 Nov 2015 14:45:38 +0200 Subject: loplugin:unusedfields various Change-Id: I18f94269a1172cf195ee402384f7144610e1e82d --- compilerplugins/clang/unusedfields.py | 21 +++++++++++++--- svtools/source/contnr/imivctl.hxx | 3 --- svx/inc/galbrws2.hxx | 1 - .../EnhancedCustomShapeFunctionParser.cxx | 2 -- svx/source/dialog/imapwnd.hxx | 6 ----- svx/source/inc/frmselimpl.hxx | 1 - svx/source/stbctrls/xmlsecctrl.cxx | 2 -- svx/source/svdraw/svdocirc.cxx | 1 - svx/source/svdraw/svdomeas.cxx | 1 - sw/source/core/access/acccontext.hxx | 1 - sw/source/uibase/config/cfgitems.cxx | 3 +-- sw/source/uibase/inc/cfgitems.hxx | 2 -- sw/source/uibase/inc/drawbase.hxx | 3 +-- sw/source/uibase/inc/navipi.hxx | 1 - tools/source/inet/inetmime.cxx | 6 +---- ucb/source/ucp/ftp/ftpcontent.cxx | 1 - ucb/source/ucp/ftp/ftpresultsetI.cxx | 3 +-- ucb/source/ucp/ftp/ftpresultsetI.hxx | 1 - ucb/source/ucp/ftp/ftpresultsetbase.cxx | 4 +--- ucb/source/ucp/ftp/ftpresultsetbase.hxx | 28 ++++++++++------------ ucbhelper/source/provider/contentidentifier.cxx | 1 - unotools/source/config/dynamicmenuoptions.cxx | 1 - unoxml/source/dom/notation.cxx | 1 - unoxml/source/dom/notation.hxx | 3 --- uui/source/iahndl.hxx | 1 - xmlhelp/source/cxxhelp/provider/content.cxx | 2 -- xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 4 +--- xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 4 +--- .../source/cxxhelp/provider/resultsetforquery.cxx | 3 +-- .../source/cxxhelp/provider/resultsetforquery.hxx | 1 - .../source/cxxhelp/provider/resultsetforroot.cxx | 3 +-- .../source/cxxhelp/provider/resultsetforroot.hxx | 1 - xmloff/source/forms/attriblistmerge.hxx | 1 - 33 files changed, 39 insertions(+), 78 deletions(-) diff --git a/compilerplugins/clang/unusedfields.py b/compilerplugins/clang/unusedfields.py index 9f3f16a9d4d8..2d51785cada9 100755 --- a/compilerplugins/clang/unusedfields.py +++ b/compilerplugins/clang/unusedfields.py @@ -57,10 +57,24 @@ for d in definitionSet: if d in callSet: continue srcLoc = definitionToSourceLocationMap[d]; - if (srcLoc.startswith("include/")): - continue + # ignore external source code if (srcLoc.startswith("external/")): continue + # ignore build folder + if (srcLoc.startswith("workdir/")): + continue + # ignore our stable/URE/UNO api + if (srcLoc.startswith("include/com/") + or srcLoc.startswith("include/cppu/") + or srcLoc.startswith("include/cppuhelper/") + or srcLoc.startswith("include/osl/") + or srcLoc.startswith("include/rtl/") + or srcLoc.startswith("include/sal/") + or srcLoc.startswith("include/salhelper/") + or srcLoc.startswith("include/systools/") + or srcLoc.startswith("include/typelib/") + or srcLoc.startswith("include/uno/")): + continue # this is all representations of on-disk data structures if (srcLoc.startswith("sc/source/filter/inc/scflt.hxx") or srcLoc.startswith("sw/source/filter/ww8/") @@ -69,7 +83,8 @@ for d in definitionSet: or srcLoc.startswith("vcl/inc/unx/XIM.h") or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h") or srcLoc.startswith("include/svl/svdde.hxx") - or srcLoc.startswith("lotuswordpro/source/filter/lwpsdwdrawheader.hxx")): + or srcLoc.startswith("lotuswordpro/source/filter/lwpsdwdrawheader.hxx") + or srcLoc.startswith("svtools/source/dialogs/insdlg.cxx")): continue tmp1set.add((clazz + " " + definitionToTypeMap[d], srcLoc)) diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 0dfbd0a72b28..31272b7b249b 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -175,10 +175,7 @@ class SvxIconChoiceCtrl_Impl Size aImageSize; Size aDefaultTextSize; Size aOutputSize; // Pixel - Point aDDLastEntryPos; Point aDDLastRectPos; - Point aDDPaintOffs; - Point aDDStartPos; VclPtr pView; IcnCursor_Impl* pImpCursor; IcnGridMap_Impl* pGridMap; diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index e1a9fca071da..e21cd19e9eb9 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -115,7 +115,6 @@ private: VclPtr maViewBox; VclPtr maSeparator; VclPtr maInfoBar; - Point maDragStartPos; sal_uIntPtr mnCurActionPos; GalleryBrowserMode meMode; GalleryBrowserMode meLastMode; diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 5360a9ea067a..af43b228bee0 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -805,14 +805,12 @@ public: class EnumFunctor { const ExpressionFunct meFunct; - double mnValue; ParserContextSharedPtr mxContext; public: EnumFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : meFunct( eFunct ) - , mnValue( 0 ) , mxContext( rContext ) { } diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index e4055708e097..7b85f1a8f756 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -43,12 +43,6 @@ struct NotifyInfo }; -struct NotifyPosSize -{ - Size aPictureSize; - Point aMousePos; -}; - #define SVD_IMAP_USERDATA 0x0001 const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+ diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 073b9100701a..d5abe6b48026 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -106,7 +106,6 @@ struct FrameSelectorImpl : public Resource Color maMarkCol; /// Selection marker color. Color maHCLineCol; /// High contrast line color. Point maVirDevPos; /// Position of virtual device in the control. - Point maMousePos; /// Last mouse pointer position. FrameBorder maLeft; /// All data of left frame border. FrameBorder maRight; /// All data of right frame border. diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 4c8e9cc0ea37..d578582d81b6 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -41,8 +41,6 @@ SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxUInt16Item ); struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl { - Point maPos; - Size maSize; SignatureState mnState; Image maImage; Image maImageBroken; diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 0ceaab15c04c..318d140e89a5 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -355,7 +355,6 @@ struct ImpCircUser : public SdrDragStatUserData { Rectangle aR; Point aCenter; - Point aRadius; Point aP1; Point aP2; long nMaxRad; diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 3dc86c494113..4fdeeef1c31c 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -300,7 +300,6 @@ struct ImpMeasurePoly ImpLineRec aMainline3; // those in between ImpLineRec aHelpline1; ImpLineRec aHelpline2; - Rectangle aTextRect; Size aTextSize; long nLineLen; long nLineAngle; diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index e703bf4e6c29..cecb010c53f8 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -59,7 +59,6 @@ class SwAccessibleContext : friend class SwAccessibleSelectionHelper; protected: - mutable ::osl::Mutex m_ListenerMutex; mutable ::osl::Mutex m_Mutex; private: diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx index 5852a6d694ca..98122681b35d 100644 --- a/sw/source/uibase/config/cfgitems.cxx +++ b/sw/source/uibase/config/cfgitems.cxx @@ -31,8 +31,7 @@ SwDocDisplayItem::SwDocDisplayItem( sal_uInt16 _nWhich ) : - SfxPoolItem(_nWhich), - aIndexBackgrndCol(COL_GRAY) + SfxPoolItem(_nWhich) { bParagraphEnd = bTab = diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index 41be1655e2d0..8c336e8bbcfd 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -54,8 +54,6 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem bool bManualBreak :1; bool bShowHiddenPara :1; - Color aIndexBackgrndCol; - public: SwDocDisplayItem( sal_uInt16 nWhich = FN_PARAM_DOCDISP ); SwDocDisplayItem( diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx index 42c3adada3d1..9ba4450c4a30 100644 --- a/sw/source/uibase/inc/drawbase.hxx +++ b/sw/source/uibase/inc/drawbase.hxx @@ -35,8 +35,7 @@ protected: SwWrtShell* m_pSh; VclPtr m_pWin; Point m_aStartPos; // position of BeginCreate - Point m_aMDPos; // position of MouseButtonDown - sal_uInt16 m_nSlotId; + sal_uInt16 m_nSlotId; bool m_bCreateObj :1; bool m_bInsForm :1; diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 761f495f7e70..f7153da1bef4 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -67,7 +67,6 @@ class SwNavigationPI : public vcl::Window, OUString m_sContentFileName; OUString m_aContextArr[3]; OUString m_aStatusArr[4]; - Point m_aBoxBottomLeft; // Pos when Box is at bottom SfxObjectShellLock *m_pxObjectShell; SwView *m_pContentView; diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 6ed448d1500d..f4bc930e277c 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -467,14 +467,12 @@ struct Parameter Parameter * m_pNext; OString m_aAttribute; OString m_aCharset; - OString m_aLanguage; OString m_aValue; sal_uInt32 m_nSection; bool m_bExtended; inline Parameter(Parameter * pTheNext, const OString& rTheAttribute, const OString& rTheCharset, - const OString& rTheLanguage, const OString& rTheValue, sal_uInt32 nTheSection, bool bTheExtended); }; @@ -482,13 +480,11 @@ struct Parameter inline Parameter::Parameter(Parameter * pTheNext, const OString& rTheAttribute, const OString& rTheCharset, - const OString& rTheLanguage, const OString& rTheValue, sal_uInt32 nTheSection, bool bTheExtended): m_pNext(pTheNext), m_aAttribute(rTheAttribute), m_aCharset(rTheCharset), - m_aLanguage(rTheLanguage), m_aValue(rTheValue), m_nSection(nTheSection), m_bExtended(bTheExtended) @@ -2001,7 +1997,7 @@ sal_Unicode const * scanParameters(sal_Unicode const * pBegin, RTL_TEXTENCODING_UTF8); } - *pPos = new Parameter(*pPos, aAttribute, aCharset, aLanguage, aValue, + *pPos = new Parameter(*pPos, aAttribute, aCharset, aValue, nSection, bExtended); } return parseParameters(aList, pParameters) ? pParameterBegin : pBegin; diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 03685c743f63..54166dabeb26 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -254,7 +254,6 @@ public: return new ResultSetI(m_xContext, m_xProvider, m_seq, - m_seqSort, m_dirvec); } diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx index 424c05d8dd9e..2456e8a80540 100644 --- a/ucb/source/ucp/ftp/ftpresultsetI.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx @@ -41,9 +41,8 @@ using namespace com::sun::star::sdbc; ResultSetI::ResultSetI(const Reference& rxContext, const Reference& xProvider, const Sequence& seqProp, - const Sequence< NumberedSortingInfo >& seqSort, const std::vector& dirvec) - : ResultSetBase(rxContext,xProvider,seqProp,seqSort) + : ResultSetBase(rxContext,xProvider,seqProp) { for( size_t i = 0; i < dirvec.size(); ++i) m_aPath.push_back(dirvec[i].m_aURL); diff --git a/ucb/source/ucp/ftp/ftpresultsetI.hxx b/ucb/source/ucp/ftp/ftpresultsetI.hxx index adf290645545..3906e84f9c62 100644 --- a/ucb/source/ucp/ftp/ftpresultsetI.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetI.hxx @@ -38,7 +38,6 @@ namespace ftp { const css::uno::Reference< css::uno::XComponentContext>& rxContext, const css::uno::Reference< css::ucb::XContentProvider>& xProvider, const css::uno::Sequence< css::beans::Property >& seq, - const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort, const std::vector& dirvec); private: diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index bd09094e18e7..12acee990451 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -33,15 +33,13 @@ using namespace com::sun::star; ResultSetBase::ResultSetBase( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< ucb::XContentProvider >& xProvider, - const uno::Sequence< beans::Property >& seq, - const uno::Sequence< ucb::NumberedSortingInfo >& seqSort ) + const uno::Sequence< beans::Property >& seq ) : m_xContext( rxContext ), m_xProvider( xProvider ), m_nRow( -1 ), m_nWasNull( true ), m_bRowCountFinal( true ), m_sProperty( seq ), - m_sSortingInfo( seqSort ), m_pDisposeEventListeners( nullptr ), m_pRowCountListeners( nullptr ), m_pIsFinalListeners( nullptr ) diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index 1f151101b03f..b98e7f8756f0 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -52,8 +52,7 @@ namespace ftp { ResultSetBase(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::ucb::XContentProvider >& xProvider, - const css::uno::Sequence< css::beans::Property >& seq, - const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort); + const css::uno::Sequence< css::beans::Property >& seq); virtual ~ResultSetBase(); @@ -516,29 +515,26 @@ namespace ftp { protected: - css::uno::Reference< - css::uno::XComponentContext > m_xContext; - css::uno::Reference< - css::ucb::XContentProvider > m_xProvider; + css::uno::Reference< css::uno::XComponentContext > + m_xContext; + css::uno::Reference< css::ucb::XContentProvider > + m_xProvider; sal_Int32 m_nRow; bool m_nWasNull; bool m_bRowCountFinal; - typedef std::vector< css::uno::Reference< - css::ucb::XContentIdentifier > > IdentSet; - typedef std::vector< css::uno::Reference< - css::sdbc::XRow > > ItemSet; - typedef std::vector< OUString > - PathSet; + typedef std::vector< css::uno::Reference > + IdentSet; + typedef std::vector< css::uno::Reference< css::sdbc::XRow > > + ItemSet; + typedef std::vector< OUString > PathSet; IdentSet m_aIdents; ItemSet m_aItems; PathSet m_aPath; - css::uno::Sequence< - css::beans::Property > m_sProperty; - css::uno::Sequence< - css::ucb::NumberedSortingInfo > m_sSortingInfo; + css::uno::Sequence< css::beans::Property > + m_sProperty; osl::Mutex m_aMutex; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index b40f28e434c4..63124536080d 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -49,7 +49,6 @@ struct ContentIdentifier_Impl { OUString m_aContentId; OUString m_aProviderScheme; - osl::Mutex m_aMutex; explicit ContentIdentifier_Impl( const OUString& rURL ); }; diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 51baeca8de48..507d4b6f7f2c 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -66,7 +66,6 @@ using namespace ::com::sun::star::beans; ****************************************************************************************************************-*/ struct SvtDynMenuEntry { - OUString sName; OUString sURL; OUString sTitle; OUString sImageIdentifier; diff --git a/unoxml/source/dom/notation.cxx b/unoxml/source/dom/notation.cxx index f64e31bca34b..9f2aca2bec6f 100644 --- a/unoxml/source/dom/notation.cxx +++ b/unoxml/source/dom/notation.cxx @@ -32,7 +32,6 @@ namespace DOM xmlNotationPtr const pNotation) : CNotation_Base(rDocument, rMutex, NodeType_NOTATION_NODE, reinterpret_cast(pNotation)) - , m_aNotationPtr(pNotation) { } diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx index 323861f71433..434b1b8d486c 100644 --- a/unoxml/source/dom/notation.hxx +++ b/unoxml/source/dom/notation.hxx @@ -38,9 +38,6 @@ namespace DOM private: friend class CDocument; - private: - xmlNotationPtr m_aNotationPtr; - protected: CNotation(CDocument const& rDocument, ::osl::Mutex const& rMutex, xmlNotationPtr const pNotation); diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 7aade5b4080b..36a8fb46bf7c 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -80,7 +80,6 @@ typedef std::unordered_map< OUString, OUString, OUStringHash > StringHashMap; class UUIInteractionHelper { private: - mutable osl::Mutex m_aPropertyMutex; css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::awt::XWindow > m_xWindowParam; const OUString m_aContextParam; diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index a1411b11752a..fbffd7ae5a02 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -196,7 +196,6 @@ public: return new ResultSetForRoot( m_xContext, m_xProvider, m_seq, - m_seqSort, m_aURLParameter, m_pDatabases ); } @@ -237,7 +236,6 @@ public: return new ResultSetForQuery( m_xContext, m_xProvider, m_seq, - m_seqSort, m_aURLParameter, m_pDatabases ); } diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index d014aa3ffa0c..f4ef8fe0f8bb 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -33,15 +33,13 @@ using namespace com::sun::star; ResultSetBase::ResultSetBase( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< ucb::XContentProvider >& xProvider, - const uno::Sequence< beans::Property >& seq, - const uno::Sequence< ucb::NumberedSortingInfo >& seqSort ) + const uno::Sequence< beans::Property >& seq ) : m_xContext( rxContext ), m_xProvider( xProvider ), m_nRow( -1 ), m_nWasNull( true ), m_bRowCountFinal( true ), m_sProperty( seq ), - m_sSortingInfo( seqSort ), m_pDisposeEventListeners( nullptr ), m_pRowCountListeners( nullptr ), m_pIsFinalListeners( nullptr ) diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx index 072d18ef570c..c9660f2b9f00 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx @@ -52,8 +52,7 @@ namespace chelp { ResultSetBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::ucb::XContentProvider >& xProvider, - const css::uno::Sequence< css::beans::Property >& seq, - const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort ); + const css::uno::Sequence< css::beans::Property >& seq ); virtual ~ResultSetBase(); @@ -547,7 +546,6 @@ namespace chelp { PathSet m_aPath; css::uno::Sequence< css::beans::Property > m_sProperty; - css::uno::Sequence< css::ucb::NumberedSortingInfo > m_sSortingInfo; osl::Mutex m_aMutex; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index 0999298c41c4..ea5b78f4c0b9 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -82,10 +82,9 @@ struct HitItem ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< XContentProvider >& xProvider, const uno::Sequence< beans::Property >& seq, - const uno::Sequence< NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, Databases* pDatabases ) - : ResultSetBase( rxContext,xProvider,seq,seqSort ), + : ResultSetBase( rxContext,xProvider,seq ), m_aURLParameter( aURLParameter ) { Reference< XExtendedTransliteration > xTrans = Transliteration::create( rxContext ); diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx index 0824613377b9..41952ec9d30f 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx @@ -39,7 +39,6 @@ namespace chelp { ResultSetForQuery( const css::uno::Reference& rxContext, const css::uno::Reference& xProvider, const css::uno::Sequence< css::beans::Property >& seq, - const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, Databases* pDatabases ); diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx index 15d568ab8923..197b9de37550 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx @@ -33,10 +33,9 @@ using namespace com::sun::star::ucb; ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< XContentProvider >& xProvider, const uno::Sequence< beans::Property >& seq, - const uno::Sequence< NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, Databases* pDatabases ) - : ResultSetBase( rxContext, xProvider,seq,seqSort ), + : ResultSetBase( rxContext, xProvider,seq ), m_aURLParameter( aURLParameter ), m_pDatabases( pDatabases ) { diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx index 2c7bb60d7863..3bb96aaef91a 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx @@ -39,7 +39,6 @@ namespace chelp { ResultSetForRoot( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::ucb::XContentProvider >& xProvider, const css::uno::Sequence< css::beans::Property >& seq, - const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, Databases* pDatabases ); diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index 03f6d0f00860..a0b333d448e0 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -41,7 +41,6 @@ namespace xmloff class OAttribListMerger : public OAttribListMerger_Base { protected: - ::osl::Mutex m_aMutex; typedef std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > AttributeListArray; AttributeListArray m_aLists; -- cgit