basctl/source/dlged/dlgedobj.cxx | 4 -
compilerplugins/clang/unusedfields.py | 3
cui/source/tabpages/tpbitmap.cxx | 2
idl/source/objects/slot.cxx | 5 -
include/package/Deflater.hxx | 1
include/registry/registry.hxx | 3
include/sfx2/msg.hxx | 13 +--
include/sfx2/objsh.hxx | 1
include/sfx2/tabdlg.hxx | 5 -
include/sfx2/tbxctrl.hxx | 4 -
include/sfx2/templatedefaultview.hxx | 1
include/sfx2/viewfrm.hxx | 17 -----
include/sot/object.hxx | 1
include/svl/filerec.hxx | 2
include/svtools/ruler.hxx | 2
include/svtools/treelistbox.hxx | 1
include/svx/EnhancedCustomShape2d.hxx | 7 --
include/svx/dlgctrl.hxx | 3
include/svx/fmgridif.hxx | 1
include/svx/fmshell.hxx | 1
include/svx/gallery1.hxx | 1
include/svx/galtheme.hxx | 14 ----
include/svx/msdffdef.hxx | 15 ----
include/svx/srchdlg.hxx | 1
include/svx/svdetc.hxx | 4 -
include/svx/svdmodel.hxx | 2
include/svx/svdotext.hxx | 4 -
include/svx/svdouno.hxx | 6 -
include/svx/svdsnpv.hxx | 7 --
include/svx/svdundo.hxx | 2
include/svx/svdview.hxx | 2
include/toolkit/awt/vclxdevice.hxx | 1
include/tools/inetmime.hxx | 22 ------
include/unotools/atom.hxx | 6 -
package/source/zipapi/Deflater.cxx | 1
registry/source/registry.cxx | 94 ----------------------------
reportdesign/source/core/sdr/RptObject.cxx | 4 -
sc/inc/scabstdlg.hxx | 6 -
sc/source/ui/attrdlg/attrdlg.cxx | 4 -
sc/source/ui/attrdlg/scdlgfact.cxx | 28 +++-----
sc/source/ui/attrdlg/scdlgfact.hxx | 6 -
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/inc/attrdlg.hxx | 3
sc/source/ui/inc/hfedtdlg.hxx | 22 +++---
sc/source/ui/pagedlg/hfedtdlg.cxx | 45 ++++++-------
sc/source/ui/pagedlg/tphf.cxx | 2
sc/source/ui/view/tabvwsha.cxx | 2
sd/source/ui/dlg/PaneShells.cxx | 4 -
sfx2/source/control/templatedefaultview.cxx | 1
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 26 -------
sfx2/source/doc/objxtor.cxx | 2
sot/source/base/object.cxx | 1
svtools/source/control/ruler.cxx | 22 +++---
svx/source/dialog/dlgctrl.cxx | 5 -
svx/source/dialog/srchdlg.cxx | 1
svx/source/fmcomp/fmgridif.cxx | 1
svx/source/form/fmshell.cxx | 1
svx/source/gallery2/gallery1.cxx | 3
svx/source/svdraw/svdetc.cxx | 6 -
svx/source/svdraw/svdmodel.cxx | 5 -
svx/source/svdraw/svdotxln.cxx | 9 +-
svx/source/svdraw/svdouno.cxx | 11 +--
svx/source/svdraw/svdsnpv.cxx | 5 -
svx/source/svdraw/svdundo.cxx | 2
svx/source/svdraw/svdview.cxx | 2
svx/source/toolbars/extrusionbar.cxx | 2
svx/source/toolbars/fontworkbar.cxx | 2
sw/source/ui/chrdlg/chardlg.cxx | 2
sw/source/ui/frmdlg/frmdlg.cxx | 11 +--
sw/source/ui/table/tabledlg.cxx | 2
toolkit/source/awt/vclxdevice.cxx | 3
tools/source/inet/inetmime.cxx | 3
73 files changed, 112 insertions(+), 405 deletions(-)
New commits:
commit 631b67952909a73ba1851417bd2edbe02ad7be5a
Author: Noel Grandin <n...@peralex.com>
Date: Wed Nov 25 08:24:32 2015 +0200
loplugin:unusedfields in include/toolkit,include/tools
Change-Id: I22966b66b1b8e4dff2e565de456f21a668f33f28
diff --git a/include/toolkit/awt/vclxdevice.hxx
b/include/toolkit/awt/vclxdevice.hxx
index b5f9844..4d54ec5 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -52,7 +52,6 @@ private:
VclPtr<OutputDevice> mpOutputDevice;
public:
- void* pDummy;
sal_uInt32 nFlags;
public:
diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx
index 73d9975..819e3b0 100644
--- a/include/tools/inetmime.hxx
+++ b/include/tools/inetmime.hxx
@@ -33,23 +33,6 @@ class INetMIMEOutputSink;
struct INetContentTypeParameter
{
- /** The name of the attribute, in US-ASCII encoding and converted to lower
- case. If a parameter value is split as described in RFC 2231, there
- will only be one item for the complete parameter, with the attribute
- name lacking any section suffix.
- */
- OString m_sAttribute;
-
- /** The optional character set specification (see RFC 2231), in US-ASCII
- encoding and converted to lower case.
- */
- OString m_sCharset;
-
- /** The optional language specification (see RFC 2231), in US-ASCII
- encoding and converted to lower case.
- */
- OString m_sLanguage;
-
/** The attribute value. If the value is a quoted-string, it is
'unpacked.' If a character set is specified, and the value can be
converted to Unicode, this is done. Also, if no character set is
@@ -69,11 +52,6 @@ struct INetContentTypeParameter
*/
OUString m_sValue;
- /** This is true if the value is successfully converted to Unicode, and
- false if the value is a special mixture of ISO-LATIN-1 characters and
- characters from Unicode's Private Use Area.
- */
- bool m_bConverted;
};
// the key is the m_sAttribute again; all keys are lower case:
diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx
index fdc656e..f8f684c 100644
--- a/include/unotools/atom.hxx
+++ b/include/unotools/atom.hxx
@@ -31,12 +31,6 @@
namespace utl {
- struct AtomDescription
- {
- int atom;
- OUString description;
- };
-
class AtomProvider
{
int m_nAtoms;
diff --git a/toolkit/source/awt/vclxdevice.cxx
b/toolkit/source/awt/vclxdevice.cxx
index 0c31325..63ccd60 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -43,8 +43,7 @@
// class VCLXDevice
VCLXDevice::VCLXDevice()
- : pDummy(nullptr)
- , nFlags(0)
+ : nFlags(0)
{
}
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index d4004c7..6ed448d 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -690,8 +690,7 @@ bool parseParameters(ParameterList const & rInput,
}
auto const ret = pOutput->insert(
{p->m_aAttribute,
- {p->m_aAttribute, p->m_aCharset, p->m_aLanguage, aValue,
- !bBadEncoding}});
+ {aValue}});
SAL_INFO_IF(!ret.second, "tools",
"INetMIME: dropping duplicate parameter: " << p->m_aAttribute);
p = pNext;
commit a4af308d90463049379557e2efc0205972164384
Author: Noel Grandin <n...@peralex.com>
Date: Wed Nov 25 07:00:23 2015 +0200
loplugin:unusedfields in include/svx
Change-Id: I946c64d103f3666e5bbff16d95a5c8e65a3750dc
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 272ed2f..86786e8 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -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 )
{
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 8840970..460fef5 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -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();
diff --git a/include/svx/EnhancedCustomShape2d.hxx
b/include/svx/EnhancedCustomShape2d.hxx
index c4052fb..667ad5c 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 f19a07e..9757cd0 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 dad6668..9747eab 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 0549cbd..9c00f8c 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 8c334f0..dc5d0a9 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 6d44850..6c18776 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 7d4323b..fc2f7af 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 dca1fd9..cc4beda 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 4869844..0cc1798 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 8f80c02..49e8c55 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 132b5b8..d43bc50 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 3ffe969..73f0864 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 6f39b10..e041b7e 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 d90345c..966e408 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 5414581..eb2b653 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?
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index 629c731..c7fd48f 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -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)
{
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 9ac39b3..d1b9a48 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -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)
{
}
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 54ee17f..5741e29 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -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)
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index e91d2f3..12adb13 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -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)
{
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index e9e39a0..c8bbc1b 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -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)
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index fb81325..a5ce139 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -166,8 +166,7 @@ public:
// - Gallery -
Gallery::Gallery( const OUString& rMultiPath )
-: nReadTextEncoding ( osl_getThreadTextEncoding() )
-, bMultiPath ( false )
+: bMultiPath ( false )
{
ImplLoad( rMultiPath );
}
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 9efc087..1912588 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -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),
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 7a688da..9d3fe07 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -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();
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 840dbbe..7374491 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -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;
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index d51809a..1f2b33e 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -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;
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 2a97790..3d00bf9 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -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)
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index f9132dc..b3cf6ae 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -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)
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 526a7b2..3c20cca 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -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),
commit 234884c09db0301b9f0b3336f9b0dbb9523ee005
Author: Noel Grandin <n...@peralex.com>
Date: Tue Nov 24 18:54:48 2015 +0200
loplugin:unusedfields in include/sot,include/svl,include/svtools
Change-Id: Ia2dd13c2c48b127ab85311a668fa1f37608d360a
diff --git a/compilerplugins/clang/unusedfields.py
b/compilerplugins/clang/unusedfields.py
index 7fc6d4a..4748888 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -67,7 +67,8 @@ for d in definitionSet:
or srcLoc.startswith("vcl/source/filter/sgvmain.hxx")
or srcLoc.startswith("vcl/source/filter/sgfbram.hxx")
or srcLoc.startswith("vcl/inc/unx/XIM.h")
- or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")):
+ or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")
+ or srcLoc.startswith("include/svl/svdde.hxx")):
continue
tmp1set.add((clazz + " " + definitionToTypeMap[d], srcLoc))
diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index 6699d92..f2c3b24 100644
--- a/include/sot/object.hxx
+++ b/include/sot/object.hxx
@@ -30,7 +30,6 @@ class SOT_DLLPUBLIC SotObject : virtual public SvRefBase
friend class SotFactory;
sal_uInt16 nOwnerLockCount;
bool bOwner;
- bool bSVObject; // is proxy, then TRUE if other side is SV
bool bInClose; // TRUE, in DoClose
protected:
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index bf92859..da9ac35 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -313,13 +313,11 @@ class SVL_DLLPUBLIC SfxSingleRecordReader: public
SfxMiniRecordReader
{
protected:
sal_uInt16 _nRecordTag; // type of the complete contents
- sal_uInt8 _nRecordVer; // version of the complete contents
sal_uInt8 _nRecordType; // Record Type from the header
// Three phase constructor for derived classes
SfxSingleRecordReader()
: _nRecordTag(0)
- , _nRecordVer(0)
, _nRecordType(0)
{
}
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 5e2ee84..c53e567 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -573,8 +573,6 @@ struct RulerUnitData
double nTick2; // Tick quarter unit
double nTick3; // Tick half unit
double nTick4; // Tick whole unit
- long n100THMM; // 100mm Unit divider
- sal_uInt16 nUnitDigits; // Number of digits
sal_Char aUnitStr[8]; // Unit string
};
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index ed52d9e..1a8d741 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -259,7 +259,6 @@ class SVT_DLLPUBLIC SvTreeListBox
bool mbUpdateAlternatingRows;
SvTreeListEntry* pHdlEntry;
- SvLBoxItem* pHdlItem;
DragDropMode nDragDropMode;
DragDropMode nOldDragMode;
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 9f39e03..1180252 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -58,7 +58,6 @@ void * SotObject::Cast( const SotFactory * pFact )
SotObject::SotObject()
: nOwnerLockCount( 0 )
, bOwner ( true )
- , bSVObject ( false )
, bInClose ( false )
{
SotFactory::IncSvObjectCount( this );
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index b48f1e8..1a2d257 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -179,17 +179,17 @@ ImplRulerData& ImplRulerData::operator=( const
ImplRulerData& rData )
static const RulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] =
{
-{ MAP_100TH_MM, 100, 25.0, 25.0, 50.0, 100.0, 100, 3,
" mm" }, // MM
-{ MAP_100TH_MM, 1000, 100.0, 500.0, 1000.0, 1000.0, 1000, 3,
" cm" }, // CM
-{ MAP_MM, 1000, 10.0, 250.0, 500.0, 1000.0, 10000, 4,
" m" }, // M
-{ MAP_CM, 100000, 12500.0, 25000.0, 50000.0, 100000.0, 100000, 6,
" km" }, // KM
-{ MAP_1000TH_INCH, 1000, 62.5, 125.0, 500.0, 1000.0, 25400, 3,
"\"" }, // INCH
-{ MAP_100TH_INCH, 1200, 120.0, 120.0, 600.0, 1200.0, 30480, 3,
"'" }, // FOOT
-{ MAP_10TH_INCH, 633600, 63360.0, 63360.0, 316800.0, 633600.0, 1609344, 4,
" miles" }, // MILE
-{ MAP_POINT, 1, 12.0, 12.0, 12.0, 36.0, 353, 2,
" pt" }, // POINT
-{ MAP_100TH_MM, 423, 423.0, 423.0, 423.0, 846.0, 423, 3,
" pi" }, // PICA
-{ MAP_100TH_MM, 371, 371.0, 371.0, 371.0, 743.0, 371, 3,
" ch" }, // CHAR
-{ MAP_100TH_MM, 551, 551.0, 551.0, 551.0, 1102.0, 551, 3,
" li" } // LINE
+{ MAP_100TH_MM, 100, 25.0, 25.0, 50.0, 100.0, " mm" },
// MM
+{ MAP_100TH_MM, 1000, 100.0, 500.0, 1000.0, 1000.0, " cm" },
// CM
+{ MAP_MM, 1000, 10.0, 250.0, 500.0, 1000.0, " m" },
// M
+{ MAP_CM, 100000, 12500.0, 25000.0, 50000.0, 100000.0, " km" },
// KM
+{ MAP_1000TH_INCH, 1000, 62.5, 125.0, 500.0, 1000.0, "\"" },
// INCH
+{ MAP_100TH_INCH, 1200, 120.0, 120.0, 600.0, 1200.0, "'" },
// FOOT
+{ MAP_10TH_INCH, 633600, 63360.0, 63360.0, 316800.0, 633600.0, " miles" },
// MILE
+{ MAP_POINT, 1, 12.0, 12.0, 12.0, 36.0, " pt" },
// POINT
+{ MAP_100TH_MM, 423, 423.0, 423.0, 423.0, 846.0, " pi" },
// PICA
+{ MAP_100TH_MM, 371, 371.0, 371.0, 371.0, 743.0, " ch" },
// CHAR
+{ MAP_100TH_MM, 551, 551.0, 551.0, 551.0, 1102.0, " li" }
// LINE
};
static RulerTabData ruler_tab =
commit 85c758a4618d3a485f778bda5b20a8221161e399
Author: Noel Grandin <n...@peralex.com>
Date: Tue Nov 24 16:05:34 2015 +0200
loplugin:unusedfields in include/sfx2/
Change-Id: I3eb27ed10e82ee56b33866ac576c1b1f8c9756b9
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 6d8157b..774bcda 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -725,11 +725,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName,
sal_uInt16 nCount,
rOutStm.WriteCharPtr( "SFX_NEW_SLOT_ARG( " ).WriteCharPtr(
rShellName.getStr() ).WriteChar( ',' ) ;
rOutStm.WriteCharPtr( rSlotId.getStr() ).WriteChar( ',' );
- const SvHelpContext& rHlpCtx = GetHelpContext();
- if( rHlpCtx.IsSet() )
- rOutStm.WriteCharPtr( rHlpCtx.getString().getStr() ).WriteChar( ',' );
- else
- rOutStm.WriteCharPtr( rSlotId.getStr() ).WriteChar( ',' );
// GroupId
if( !GetGroupId().isEmpty() )
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 25fdbcd..30312b9 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -162,7 +162,7 @@ SFX_DECL_TYPE(22); // for SvxSearchItem
#undef SFX_DECL_TYPE
#define SFX_SLOT_ARG( aShellClass, id, GroupId, ExecMethodPtr, StateMethodPtr,
Flags, ItemClass, nArg0, nArgs, Name, Prop ) \
- { id, GroupId, id, Flags | Prop, \
+ { id, GroupId, Flags | Prop, \
USHRT_MAX, 0, \
ExecMethodPtr, \
StateMethodPtr, \
@@ -172,7 +172,7 @@ SFX_DECL_TYPE(22); // for SvxSearchItem
}
#define SFX_SLOT( aShellClass, id, GroupId, ExecMethodPtr, StateMethodPtr,
Flags, ItemClass ) \
- { id, GroupId, id, Flags, \
+ { id, GroupId, Flags, \
0, 0, \
ExecMethodPtr, \
StateMethodPtr, \
@@ -180,8 +180,8 @@ SFX_DECL_TYPE(22); // for SvxSearchItem
0, 0, 0, 0, 0 \
}
-#define SFX_NEW_SLOT_ARG( aShellClass, id, hid, GroupId, pLinked, pNext,
ExecMethodPtr, StateMethodPtr, Flags, DisableFlags, ItemClass, nArg0, nArgs,
Prop, UnoName ) \
- { id, GroupId, hid, Flags | Prop, \
+#define SFX_NEW_SLOT_ARG( aShellClass, id, GroupId, pLinked, pNext,
ExecMethodPtr, StateMethodPtr, Flags, DisableFlags, ItemClass, nArg0, nArgs,
Prop, UnoName ) \
+ { id, GroupId, Flags | Prop, \
USHRT_MAX, 0, \
ExecMethodPtr, \
StateMethodPtr, \
@@ -190,8 +190,8 @@ SFX_DECL_TYPE(22); // for SvxSearchItem
&a##aShellClass##Args_Impl[nArg0], nArgs, DisableFlags,
UnoName \
}
-#define SFX_NEW_SLOT_ENUM( SlaveId, hid, GroupId, pMaster, pNext, MasterId,
Value, Flags, DisableFlags, UnoName ) \
- { SlaveId, GroupId, hid, Flags, \
+#define SFX_NEW_SLOT_ENUM( SlaveId, GroupId, pMaster, pNext, MasterId, Value,
Flags, DisableFlags, UnoName ) \
+ { SlaveId, GroupId, Flags, \
MasterId, Value, \
0, \
0, \
@@ -222,7 +222,6 @@ class SfxSlot
public:
sal_uInt16 nSlotId; // Unique slot-ID in Shell
sal_uInt16 nGroupId; // for configuration region
- sal_uIntPtr nHelpId; // Usually == nSlotId
SfxSlotMode nFlags; // arithmetic ordered Flags
sal_uInt16 nMasterSlotId; // Enum-Slot for example Which-Id
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index a266171..8eca878 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -211,7 +211,6 @@ private:
SfxMedium * pMedium; // Description of the file for
example
// storage that contains the object
- SfxStyleSheetBasePool* pStyleSheetPool; // StyleSheets
SfxObjectCreateMode eCreateMode; // Purpose of the object
bool bHasName :1; // sal_True := existing
object,
// sal_False := new object
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index f1dc53c..795714e 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -61,8 +61,6 @@ private:
friend class SfxTabPage;
friend class SfxTabDialogController;
- SfxViewFrame* pFrame;
-
VclPtr<VclBox> m_pBox;
VclPtr<TabControl> m_pTabCtrl;
@@ -124,9 +122,6 @@ public:
SfxTabDialog(vcl::Window* pParent,
const OUString& rID, const OUString& rUIXMLDescription,
const SfxItemSet * = nullptr, bool bEditFmt = false);
- SfxTabDialog(SfxViewFrame *pViewFrame, vcl::Window* pParent,
- const OUString& rID, const OUString& rUIXMLDescription,
- const SfxItemSet * = nullptr, bool bEditFmt = false);
virtual ~SfxTabDialog();
virtual void dispose() override;
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 5bf2bf7..241e7a4 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -282,10 +282,6 @@ class SfxAddonsToolBoxControl_Impl : public
SfxToolBoxControl
*/
{
- bool bBigImages;
- PopupMenu* pMenu;
- bool m_bShowMenuImages;
-
protected:
virtual void Click() override;
virtual void Select(sal_uInt16 nSelectModifier) override;
diff --git a/include/sfx2/templatedefaultview.hxx
b/include/sfx2/templatedefaultview.hxx
index 436aef4..e0f10d4 100644
--- a/include/sfx2/templatedefaultview.hxx
+++ b/include/sfx2/templatedefaultview.hxx
@@ -23,7 +23,6 @@ protected:
long mnItemMaxSize;
long mnTextHeight;
long mnItemPadding;
- size_t mnLastMouseDownItem;
};
#endif // INCLUDED_SFX2_TEMPLATEDEFAULTVIEW_HXX
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index bc89068..b2bb823 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -295,23 +295,6 @@ public:
{ return pFrame; }
};
-class SfxVerbListItem : public SfxPoolItem
-{
- css::uno::Sequence < css::embed::VerbDescriptor > aVerbs;
-
-public:
- SfxVerbListItem( sal_uInt16 nWhichId = SID_OBJECT
) :
- SfxPoolItem( nWhichId )
- {}
-
- SfxVerbListItem( sal_uInt16 nWhichId, const
css::uno::Sequence < css::embed::VerbDescriptor >& );
-
- virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
-
- virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 5aafb1d..de4c115 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -463,12 +463,10 @@ public:
bool
bOnlyDbtoolsEncodings = false,
bool
bImport = true ) = 0;
- virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame,
- vcl::Window*
pParent,
+ virtual SfxAbstractTabDialog * CreateScAttrDlg( vcl::Window*
pParent,
const SfxItemSet*
pCellAttrs ) = 0;
- virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame,
- vcl::Window*
pParent,
+ virtual SfxAbstractTabDialog * CreateScHFEditDlg(vcl::Window*
pParent,
const SfxItemSet&
rCoreSet,
const OUString&
rPageStyle,
sal_uInt16
nResId = RID_SCDLG_HFEDIT ) = 0;
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 0002c81..8c5005f 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -34,8 +34,8 @@
#include <editeng/flstitem.hxx>
#include <sfx2/app.hxx>
-ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, vcl::Window* pParent, const
SfxItemSet* pCellAttrs)
- : SfxTabDialog(pFrameP, pParent, "FormatCellsDialog",
"modules/scalc/ui/formatcellsdialog.ui", pCellAttrs)
+ScAttrDlg::ScAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs)
+ : SfxTabDialog(pParent, "FormatCellsDialog",
"modules/scalc/ui/formatcellsdialog.ui", pCellAttrs)
{
SvtCJKOptions aCJKOptions;
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 3f7e5a0..c517901 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -904,15 +904,13 @@ AbstractScImportOptionsDlg *
ScAbstractDialogFactory_Impl::CreateScImportOptions
return new AbstractScImportOptionsDlg_Impl( pDlg );
}
-SfxAbstractTabDialog *
ScAbstractDialogFactory_Impl::CreateScAttrDlg(SfxViewFrame* pFrame,
- vcl::Window* pParent, const SfxItemSet* pCellAttrs)
+SfxAbstractTabDialog *
ScAbstractDialogFactory_Impl::CreateScAttrDlg(vcl::Window* pParent, const
SfxItemSet* pCellAttrs)
{
- VclPtr<SfxTabDialog> pDlg = VclPtr<ScAttrDlg>::Create(pFrame, pParent,
pCellAttrs);
+ VclPtr<SfxTabDialog> pDlg = VclPtr<ScAttrDlg>::Create(pParent, pCellAttrs);
return new ScAbstractTabDialog_Impl(pDlg);
}
-SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg(
SfxViewFrame* pFrame,
-
vcl::Window* pParent,
+SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg(
vcl::Window* pParent,
const
SfxItemSet& rCoreSet,
const
OUString& rPageStyle,
sal_uInt16 nResId )
@@ -923,36 +921,36 @@ SfxAbstractTabDialog *
ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
{
case RID_SCDLG_HFED_HEADER:
case RID_SCDLG_HFEDIT_HEADER:
- pDlg = VclPtr<ScHFEditHeaderDlg>::Create(pFrame, pParent,
rCoreSet, rPageStyle);
+ pDlg = VclPtr<ScHFEditHeaderDlg>::Create(pParent, rCoreSet,
rPageStyle);
break;
case RID_SCDLG_HFED_FOOTER:
case RID_SCDLG_HFEDIT_FOOTER:
- pDlg = VclPtr<ScHFEditFooterDlg>::Create(pFrame, pParent,
rCoreSet, rPageStyle);
+ pDlg = VclPtr<ScHFEditFooterDlg>::Create(pParent, rCoreSet,
rPageStyle);
break;
case RID_SCDLG_HFEDIT_LEFTHEADER:
- pDlg = VclPtr<ScHFEditLeftHeaderDlg>::Create(pFrame, pParent,
rCoreSet, rPageStyle);
+ pDlg = VclPtr<ScHFEditLeftHeaderDlg>::Create(pParent, rCoreSet,
rPageStyle);
break;
case RID_SCDLG_HFEDIT_RIGHTHEADER:
- pDlg = VclPtr<ScHFEditRightHeaderDlg>::Create(pFrame, pParent,
rCoreSet, rPageStyle);
+ pDlg = VclPtr<ScHFEditRightHeaderDlg>::Create(pParent, rCoreSet,
rPageStyle);
break;
case RID_SCDLG_HFEDIT_LEFTFOOTER:
- pDlg = VclPtr<ScHFEditLeftFooterDlg>::Create(pFrame, pParent,
rCoreSet, rPageStyle);
+ pDlg = VclPtr<ScHFEditLeftFooterDlg>::Create(pParent, rCoreSet,
rPageStyle);
break;
case RID_SCDLG_HFEDIT_RIGHTFOOTER:
- pDlg = VclPtr<ScHFEditRightFooterDlg>::Create(pFrame, pParent,
rCoreSet, rPageStyle);
+ pDlg = VclPtr<ScHFEditRightFooterDlg>::Create(pParent, rCoreSet,
rPageStyle);
break;
case RID_SCDLG_HFEDIT_SHDR:
- pDlg = VclPtr<ScHFEditSharedHeaderDlg>::Create(pFrame, pParent,
rCoreSet, rPageStyle);
+ pDlg = VclPtr<ScHFEditSharedHeaderDlg>::Create(pParent, rCoreSet,
rPageStyle);
break;
case RID_SCDLG_HFEDIT_SFTR:
- pDlg = VclPtr<ScHFEditSharedFooterDlg>::Create(pFrame, pParent,
rCoreSet, rPageStyle);
+ pDlg = VclPtr<ScHFEditSharedFooterDlg>::Create(pParent, rCoreSet,
rPageStyle);
break;
case RID_SCDLG_HFEDIT_ALL:
- pDlg = VclPtr<ScHFEditAllDlg>::Create(pFrame, pParent, rCoreSet,
rPageStyle);
+ pDlg = VclPtr<ScHFEditAllDlg>::Create(pParent, rCoreSet,
rPageStyle);
break;
default:
case RID_SCDLG_HFEDIT:
- pDlg = VclPtr<ScHFEditActiveDlg>::Create(pFrame, pParent,
rCoreSet, rPageStyle);
+ pDlg = VclPtr<ScHFEditActiveDlg>::Create(pParent, rCoreSet,
rPageStyle);
break;
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 5971f6c..40ef317 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -528,12 +528,10 @@ public:
bool
bMultiByte = false,
bool
bOnlyDbtoolsEncodings = false,
bool
bImport = true ) override;
- virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame,
- vcl::Window*
pParent,
+ virtual SfxAbstractTabDialog * CreateScAttrDlg( vcl::Window*
pParent,
const SfxItemSet*
pCellAttrs ) override;
- virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame,
- vcl::Window*
pParent,
+ virtual SfxAbstractTabDialog * CreateScHFEditDlg(vcl::Window*
pParent,
const SfxItemSet&
rCoreSet,
const OUString&
rPageStyle,
sal_uInt16
nResId = RID_SCDLG_HFEDIT ) override;
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index d35f4f8..0a0a7c3 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1714,7 +1714,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<SfxAbstractTabDialog>
pDlg(pFact->CreateScHFEditDlg( SfxViewFrame::Current(),
+ std::unique_ptr<SfxAbstractTabDialog>
pDlg(pFact->CreateScHFEditDlg(
GetActiveDialogParent(),
rStyleSet,
aStr,
diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx
index 2056c99..e790bc7 100644
--- a/sc/source/ui/inc/attrdlg.hxx
+++ b/sc/source/ui/inc/attrdlg.hxx
@@ -29,8 +29,7 @@ class SfxItemSet;
class ScAttrDlg : public SfxTabDialog
{
public:
- ScAttrDlg( SfxViewFrame* pFrame,
- vcl::Window* pParent,
+ ScAttrDlg( vcl::Window* pParent,
const SfxItemSet* pCellAttrs );
virtual ~ScAttrDlg();
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx
index dfacb8e..712b090 100644
--- a/sc/source/ui/inc/hfedtdlg.hxx
+++ b/sc/source/ui/inc/hfedtdlg.hxx
@@ -29,7 +29,7 @@ class ScHFEditDlg : public SfxTabDialog
{
SvxNumType eNumType;
protected:
- ScHFEditDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle,
const OUString& rID, const OUString& rUIXMLDescription );
public:
@@ -39,70 +39,70 @@ public:
class ScHFEditHeaderDlg : public ScHFEditDlg
{
public:
- ScHFEditHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditHeaderDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditFooterDlg : public ScHFEditDlg
{
public:
- ScHFEditFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditFooterDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditLeftHeaderDlg : public ScHFEditDlg
{
public:
- ScHFEditLeftHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditLeftHeaderDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditRightHeaderDlg : public ScHFEditDlg
{
public:
- ScHFEditRightHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditRightHeaderDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditLeftFooterDlg : public ScHFEditDlg
{
public:
- ScHFEditLeftFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditLeftFooterDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditRightFooterDlg : public ScHFEditDlg
{
public:
- ScHFEditRightFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditRightFooterDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditSharedHeaderDlg : public ScHFEditDlg
{
public:
- ScHFEditSharedHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditSharedHeaderDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditSharedFooterDlg : public ScHFEditDlg
{
public:
- ScHFEditSharedFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditSharedFooterDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditAllDlg : public ScHFEditDlg
{
public:
- ScHFEditAllDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditAllDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
class ScHFEditActiveDlg : public ScHFEditDlg
{
public:
- ScHFEditActiveDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
+ ScHFEditActiveDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet, const OUString& rPageStyle);
};
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx
b/sc/source/ui/pagedlg/hfedtdlg.cxx
index 14ddddb..6375322 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -41,12 +41,11 @@
static_cast<const
SvxSetItem&>((set).Get(ATTR_PAGE_FOOTERSET)).GetItemSet(). \
Get(ATTR_PAGE_SHARED)).GetValue()
-ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP,
- vcl::Window* pParent,
+ScHFEditDlg::ScHFEditDlg( vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle,
const OUString& rID, const OUString&
rUIXMLDescription )
- : SfxTabDialog( pFrameP, pParent, rID, rUIXMLDescription, &rCoreSet )
+ : SfxTabDialog( pParent, rID, rUIXMLDescription, &rCoreSet )
{
eNumType = static_cast<const
SvxPageItem&>(rCoreSet.Get(ATTR_PAGE)).GetNumType();
@@ -57,73 +56,73 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP,
SetText( aTmp );
}
-ScHFEditHeaderDlg::ScHFEditHeaderDlg( SfxViewFrame* pFrameP,
+ScHFEditHeaderDlg::ScHFEditHeaderDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle)
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"HeaderDialog", "modules/scalc/ui/headerdialog.ui" )
{
AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr );
}
-ScHFEditFooterDlg::ScHFEditFooterDlg( SfxViewFrame* pFrameP,
+ScHFEditFooterDlg::ScHFEditFooterDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle)
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"FooterDialog", "modules/scalc/ui/footerdialog.ui" )
{
AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr );
AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
}
-ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( SfxViewFrame* pFrameP,
+ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle)
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"LeftHeaderDialog", "modules/scalc/ui/leftheaderdialog.ui" )
{
AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr );
}
-ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( SfxViewFrame* pFrameP,
+ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle)
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"RightHeaderDialog", "modules/scalc/ui/rightheaderdialog.ui" )
{
AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
}
-ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( SfxViewFrame* pFrameP,
+ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle)
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"LeftFooterDialog", "modules/scalc/ui/leftfooterdialog.ui" )
{
AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
}
-ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( SfxViewFrame* pFrameP,
+ScHFEditRightFooterDlg::ScHFEditRightFooterDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle)
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"RightFooterDialog", "modules/scalc/ui/rightfooterdialog.ui" )
{
AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr );
}
-ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( SfxViewFrame* pFrameP,
+ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle)
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"SharedHeaderDialog", "modules/scalc/ui/sharedheaderdialog.ui" )
{
AddTabPage( "header", ScRightHeaderEditPage::Create, nullptr );
@@ -131,11 +130,11 @@ ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg(
SfxViewFrame* pFrameP,
AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
}
-ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( SfxViewFrame* pFrameP,
+ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle)
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"SharedFooterDialog", "modules/scalc/ui/sharedfooterdialog.ui" )
{
AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
@@ -143,11 +142,11 @@ ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg(
SfxViewFrame* pFrameP,
AddTabPage( "footer", ScRightFooterEditPage::Create, nullptr );
}
-ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP,
+ScHFEditAllDlg::ScHFEditAllDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle)
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"AllHeaderFooterDialog", "modules/scalc/ui/allheaderfooterdialog.ui" )
{
AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
@@ -156,11 +155,11 @@ ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP,
AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
}
-ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP,
+ScHFEditActiveDlg::ScHFEditActiveDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle)
- : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
"HeaderFooterDialog", "modules/scalc/ui/headerfooterdialog.ui" )
{
const SvxPageItem& rPageItem = static_cast<const SvxPageItem&>(
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 614da79..f69edd0 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -187,7 +187,7 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void)
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg(
- pViewSh->GetViewFrame(), this, aDataSet, aStrPageStyle, nResId));
+ this, aDataSet, aStrPageStyle, nResId));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 9c451be..7eebef0 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -517,7 +517,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq,
const OString &rName
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- pDlg.reset(pFact->CreateScAttrDlg(GetViewFrame(), GetDialogParent(),
pOldSet.get()));
+ pDlg.reset(pFact->CreateScAttrDlg(GetDialogParent(), pOldSet.get()));
if (!rName.isEmpty())
pDlg->SetCurPageId(rName);
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index ad3d047..d0735ac 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -33,7 +33,7 @@ namespace sd {
static SfxSlot aLeftImpressPaneShellSlots_Impl[] =
{
- { 0, 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, 0, 0, nullptr }
+ { 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, 0, 0, nullptr }
};
SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell)
@@ -58,7 +58,7 @@ LeftImpressPaneShell::~LeftImpressPaneShell()
static SfxSlot aLeftDrawPaneShellSlots_Impl[] =
{
- { 0, 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, 0, 0, nullptr }
+ { 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, 0, 0, nullptr }
};
SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell)
diff --git a/sfx2/source/control/templatedefaultview.cxx
b/sfx2/source/control/templatedefaultview.cxx
index 39ee415..5c17536 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -20,7 +20,6 @@ TemplateDefaultView::TemplateDefaultView( Window* pParent)
: TemplateLocalView(pParent)
, mnTextHeight(30)
, mnItemPadding(5)
- , mnLastMouseDownItem( THUMBNAILVIEW_ITEM_NOTFOUND )
{
Rectangle aScreen =
Application::GetScreenPosSizePixel(Application::GetDisplayBuiltInScreen());
mnItemMaxSize = std::min(aScreen.GetWidth(),aScreen.GetHeight()) > 800 ?
256 : 192;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index fb9fddc..ffb7cfc 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1182,7 +1182,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
SfxDocumentInfoDialog::SfxDocumentInfoDialog( vcl::Window* pParent,
const SfxItemSet& rItemSet )
- : SfxTabDialog(nullptr, pParent, "DocumentPropertiesDialog",
+ : SfxTabDialog(pParent, "DocumentPropertiesDialog",
"sfx/ui/documentpropertiesdialog.ui", &rItemSet)
, m_nDocInfoId(0)
{
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 1046443..795b701 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -312,30 +312,6 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const
SfxTabDialog::SfxTabDialog
-(
- SfxViewFrame* pViewFrame, // Frame, to which the Dialog belongs
- vcl::Window* pParent, // Parent Window
- const OUString& rID, const OUString& rUIXMLDescription, //Dialog Name,
Dialog .ui path
- const SfxItemSet* pItemSet, // Itemset with the data;
- // can be NULL, when Pages are onDemand
- bool bEditFmt // when yes -> additional Button for standard
-)
- : TabDialog(pParent, rID, rUIXMLDescription)
- , pFrame(pViewFrame)
- , pSet(pItemSet ? new SfxItemSet(*pItemSet) : nullptr)
- , pOutSet(nullptr)
- , pRanges(nullptr)
- , nAppPageId(USHRT_MAX)
- , bItemsReset(false)
- , bStandardPushed(false)
- , pExampleSet(nullptr)
-{
- Init_Impl(bEditFmt);
-}
-
-
-
-SfxTabDialog::SfxTabDialog
/* [Description]
@@ -350,7 +326,6 @@ SfxTabDialog::SfxTabDialog
bool bEditFmt // when yes -> additional Button for standard
)
: TabDialog(pParent, rID, rUIXMLDescription)
- , pFrame(nullptr)
, pSet(pItemSet ? new SfxItemSet(*pItemSet) : nullptr)
, pOutSet(nullptr)
, pRanges(nullptr)
@@ -360,7 +335,6 @@ SfxTabDialog::SfxTabDialog
, pExampleSet(nullptr)
{
Init_Impl(bEditFmt);
- SAL_INFO( "sfx.config", "Please use the Construtor with the ViewFrame" );
}
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 9a75ed9..5d1bf3e 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -281,7 +281,6 @@ SfxObjectShell_Impl::~SfxObjectShell_Impl()
SfxObjectShell::SfxObjectShell( const SfxModelFlags i_nCreationFlags )
: pImp(new SfxObjectShell_Impl(*this))
, pMedium(nullptr)
- , pStyleSheetPool(nullptr)
, eCreateMode(SfxObjectCreateMode::STANDARD)
, bHasName(false)
, bIsInGenerateThumbnail (false)
@@ -312,7 +311,6 @@ SfxObjectShell::SfxObjectShell( const SfxModelFlags
i_nCreationFlags )
SfxObjectShell::SfxObjectShell(SfxObjectCreateMode eMode)
: pImp(new SfxObjectShell_Impl(*this))
, pMedium(nullptr)
- , pStyleSheetPool(nullptr)
, eCreateMode(eMode)
, bHasName(false)
, bIsInGenerateThumbnail(false)
diff --git a/svx/source/toolbars/extrusionbar.cxx
b/svx/source/toolbars/extrusionbar.cxx
index 38b4eeb..b364f05 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::uno;
// tragen wir etwas ein, was hier (hoffentlich) nie vorkommt).
static SfxSlot aExtrusionBarSlots_Impl[] =
{
- { 0, 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, 0, 0, nullptr }
+ { 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, 0, 0, nullptr }
};
SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell)
diff --git a/svx/source/toolbars/fontworkbar.cxx
b/svx/source/toolbars/fontworkbar.cxx
index ee0132b..9d32139 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -168,7 +168,7 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView,
SfxItemSet& rSet )
// tragen wir etwas ein, was hier (hoffentlich) nie vorkommt).
static SfxSlot aFontworkBarSlots_Impl[] =
{
- { 0, 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, 0, 0, nullptr }
+ { 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, 0, 0, nullptr }
};
SFX_IMPL_INTERFACE(FontworkBar, SfxShell)
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 1a6209e..da6c131 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -61,7 +61,7 @@ using namespace ::sfx2;
SwCharDlg::SwCharDlg(vcl::Window* pParent, SwView& rVw, const SfxItemSet&
rCoreSet,
sal_uInt8 nDialogMode, const OUString* pStr)
- : SfxTabDialog(nullptr, pParent, "CharacterPropertiesDialog",
+ : SfxTabDialog(pParent, "CharacterPropertiesDialog",
"modules/swriter/ui/characterproperties.ui", &rCoreSet, pStr !=
nullptr)
, m_rView(rVw)
, m_nDialogMode(nDialogMode)
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 7979913..171612a 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -45,18 +45,17 @@
// the dialog's carrier
SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
- vcl::Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet& rCoreSet,
bool bNewFrm,
- const OUString& sResType,
+ const OUString& sResType,
bool bFormat,
const OString& sDefPage,
const OUString* pStr)
- : SfxTabDialog(pViewFrame, pParent, sResType,
- "modules/swriter/ui/" +
- sResType.toAsciiLowerCase() +
- (".ui"), &rCoreSet, pStr != nullptr)
+ : SfxTabDialog(pParent, sResType,
+ "modules/swriter/ui/" + sResType.toAsciiLowerCase() + ".ui",
+ &rCoreSet, pStr != nullptr)
, m_bFormat(bFormat)
, m_bNew(bNewFrm)
, m_rSet(rCoreSet)
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 597fc69..424a479 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1235,7 +1235,7 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos,
SwTwips nNewWidth)
SwTableTabDlg::SwTableTabDlg(vcl::Window* pParent, SfxItemPool&,
const SfxItemSet* pItemSet, SwWrtShell* pSh)
- : SfxTabDialog(nullptr, pParent, "TablePropertiesDialog",
+ : SfxTabDialog(pParent, "TablePropertiesDialog",
"modules/swriter/ui/tableproperties.ui", pItemSet)
, pShell(pSh)
{
commit a78182a993288680b04d1329536af5953e8ca31c
Author: Noel Grandin <n...@peralex.com>
Date: Tue Nov 24 14:24:21 2015 +0200
loplugin:unusedfields in include/package,include/registry
Change-Id: Iadba30885ba3bab7aaee58e298a9dc6b22c8b977
diff --git a/include/package/Deflater.hxx b/include/package/Deflater.hxx
index 00e3ee8..640c6d4 100644
--- a/include/package/Deflater.hxx
+++ b/include/package/Deflater.hxx
@@ -35,7 +35,6 @@ protected:
css::uno::Sequence< sal_Int8 > sInBuffer;
bool bFinish;
bool bFinished;
- sal_Int32 nStrategy;
sal_Int64 nOffset, nLength;
z_stream* pStream;
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index 76ffe26..dbbe0f1 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -43,10 +43,7 @@ struct Registry_Api
RegError (REGISTRY_CALLTYPE *openRegistry) (rtl_uString*,
RegHandle*, RegAccessMode);
RegError (REGISTRY_CALLTYPE *closeRegistry) (RegHandle);
RegError (REGISTRY_CALLTYPE *destroyRegistry) (RegHandle,
rtl_uString*);
- RegError (REGISTRY_CALLTYPE *loadKey) (RegHandle,
RegKeyHandle, rtl_uString*, rtl_uString*);
- RegError (REGISTRY_CALLTYPE *saveKey) (RegHandle,
RegKeyHandle, rtl_uString*, rtl_uString*);
RegError (REGISTRY_CALLTYPE *mergeKey) (RegHandle,
RegKeyHandle, rtl_uString*, rtl_uString*, sal_Bool, sal_Bool);
- RegError (REGISTRY_CALLTYPE *dumpRegistry) (RegHandle,
RegKeyHandle);
void (REGISTRY_CALLTYPE *acquireKey) (RegKeyHandle);
void (REGISTRY_CALLTYPE *releaseKey) (RegKeyHandle);
sal_Bool (REGISTRY_CALLTYPE *isKeyReadOnly) (RegKeyHandle);
diff --git a/package/source/zipapi/Deflater.cxx
b/package/source/zipapi/Deflater.cxx
index ccff8c6..ce3df03 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -60,7 +60,6 @@ void Deflater::init (sal_Int32 nLevelArg, sal_Int32
nStrategyArg, bool bNowrap)
Deflater::Deflater(sal_Int32 nSetLevel, bool bNowrap)
: bFinish(false)
, bFinished(false)
-, nStrategy(DEFAULT_STRATEGY)
, nOffset(0)
, nLength(0)
{
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index b18fa57..fed9858 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -236,97 +236,6 @@ static RegError REGISTRY_CALLTYPE
destroyRegistry(RegHandle hReg,
-// loadRegKey
-
-static RegError REGISTRY_CALLTYPE loadKey(RegHandle hReg,
- RegKeyHandle hKey,
- rtl_uString* keyName,
- rtl_uString* regFileName)
-{
-
- ORegistry* pReg = static_cast< ORegistry* >(hReg);
- if (!pReg)
- return RegError::INVALID_REGISTRY;
-
- if (!pReg->isOpen())
- return RegError::REGISTRY_NOT_OPEN;
-
- ORegKey* pKey = static_cast< ORegKey* >(hKey);
- if (!pKey)
- return RegError::INVALID_KEY;
-
- if (pKey->getRegistry() != pReg)
- return RegError::INVALID_KEY;
- if (pKey->isDeleted())
- return RegError::INVALID_KEY;
- if (pKey->isReadOnly())
- return RegError::REGISTRY_READONLY;
-
-
- ORegKey* pNewKey = nullptr;
- RegError _ret = pKey->openKey(keyName,
reinterpret_cast<RegKeyHandle*>(&pNewKey));
- if (_ret == RegError::NO_ERROR)
- {
- pKey->releaseKey(pNewKey);
- pKey->deleteKey(keyName);
- }
-
- _ret = pKey->createKey(keyName, reinterpret_cast<RegKeyHandle*>(&pNewKey));
- if (_ret != RegError::NO_ERROR)
- return _ret;
-
- _ret = pReg->loadKey(pNewKey, regFileName);
- if (_ret != RegError::NO_ERROR)
- {
- pKey->releaseKey(pNewKey);
- pKey->deleteKey(keyName);
- return _ret;
- }
-
- return pKey->closeKey(pNewKey);
-}
-
-
-// saveKey
-
-static RegError REGISTRY_CALLTYPE saveKey(RegHandle hReg,
- RegKeyHandle hKey,
- rtl_uString* keyName,
- rtl_uString* regFileName)
-{
-
- ORegistry* pReg = static_cast< ORegistry* >(hReg);
- if (!pReg)
- return RegError::INVALID_REGISTRY;
-
- if (!pReg->isOpen())
- return RegError::REGISTRY_NOT_OPEN;
-
- ORegKey* pKey = static_cast< ORegKey* >(hKey);
- if (!pKey)
- return RegError::INVALID_KEY;
-
- if (pKey->getRegistry() != pReg)
- return RegError::INVALID_KEY;
- if (pKey->isDeleted())
- return RegError::INVALID_KEY;
-
- ORegKey* pNewKey = nullptr;
- RegError _ret = pKey->openKey(keyName,
reinterpret_cast<RegKeyHandle*>(&pNewKey));
- if (_ret != RegError::NO_ERROR)
- return _ret;
-
- _ret = pReg->saveKey(pNewKey, regFileName);
- if (_ret != RegError::NO_ERROR)
- {
- (void) pKey->releaseKey(pNewKey);
- return _ret;
- }
-
- return pKey->releaseKey(pNewKey);
-}
-
-
// mergeKey
static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
@@ -412,10 +321,7 @@ Registry_Api* REGISTRY_CALLTYPE initRegistry_Api()
&openRegistry,
&closeRegistry,
&destroyRegistry,
- &loadKey,
- &saveKey,
&mergeKey,
- &dumpRegistry,
&acquireKey,
&releaseKey,
&isKeyReadOnly,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
