| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-16 09:39:58 (GMT) |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-16 10:21:10 (GMT) |
| commit | a7ba47243cb70b78c8d8674558ed6db35b79da99 (patch) (side-by-side diff) | |
| tree | 4b592f6cb5a177de8fc43f75bb4e6018bdfb7f7f | |
| parent | eb40f4af949309a82ce369f1636f4e79b9f8631e (diff) | |
| download | core-a7ba47243cb70b78c8d8674558ed6db35b79da99.zip core-a7ba47243cb70b78c8d8674558ed6db35b79da99.tar.gz | |
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I63d27cd70a7c6d4ad73f83db5e19985c0e3b8d7c
28 files changed, 12 insertions, 72 deletions
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 356eddd..511dde2 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -761,7 +761,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, aNewSet.Put( pObj->GetMergedItemSet() ); if( bUndo ) - AddUndo( new E3dAttributesUndoAction( mrDoc, this, (E3dObject*) pPickObj, aNewSet, aOldSet, sal_False ) ); + AddUndo( new E3dAttributesUndoAction( mrDoc, (E3dObject*) pPickObj, aNewSet, aOldSet ) ); pPickObj->SetMergedItemSetAndBroadcast( aNewSet ); } diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx index e619052..50ff00e 100644 --- a/svx/inc/extrusiondepthdialog.hxx +++ b/svx/inc/extrusiondepthdialog.hxx @@ -37,8 +37,6 @@ class ExtrusionDepthDialog : public ModalDialog CancelButton maCancelButton; HelpButton maHelpButton; - FieldUnit meDefaultUnit; - public: ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit ); ~ExtrusionDepthDialog(); diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx index 0e85f0f..158931f 100644 --- a/svx/inc/svx/bmpmask.hxx +++ b/svx/inc/svx/bmpmask.hxx @@ -90,7 +90,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow friend class MaskData; friend class MaskSet; - Window* pParentWin; Size aLastSize; ToolBox aTbxPipette; ColorWindow* pCtlPipette; diff --git a/svx/inc/svx/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx index 1b55eee..4654363 100644 --- a/svx/inc/svx/clipboardctl.hxx +++ b/svx/inc/svx/clipboardctl.hxx @@ -35,7 +35,6 @@ class SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl { SfxPoolItem* pClipboardFmtItem; PopupMenu* pPopup; - sal_uInt16 nItemId; sal_Bool bDisabled; void DelPopup(); diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx index 9d91921..16ec3f4 100644 --- a/svx/inc/svx/e3dundo.hxx +++ b/svx/inc/svx/e3dundo.hxx @@ -33,8 +33,6 @@ #include <svx/scene3d.hxx> #include "svx/svxdllapi.h" -class E3dView; - /************************************************************************\ |* |* Base class for all 3D undo actions. @@ -99,19 +97,16 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction using SdrUndoAction::Repeat; SdrObject* pObject; - E3dView* pView; - sal_Bool bUseSubObjects; const SfxItemSet aNewSet; const SfxItemSet aOldSet; public: TYPEINFO(); - E3dAttributesUndoAction( SdrModel &rModel, E3dView* pView, + E3dAttributesUndoAction( SdrModel &rModel, E3dObject* pInObject, const SfxItemSet& rNewSet, - const SfxItemSet& rOldSet, - sal_Bool bUseSubObj); + const SfxItemSet& rOldSet); virtual ~E3dAttributesUndoAction(); diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx index 380c77d..3f8c004 100644 --- a/svx/inc/svx/float3d.hxx +++ b/svx/inc/svx/float3d.hxx @@ -53,7 +53,6 @@ enum ViewType3D class SdrModel; class FmFormModel; -class FmFormPage; class VirtualDevice; class E3dView; class SdrPageView; @@ -201,7 +200,6 @@ private: // Model, Page, View etc. for favourites FmFormModel* pModel; - FmFormPage* pFmPage; VirtualDevice* pVDev; E3dView* p3DView; @@ -270,14 +268,12 @@ public: class Svx3DCtrlItem : public SfxControllerItem { - Svx3DWin* p3DWin; - protected: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); public: - Svx3DCtrlItem( sal_uInt16, Svx3DWin*, SfxBindings* ); + Svx3DCtrlItem( sal_uInt16, SfxBindings* ); }; /************************************************************************* diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx index adfc6be..a8fa0b9 100644 --- a/svx/inc/svx/fontwork.hxx +++ b/svx/inc/svx/fontwork.hxx @@ -121,7 +121,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow SfxBindings& rBindings; Timer aInputTimer; - sal_Bool bUserZoomedIn; sal_uInt16 nLastStyleTbxId; sal_uInt16 nLastAdjustTbxId; diff --git a/svx/inc/svx/galctrl.hxx b/svx/inc/svx/galctrl.hxx index 646377a..2c40880 100644 --- a/svx/inc/svx/galctrl.hxx +++ b/svx/inc/svx/galctrl.hxx @@ -137,7 +137,6 @@ private: Link maSelectHdl; GalleryTheme* mpTheme; sal_uIntPtr mnCurRow; - sal_Bool mbInit; void InitSettings(); diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx index 10babf8..729374e 100644 --- a/svx/inc/svx/itemwin.hxx +++ b/svx/inc/svx/itemwin.hxx @@ -78,7 +78,6 @@ class SvxColorBox : public ColorLB using Window::Update; sal_uInt16 nCurPos; - sal_uInt16 nId; Timer aDelayTimer; Size aLogicalSize; sal_Bool bRelease; diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index ad640d5..d4b0902 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -199,7 +199,6 @@ private: std::vector<sal_uInt32> aAddList; std::vector<sal_uInt32> aDelList; std::vector<sal_uInt32> aCurEntryList; - sal_uInt32 nInitFormatKey; sal_uInt32 nCurFormatKey; short nCurCategory; LanguageType eCurLanguage; diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index ace4b67..b4e0d01 100644 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -88,7 +88,6 @@ class SVX_DLLPUBLIC SdrPageWindow SdrPaintWindow* mpOriginalPaintWindow; // UNO stuff for xControls - void* mpDummy; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > mxControlContainer; sdr::contact::ObjectContact* CreateViewSpecificObjectContact(); diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index 51b3e5d..68b89c8 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -49,7 +49,6 @@ class SdrOutliner; class SdrModel; class SvtSysLocale; -class CharClass; class LocaleDataWrapper; namespace com { namespace sun { namespace star { namespace lang { @@ -263,7 +262,6 @@ public: class SVX_DLLPUBLIC SdrGlobalData { const SvtSysLocale* pSysLocale; // follows always locale settings - const CharClass* pCharClass; // follows always SysLocale const LocaleDataWrapper* pLocaleData; // follows always SysLocale public: SdrLinkList aUserMakeObjHdl; diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index 82b995c..afc8cf0 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -210,10 +210,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xBoundItems[MAX_FAMILIES]; SfxTemplateItem* pFamilyState[MAX_FAMILIES]; sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1 - sal_uInt16 nActFilter; // FilterIdx - sal_uInt16 nAppFilter; // Filter, that the App has set String aCurSel; - sal_Bool bListening; Impl* pImpl; SVX_DLLPRIVATE void Update(); diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx index 1c90b8e..8cf6ef3 100644 --- a/svx/inc/svx/xflftrit.hxx +++ b/svx/inc/svx/xflftrit.hxx @@ -40,8 +40,6 @@ class SVX_DLLPUBLIC XFillFloatTransparenceItem : public XFillGradientItem { private: - long nDummy1; - long nDummy2; sal_Bool bEnabled; public: diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index acb7867..b4d128c 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -56,8 +56,6 @@ class SvxSuperContourDlg : public SvxContourDlg StatusBar aStbStatus; sal_uIntPtr nGrfChanged; sal_Bool bExecState; - sal_Bool bPipetteMode; - sal_Bool bWorkplaceMode; sal_Bool bUpdateGraphicLinked; sal_Bool bGraphicLinked; ImageList maImageList; diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 9b32a30..3fa0cb5 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -150,7 +150,7 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, FreeResource(); - pOwnData = new IMapOwnData( this ); + pOwnData = new IMapOwnData; pIMapWnd->SetInfoLink( LINK( this, SvxIMapDlg, InfoHdl ) ); pIMapWnd->SetMousePosLink( LINK( this, SvxIMapDlg, MousePosHdl ) ); diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx index 9838caa..082bf91 100644 --- a/svx/source/dialog/imapimp.hxx +++ b/svx/source/dialog/imapimp.hxx @@ -36,10 +36,6 @@ class IMapOwnData { -private: - - SvxIMapDlg* pIMap; - public: Timer aTimer; @@ -50,7 +46,7 @@ public: void* pUpdateEditingObject; sal_Bool bExecState; - IMapOwnData( SvxIMapDlg* pIMapDlg ) : pIMap ( pIMapDlg ), pUpdateEditingObject( NULL ) {} + IMapOwnData() : pUpdateEditingObject( NULL ) {} }; diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx index d3b8557..eba42be 100644 --- a/svx/source/engine3d/e3dundo.cxx +++ b/svx/source/engine3d/e3dundo.cxx @@ -83,15 +83,11 @@ void E3dRotateUndoAction::Redo () TYPEINIT1(E3dAttributesUndoAction, SdrUndoAction); E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel, - E3dView* p3dView, E3dObject* pInObject, const SfxItemSet& rNewSet, - const SfxItemSet& rOldSet, - sal_Bool bUseSubObj) + const SfxItemSet& rOldSet) : SdrUndoAction( rModel ), pObject ( pInObject ), - pView ( p3dView ), - bUseSubObjects(bUseSubObj), aNewSet ( rNewSet ), aOldSet ( rOldSet ) { diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 645e081..e8c9df2 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -226,7 +226,6 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, eViewType ( VIEWTYPE_GEO ), pModel ( NULL ), - pFmPage ( NULL ), pVDev ( NULL ), p3DView ( NULL ), @@ -253,7 +252,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aMtrDistance.SetUnit( eFUnit ); aMtrFocalLength.SetUnit( eFUnit ); - pControllerItem = new Svx3DCtrlItem(SID_3D_STATE, this, pBindings); + pControllerItem = new Svx3DCtrlItem(SID_3D_STATE, pBindings); pConvertTo3DItem = new SvxConvertTo3DItem(SID_CONVERT_TO_3D, pBindings); pConvertTo3DLatheItem = new SvxConvertTo3DItem(SID_CONVERT_TO_3D_LATHE_FAST, pBindings); @@ -3259,10 +3258,8 @@ Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, } Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId, - Svx3DWin* pWin, SfxBindings* _pBindings) : - SfxControllerItem( _nId, *_pBindings ), - p3DWin( pWin ) + SfxControllerItem( _nId, *_pBindings ) { } diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index c803c58..ca79d80b 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -471,8 +471,7 @@ void GalleryIconView::StartDrag( sal_Int8, const Point& ) GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) : BrowseBox( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER ), mpTheme( pTheme ), - mnCurRow( 0 ), - mbInit( sal_False ) + mnCurRow( 0 ) { SetHelpId( HID_GALLERY_WINDOW ); diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 2b8c6ff..3baf418 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -32,8 +32,6 @@ #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -class FmFormView; - //================================================================== // FmFormObj //================================================================== @@ -44,9 +42,6 @@ class FmFormObj: public SdrUnoObj // valid if and only if m_pEnvironmentHistory != NULL, this are the events which we're set when // m_pEnvironmentHistory was created - FmFormView* m_pControlCreationView; - sal_uLong m_nControlCreationEvent; - // Informationen fuer die Controlumgebung // werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> m_xParent; diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 48ca710..30ff423 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -80,7 +80,6 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, pCurFmtTable ( NULL ), eValType ( eNumValType ), bUndoAddList ( true ), - nInitFormatKey ( nFormatKey ), nCurFormatKey ( nFormatKey ), pCurCurrencyEntry(NULL), bBankingSymbol (false), @@ -112,7 +111,6 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, pCurFmtTable ( NULL ), eValType ( eNumValType ), bUndoAddList ( true ), - nInitFormatKey ( nFormatKey ), nCurFormatKey ( nFormatKey ), pCurCurrencyEntry(NULL), bBankingSymbol (false), diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index ca34e93..eb55385 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -46,7 +46,6 @@ SvxClipBoardControl::SvxClipBoardControl( SfxToolBoxControl( nSlotId, nId, rTbx ), pClipboardFmtItem( 0 ), pPopup (0), - nItemId (nId), bDisabled( sal_False ) { addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ClipboardFormatItems" ))); diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index 89fda63..99f7a17 100644 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx @@ -44,9 +44,6 @@ class SdrDragView; class SdrDragMovHdl : public SdrDragMethod { -private: - bool bMirrObjShown; - protected: // define nothing, overload to do so virtual void createSdrDragEntries(); diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 7bb8856..76361c1 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -868,8 +868,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragMethod::AddConnectorOverla TYPEINIT1(SdrDragMovHdl,SdrDragMethod); SdrDragMovHdl::SdrDragMovHdl(SdrDragView& rNewView) -: SdrDragMethod(rNewView), - bMirrObjShown(false) +: SdrDragMethod(rNewView) { } diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 2f50609..7cab83d 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -59,7 +59,6 @@ #include <unotools/localedatawrapper.hxx> #include <com/sun/star/lang/Locale.hpp> #include <i18npool/lang.h> -#include <unotools/charclass.hxx> #include <unotools/syslocale.hxx> #include <svx/xflbckit.hxx> #include <svx/extrusionbar.hxx> @@ -78,7 +77,6 @@ using namespace ::com::sun::star; SdrGlobalData::SdrGlobalData() : pSysLocale(NULL), - pCharClass(NULL), pLocaleData(NULL), pOutliner(NULL), pDefaults(NULL), diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 80a28bb..77d340f 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -115,7 +115,6 @@ private: RTFCellDefaultVector::iterator maDefaultIterator; int mnLastToken; - sal_Int32 mnLastWidth; bool mbNewDef; sal_uInt16 mnStartPara; @@ -140,7 +139,6 @@ SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj ) , mpOutliner( SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, rTableObj.GetModel() ) ) , mrItemPool( rTableObj.GetModel()->GetItemPool() ) , mnLastToken( 0 ) -, mnLastWidth( 0 ) , mbNewDef( false ) , mnStartPara( 0 ) , mnColCnt( 0 ) diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 0ec964b..a3809b7 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -128,7 +128,7 @@ class SvxStyleBox_Impl : public ComboBox { using Window::IsVisible; public: - SvxStyleBox_Impl( Window* pParent, sal_uInt16 nSlot, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, + SvxStyleBox_Impl( Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, sal_Bool bInSpecialMode ); ~SvxStyleBox_Impl(); @@ -150,7 +150,6 @@ protected: virtual void Select(); private: - sal_uInt16 nSlotId; SfxStyleFamily eStyleFamily; sal_uInt16 nCurSel; sal_Bool bRelease; @@ -322,7 +321,6 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener SvxStyleBox_Impl::SvxStyleBox_Impl( Window* pParent, - sal_uInt16 nSlot, const rtl::OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, @@ -333,7 +331,6 @@ SvxStyleBox_Impl::SvxStyleBox_Impl( ComboBox( pParent, SVX_RES( RID_SVXTBX_STYLE ) ), - nSlotId ( nSlot ), eStyleFamily( eFamily ), bRelease ( sal_True ), bVisible(sal_False), @@ -1617,7 +1614,6 @@ SvxStyleToolBoxControl::SvxStyleToolBoxControl( : SfxToolBoxControl ( nSlotId, nId, rTbx ), pStyleSheetPool ( NULL ), nActFamily ( 0xffff ), - bListening ( sal_False ), pImpl ( new Impl ) { for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ ) @@ -1996,7 +1992,6 @@ void SvxStyleToolBoxControl::StateChanged( Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent ) { SvxStyleBox_Impl* pBox = new SvxStyleBox_Impl( pParent, - SID_STYLE_APPLY, OUString( ".uno:StyleApply" ), SFX_STYLE_FAMILY_PARA, Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ), |
