diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-25 07:00:23 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-25 08:25:10 +0200 |
commit | a4af308d90463049379557e2efc0205972164384 (patch) | |
tree | a3e4fbe6151cd78c8122640ec0f4f11b5383be58 /include | |
parent | 234884c09db0301b9f0b3336f9b0dbb9523ee005 (diff) |
loplugin:unusedfields in include/svx
Change-Id: I946c64d103f3666e5bbff16d95a5c8e65a3750dc
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/EnhancedCustomShape2d.hxx | 7 | ||||
-rw-r--r-- | include/svx/dlgctrl.hxx | 3 | ||||
-rw-r--r-- | include/svx/fmgridif.hxx | 1 | ||||
-rw-r--r-- | include/svx/fmshell.hxx | 1 | ||||
-rw-r--r-- | include/svx/gallery1.hxx | 1 | ||||
-rw-r--r-- | include/svx/galtheme.hxx | 14 | ||||
-rw-r--r-- | include/svx/msdffdef.hxx | 15 | ||||
-rw-r--r-- | include/svx/srchdlg.hxx | 1 | ||||
-rw-r--r-- | include/svx/svdetc.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdmodel.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdotext.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdouno.hxx | 6 | ||||
-rw-r--r-- | include/svx/svdsnpv.hxx | 7 | ||||
-rw-r--r-- | include/svx/svdundo.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdview.hxx | 2 |
15 files changed, 6 insertions, 64 deletions
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index c4052fb65834..667ad5c18c73 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -151,10 +151,6 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet { HandleFlags nFlags; - bool bMirroredX; - bool bMirroredY; - bool bSwitched; - css::drawing::EnhancedCustomShapeParameterPair aPosition; css::drawing::EnhancedCustomShapeParameterPair aPolar; @@ -172,9 +168,6 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet Handle() : nFlags(HandleFlags::NONE) - , bMirroredX ( false ) - , bMirroredY ( false ) - , bSwitched( false ) , nRefX( -1 ) , nRefY( -1 ) , nRefAngle( -1 ) diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index f19a07e66284..9757cd0e7d38 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -149,13 +149,12 @@ public: class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxBitmapCtl { protected: - Size aSize; sal_uInt16 nLines; Color aPixelColor, aBackgroundColor; const sal_uInt16* pBmpArray; public: - SvxBitmapCtl( vcl::Window* pParent, const Size& rSize ); + SvxBitmapCtl(); ~SvxBitmapCtl(); BitmapEx GetBitmapEx(); diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index dad6668973f1..9747eab45432 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -210,7 +210,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FmXGridControl :public UnoControl FmXGridControlMultiplexer m_aGridControlListeners; protected: - sal_uInt16 m_nPeerCreationLevel; bool m_bInDraw; css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 0549cbd31d2d..9c00f8ce9ba3 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -74,7 +74,6 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell FmXFormShell* m_pImpl; FmFormView* m_pFormView; FmFormModel* m_pFormModel; - SfxViewShell* m_pParentShell; sal_uInt16 m_nLastSlot; bool m_bDesignMode : 1; diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index 8c334f0662b7..dc5d0a9fd479 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -108,7 +108,6 @@ private: GalleryCacheThemeList aThemeCache; INetURLObject aRelURL; INetURLObject aUserURL; - rtl_TextEncoding nReadTextEncoding; bool bMultiPath; SAL_DLLPRIVATE void ImplLoad( const OUString& rMultiPath ); diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 6d44850bad47..6c18776e5431 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -59,20 +59,6 @@ class SgaObject; class FmFormModel; class ListBox; - -// - GalDragParams - - - -struct GalDragParams -{ - vcl::Region aDragRegion; - sal_uIntPtr nDragObjPos; - OUString aThemeName; - OUString aFileName; - SgaObjKind eObjKind; -}; - - // - GalleryTheme - diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx index 7d4323be5618..fc2f7aff8830 100644 --- a/include/svx/msdffdef.hxx +++ b/include/svx/msdffdef.hxx @@ -767,20 +767,7 @@ enum MSO_LineCap { // Various enums from the OfficeDraw documentation Appendix D - End // BStore-Container -// FBSE - File Blip Store Entry -struct MSOF_BSE { - sal_uInt8 btWin32; // Required type on Win32 - sal_uInt8 btMacOS; // Required type on Mac - sal_uInt8 rgbUid[16]; // Identifier of blip - sal_uInt16 tag; // currently unused - sal_uIntPtr size; // Blip size in stream - sal_uIntPtr cRef; // Reference count on the blip - sal_uIntPtr /*MSOFO*/ foDelay; // File offset in the delay stream - sal_uInt8 usage; // How this blip is used (MSOBLIPUSAGE) - sal_uInt8 cbName; // length of the blip name - sal_uInt8 unused2; // for the future - sal_uInt8 unused3; // for the future -}; + enum MSO_BLIPUSAGE { mso_blipUsageDefault, // All non-texture fill blips get this. diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index dca1fd9dee4a..cc4beda36eab 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -206,7 +206,6 @@ private: bool bFormat; SearchOptionFlags nOptions; bool bSet; - bool bReadOnly; bool bConstruct; sal_uIntPtr nModifyFlag; OUString aStylesStr; diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 48698441d128..0cc1798979ca 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -65,8 +65,6 @@ SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner(sal_uInt16 nOutlinerMode, SdrModel& r class SVX_DLLPUBLIC SdrEngineDefaults { friend class SdrAttrObj; - OUString aFontName; - FontFamily eFontFamily; Color aFontColor; sal_uIntPtr nFontHeight; MapUnit eMapUnit; @@ -228,10 +226,8 @@ class SVX_DLLPUBLIC SdrGlobalData public: SdrLinkList aUserMakeObjHdl; SdrLinkList aUserMakeObjUserDataHdl; - SdrOutliner* pOutliner; SdrEngineDefaults* pDefaults; ResMgr* pResMgr; - sal_uIntPtr nExchangeFormat; OLEObjCache aOLEObjCache; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 8f80c02fa697..49e8c551cb3f 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -125,7 +125,6 @@ public: Rectangle maRectangle; const SdrPage* mpPage; const SdrObject* mpObj; - const SdrObjList* mpObjList; SdrHintKind meHint; public: @@ -153,7 +152,6 @@ struct SdrModelImpl; class SVX_DLLPUBLIC SdrModel : public SfxBroadcaster, public tools::WeakBase< SdrModel > { protected: - DateTime aReadDate; // date of the incoming stream std::vector<SdrPage*> maMaPag; // master pages std::vector<SdrPage*> maPages; Link<SdrUndoAction*,void> aUndoLink; // link to a NotifyUndo-Handler diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 132b5b8416f3..d43bc5062575 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -102,7 +102,6 @@ class ImpSdrObjTextLinkUserData : public SdrObjUserData friend class SdrTextObj; friend class ImpSdrObjTextLink; - SdrTextObj* pObj; OUString aFileName; // Name des referenzierten Dokuments OUString aFilterName; // ggf. ein Filter DateTime aFileDate0; // Unnoetiges neuladen vermeiden @@ -110,7 +109,7 @@ class ImpSdrObjTextLinkUserData : public SdrObjUserData rtl_TextEncoding eCharSet; public: - ImpSdrObjTextLinkUserData(SdrTextObj* pObj1); + ImpSdrObjTextLinkUserData(); virtual ~ImpSdrObjTextLinkUserData(); virtual SdrObjUserData* Clone(SdrObject* pObj1) const override; @@ -226,7 +225,6 @@ public: void SetTextEditOffset(const Point& rNew) { maTextEditOffset = rNew; } protected: - OverflowingText *mpOverflowingText = nullptr; bool mbIsUnchainableClone = false; // the successor in a chain diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 3ffe9698d431..73f086486755 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -53,7 +53,6 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj OUString aUnoControlModelTypeName; OUString aUnoControlTypeName; - bool bOwnUnoControlModel; protected: css::uno::Reference< css::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden @@ -65,10 +64,9 @@ private: public: - explicit SdrUnoObj(const OUString& rModelName, bool bOwnsModel = true); + explicit SdrUnoObj(const OUString& rModelName); SdrUnoObj(const OUString& rModelName, - const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac, - bool bOwnsModel = true); + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac); virtual ~SdrUnoObj(); virtual void SetPage(SdrPage* pNewPage) override; diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 6f39b104c31a..e041b7e0bdb6 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -63,7 +63,7 @@ protected: Fraction aSnapWdtX; Fraction aSnapWdtY; - sal_uInt16 nMagnSizPix; + sal_uInt16 nMagnSizPix; long nSnapAngle; long nEliminatePolyPointLimitAngle; @@ -71,16 +71,11 @@ protected: bool bSnapEnab : 1; bool bGridSnap : 1; - bool bSnapTo1Pix : 1; // If GridSnap off, snap to one Pixel to avoid values like 10.01 bool bBordSnap : 1; bool bHlplSnap : 1; bool bOFrmSnap : 1; bool bOPntSnap : 1; bool bOConSnap : 1; - bool bMoveMFrmSnap : 1; - bool bMoveOFrmSnap : 1; - bool bMoveOPntSnap : 1; - bool bMoveOConSnap : 1; bool bMoveSnapOnlyTopLeft : 1; // Special for dialogeditor bool bOrtho : 1; bool bBigOrtho : 1; diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index d90345c35561..966e40849450 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -238,8 +238,6 @@ private: protected: SdrObjList* pObjList; - SdrView* pView; // To be able to re-create the selection for a - SdrPageView* pPageView; // for a ObjDel, Undo sal_uInt32 nOrdNum; protected: diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 5414581e48af..eb2b653606ea 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -102,7 +102,6 @@ struct SVX_DLLPUBLIC SdrViewEvent Point aLogicPos; SdrHitKind eHit; SdrEventKind eEvent; - SdrHdlKind eHdlKind; SdrCreateCmd eEndCreateCmd; // for EndInsPoint too sal_uInt16 nMouseClicks; @@ -113,7 +112,6 @@ struct SVX_DLLPUBLIC SdrViewEvent bool bMouseDown : 1; bool bMouseUp : 1; - bool bDoubleHdlSize : 1; // Double Handlesize because of TextEdit bool bIsAction : 1; // Action is active bool bIsTextEdit : 1; // TextEdit runs currently bool bTextEditHit : 1; // hit open OutlinerView? |