ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:unusedfields in include/svx

Browse Source 
Change-Id: I946c64d103f3666e5bbff16d95a5c8e65a3750dc
This commit is contained in:
Noel Grandin
2015-11-25 08:25:10 +02:00
parent 234884c09d
commit a4af308d90
30 changed files with 23 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basctl/source/dlged/dlgedobj.cxx
+2 -2
View File
@@ -62,7 +62,7 @@ DlgEditor& DlgEdObj::GetDialogEditor ()
}
DlgEdObj::DlgEdObj()
:SdrUnoObj(OUString(), false)
:SdrUnoObj(OUString())
,bIsListening(false)
,pDlgEdForm( nullptr )
{
@@ -70,7 +70,7 @@ DlgEdObj::DlgEdObj()
DlgEdObj::DlgEdObj(const OUString& rModelName,
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac)
:SdrUnoObj(rModelName, rxSFac, false)
:SdrUnoObj(rModelName, rxSFac)
,bIsListening(false)
,pDlgEdForm( nullptr )
{
cui/source/tabpages/tpbitmap.cxx
+1 -1
View File
@@ -95,7 +95,7 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rIn
m_pCtlPreview->set_width_request(aSize2.Width());
m_pCtlPreview->set_height_request(aSize2.Height());
m_pBitmapCtl = new SvxBitmapCtl(this, aSize2);
m_pBitmapCtl = new SvxBitmapCtl;
// this page needs ExchangeSupport
SetExchangeSupport();
include/svx/EnhancedCustomShape2d.hxx
-7
View File
@@ -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 )
include/svx/dlgctrl.hxx
+1 -2
View File
@@ -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();
include/svx/fmgridif.hxx
-1
View File
@@ -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;
include/svx/fmshell.hxx
-1
View File
@@ -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;
include/svx/gallery1.hxx
-1
View File
@@ -108,7 +108,6 @@ private:
GalleryCacheThemeList aThemeCache;
INetURLObject aRelURL;
INetURLObject aUserURL;
rtl_TextEncoding nReadTextEncoding;
bool bMultiPath;
SAL_DLLPRIVATE void ImplLoad( const OUString& rMultiPath );
include/svx/galtheme.hxx
-14
View File
@@ -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 -
include/svx/msdffdef.hxx
+1 -14
View File
@@ -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.
include/svx/srchdlg.hxx
-1
View File
@@ -206,7 +206,6 @@ private:
bool bFormat;
SearchOptionFlags nOptions;
bool bSet;
bool bReadOnly;
bool bConstruct;
sal_uIntPtr nModifyFlag;
OUString aStylesStr;
include/svx/svdetc.hxx
-4
View File
@@ -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;
include/svx/svdmodel.hxx
-2
View File
@@ -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
include/svx/svdotext.hxx
+1 -3
View File
@@ -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
include/svx/svdouno.hxx
+2 -4
View File
@@ -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;
include/svx/svdsnpv.hxx
+1 -6
View File
@@ -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;
include/svx/svdundo.hxx
-2
View File
@@ -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:
include/svx/svdview.hxx
-2
View File
@@ -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?
reportdesign/source/core/sdr/RptObject.cxx
+2 -2
View File
@@ -581,7 +581,7 @@ void OCustomShape::impl_setUnoShape( const uno::Reference< uno::XInterface >& rx
OUnoObject::OUnoObject(const OUString& _sComponentName
,const OUString& rModelName
,sal_uInt16 _nObjectType)
:SdrUnoObj(rModelName, true)
:SdrUnoObj(rModelName)
,OObjectBase(_sComponentName)
,m_nObjectType(_nObjectType)
{
@@ -592,7 +592,7 @@ OUnoObject::OUnoObject(const OUString& _sComponentName
OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xComponent
,const OUString& rModelName
,sal_uInt16 _nObjectType)
:SdrUnoObj(rModelName, true)
:SdrUnoObj(rModelName)
,OObjectBase(_xComponent)
,m_nObjectType(_nObjectType)
{
svx/source/dialog/dlgctrl.cxx
+2 -3
View File
@@ -1119,9 +1119,8 @@ void SvxPixelCtl::Reset()
// Constructor: BitmapCtl for SvxPixelCtl
SvxBitmapCtl::SvxBitmapCtl( vcl::Window* /*pParent*/, const Size& rSize )
: aSize(rSize)
, nLines(0)
SvxBitmapCtl::SvxBitmapCtl()
: nLines(0)
, pBmpArray(nullptr)
{
}
svx/source/dialog/srchdlg.cxx
-1
View File
@@ -258,7 +258,6 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi
, bFormat(false)
, nOptions(SearchOptionFlags::ALL)
, bSet(false)
, bReadOnly(false)
, bConstruct(true)
, nModifyFlag(0)
, pImpl(nullptr)
svx/source/fmcomp/fmgridif.cxx
-1
View File
@@ -342,7 +342,6 @@ FmXGridControl::FmXGridControl(const Reference< XComponentContext >& _rxContext)
,m_aContainerListeners(*this, GetMutex())
,m_aSelectionListeners(*this, GetMutex())
,m_aGridControlListeners(*this, GetMutex())
,m_nPeerCreationLevel(0)
,m_bInDraw(false)
,m_xContext(_rxContext)
{
svx/source/form/fmshell.cxx
-1
View File
@@ -207,7 +207,6 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView )
,m_pImpl(new FmXFormShell(*this, _pParent->GetViewFrame()))
,m_pFormView( pView )
,m_pFormModel( nullptr )
,m_pParentShell(_pParent)
,m_nLastSlot( 0 )
,m_bDesignMode( true )
,m_bHasForms(false)
svx/source/gallery2/gallery1.cxx
+1 -2
View File
@@ -166,8 +166,7 @@ public:
// - Gallery -
Gallery::Gallery( const OUString& rMultiPath )
: nReadTextEncoding ( osl_getThreadTextEncoding() )
, bMultiPath ( false )
: bMultiPath ( false )
{
ImplLoad( rMultiPath );
}
svx/source/svdraw/svdetc.cxx
+1 -5
View File
@@ -71,10 +71,8 @@ using namespace ::com::sun::star;
SdrGlobalData::SdrGlobalData() :
pSysLocale(nullptr),
pLocaleData(nullptr),
pOutliner(nullptr),
pDefaults(nullptr),
pResMgr(nullptr),
nExchangeFormat(0)
pResMgr(nullptr)
{
if (!utl::ConfigManager::IsAvoidConfig())
{
@@ -397,8 +395,6 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
}
SdrEngineDefaults::SdrEngineDefaults():
aFontName( OutputDevice::GetDefaultFont( DefaultFontType::SERIF, LANGUAGE_SYSTEM, GetDefaultFontFlags::OnlyOne ).GetName() ),
eFontFamily(FAMILY_ROMAN),
aFontColor(COL_AUTO),
nFontHeight(847), // 847/100mm = ca. 24 Point
eMapUnit(MAP_100TH_MM),
svx/source/svdraw/svdmodel.cxx
-5
View File
@@ -234,7 +234,6 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
}
SdrModel::SdrModel():
aReadDate( DateTime::EMPTY ),
maMaPag(),
maPages()
{
@@ -242,7 +241,6 @@ SdrModel::SdrModel():
}
SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts):
aReadDate( DateTime::EMPTY ),
maMaPag(),
maPages()
{
@@ -250,7 +248,6 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, boo
}
SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts):
aReadDate( DateTime::EMPTY ),
maMaPag(),
maPages(),
aTablePath(rPath)
@@ -2101,7 +2098,6 @@ const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId()
SdrHint::SdrHint(SdrHintKind eNewHint)
: mpPage(nullptr),
mpObj(nullptr),
mpObjList(nullptr),
meHint(eNewHint)
{
}
@@ -2109,7 +2105,6 @@ SdrHint::SdrHint(SdrHintKind eNewHint)
SdrHint::SdrHint(const SdrObject& rNewObj)
: mpPage(rNewObj.GetPage()),
mpObj(&rNewObj),
mpObjList(rNewObj.GetObjList()),
meHint(HINT_OBJCHG)
{
maRectangle = rNewObj.GetLastBoundRect();
svx/source/svdraw/svdotxln.cxx
+4 -5
View File
@@ -100,9 +100,8 @@ void ImpSdrObjTextLink::Closed()
}
ImpSdrObjTextLinkUserData::ImpSdrObjTextLinkUserData(SdrTextObj* pObj1):
ImpSdrObjTextLinkUserData::ImpSdrObjTextLinkUserData():
SdrObjUserData(SdrInventor,SDRUSERDATA_OBJTEXTLINK,0),
pObj(pObj1),
aFileDate0( DateTime::EMPTY ),
pLink(nullptr),
eCharSet(RTL_TEXTENCODING_DONTKNOW)
@@ -114,9 +113,9 @@ ImpSdrObjTextLinkUserData::~ImpSdrObjTextLinkUserData()
delete pLink;
}
SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* pObj1) const
SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* ) const
{
ImpSdrObjTextLinkUserData* pData=new ImpSdrObjTextLinkUserData(static_cast<SdrTextObj*>(pObj1));
ImpSdrObjTextLinkUserData* pData=new ImpSdrObjTextLinkUserData;
pData->aFileName =aFileName;
pData->aFilterName=aFilterName;
pData->aFileDate0 =aFileDate0;
@@ -135,7 +134,7 @@ void SdrTextObj::SetTextLink(const OUString& rFileName, const OUString& rFilterN
if (pData!=nullptr) {
ReleaseTextLink();
}
pData=new ImpSdrObjTextLinkUserData(this);
pData=new ImpSdrObjTextLinkUserData;
pData->aFileName=rFileName;
pData->aFilterName=rFilterName;
pData->eCharSet=eCharSet;
svx/source/svdraw/svdouno.cxx
+4 -7
View File
@@ -148,9 +148,8 @@ namespace
}
SdrUnoObj::SdrUnoObj(const OUString& rModelName, bool _bOwnUnoControlModel)
: m_pImpl( new SdrUnoObjDataHolder ),
bOwnUnoControlModel( _bOwnUnoControlModel )
SdrUnoObj::SdrUnoObj(const OUString& rModelName)
: m_pImpl( new SdrUnoObjDataHolder )
{
bIsUnoObj = true;
@@ -162,10 +161,8 @@ SdrUnoObj::SdrUnoObj(const OUString& rModelName, bool _bOwnUnoControlModel)
}
SdrUnoObj::SdrUnoObj(const OUString& rModelName,
const uno::Reference< lang::XMultiServiceFactory >& rxSFac,
bool _bOwnUnoControlModel)
: m_pImpl( new SdrUnoObjDataHolder ),
bOwnUnoControlModel( _bOwnUnoControlModel )
const uno::Reference< lang::XMultiServiceFactory >& rxSFac)
: m_pImpl( new SdrUnoObjDataHolder )
{
bIsUnoObj = true;
svx/source/svdraw/svdsnpv.cxx
-5
View File
@@ -184,16 +184,11 @@ SdrSnapView::SdrSnapView(SdrModel* pModel1, OutputDevice* pOut)
, eCrookMode(SDRCROOK_ROTATE)
, bSnapEnab(true)
, bGridSnap(true)
, bSnapTo1Pix(true)
, bBordSnap(true)
, bHlplSnap(true)
, bOFrmSnap(true)
, bOPntSnap(false)
, bOConSnap(true)
, bMoveMFrmSnap(true)
, bMoveOFrmSnap(true)
, bMoveOPntSnap(true)
, bMoveOConSnap(true)
, bMoveSnapOnlyTopLeft(false)
, bOrtho(false)
, bBigOrtho(true)
svx/source/svdraw/svdundo.cxx
-2
View File
@@ -681,8 +681,6 @@ OUString SdrUndoGeoObj::GetComment() const
SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect)
: SdrUndoObj(rNewObj)
, bOwner(false)
, pView(nullptr)
, pPageView(nullptr)
{
pObjList=pObj->GetObjList();
if (bOrdNumDirect)
svx/source/svdraw/svdview.cxx
-2
View File
@@ -60,7 +60,6 @@ SdrViewEvent::SdrViewEvent()
pURLField(nullptr),
eHit(SDRHIT_NONE),
eEvent(SDREVENT_NONE),
eHdlKind(HDL_MOVE),
eEndCreateCmd(SDRCREATE_NEXTPOINT),
nMouseClicks(0),
nMouseMode(MouseEventModifiers::NONE),
@@ -69,7 +68,6 @@ SdrViewEvent::SdrViewEvent()
nGlueId(0),
bMouseDown(false),
bMouseUp(false),
bDoubleHdlSize(false),
bIsAction(false),
bIsTextEdit(false),
bTextEditHit(false),