summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-24 16:05:34 +0200
committerNoel Grandin <noel@peralex.com>2015-11-25 08:25:09 +0200
commit85c758a4618d3a485f778bda5b20a8221161e399 (patch)
treecdd2e94f660d10af379d27dfcf216f499b353acb
parenta78182a993288680b04d1329536af5953e8ca31c (diff)
loplugin:unusedfields in include/sfx2/
Change-Id: I3eb27ed10e82ee56b33866ac576c1b1f8c9756b9
-rw-r--r--idl/source/objects/slot.cxx5
-rw-r--r--include/sfx2/msg.hxx13
-rw-r--r--include/sfx2/objsh.hxx1
-rw-r--r--include/sfx2/tabdlg.hxx5
-rw-r--r--include/sfx2/tbxctrl.hxx4
-rw-r--r--include/sfx2/templatedefaultview.hxx1
-rw-r--r--include/sfx2/viewfrm.hxx17
-rw-r--r--sc/inc/scabstdlg.hxx6
-rw-r--r--sc/source/ui/attrdlg/attrdlg.cxx4
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx28
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx6
-rw-r--r--sc/source/ui/docshell/docsh4.cxx2
-rw-r--r--sc/source/ui/inc/attrdlg.hxx3
-rw-r--r--sc/source/ui/inc/hfedtdlg.hxx22
-rw-r--r--sc/source/ui/pagedlg/hfedtdlg.cxx45
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx2
-rw-r--r--sc/source/ui/view/tabvwsha.cxx2
-rw-r--r--sd/source/ui/dlg/PaneShells.cxx4
-rw-r--r--sfx2/source/control/templatedefaultview.cxx1
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx2
-rw-r--r--sfx2/source/dialog/tabdlg.cxx26
-rw-r--r--sfx2/source/doc/objxtor.cxx2
-rw-r--r--svx/source/toolbars/extrusionbar.cxx2
-rw-r--r--svx/source/toolbars/fontworkbar.cxx2
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx11
-rw-r--r--sw/source/ui/table/tabledlg.cxx2
27 files changed, 74 insertions, 146 deletions
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 6d8157b2506a..774bcdae5618 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 25fdbcdd0905..30312b97f5b9 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 a26617109adc..8eca878255ac 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 f1dc53cd0f1e..795714e4beb9 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 5bf2bf7d54e1..241e7a47efe7 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 436aef489ac3..e0f10d414a94 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 bc89068d85d5..b2bb8237ff14 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 5aafb1de18e7..de4c11597485 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 0002c815ecd7..8c5005f60e63 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 3f7e5a0eb8e6..c517901aa198 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 5971f6c8ec7f..40ef31749c9b 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 d35f4f835d66..0a0a7c394b0d 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 2056c99806d4..e790bc78f1fa 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 dfacb8e37031..712b0902d9f1 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 14ddddbf1df4..637532239e70 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 614da79e5395..f69edd00c25a 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 9c451be934ee..7eebef015072 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 ad3d047ed7af..d0735ac3da2f 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 39ee41552f68..5c1753605785 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 fb9fddcfe300..ffb7cfcd497c 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 10464439f4fa..795b7015c298 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 9a75ed9e3bd4..5d1bf3e782c2 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 38b4eeb575d9..b364f051daa4 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 ee0132b7b578..9d32139fafc2 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 1a6209e15b9e..da6c131dafe5 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 7979913241bd..171612a77ca7 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 597fc6985bed..424a47907821 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)
{