[Libreoffice-commits] core.git: 2 commits - chart2/source cui/source distro-configs/Jenkins include/svx svx/inc svx/source sw/source
Stephan Bergmann
sbergman at redhat.com
Fri Sep 9 06:48:13 UTC 2016
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 2
chart2/source/controller/main/ChartController_Position.cxx | 2
cui/source/factory/dlgfact.cxx | 73 +++----------
cui/source/factory/dlgfact.hxx | 16 +-
cui/source/options/optlingu.cxx | 2
distro-configs/Jenkins/Linux_ubsan_master.conf | 5
include/svx/bmpmask.hxx | 2
include/svx/camera3d.hxx | 4
include/svx/colrctrl.hxx | 2
include/svx/framelink.hxx | 2
include/svx/imapdlg.hxx | 2
include/svx/itemwin.hxx | 7 -
include/svx/obj3d.hxx | 2
include/svx/pagenumberlistbox.hxx | 2
include/svx/papersizelistbox.hxx | 2
include/svx/samecontentlistbox.hxx | 2
include/svx/sdgcpitm.hxx | 5
include/svx/sdr/contact/objectcontactofobjlistpainter.hxx | 4
include/svx/sdr/table/tablecontroller.hxx | 2
include/svx/sidebar/ValueSetWithTextControl.hxx | 8 -
include/svx/spacinglistbox.hxx | 2
include/svx/svdcrtv.hxx | 4
include/svx/svdglev.hxx | 8 -
include/svx/svdpoev.hxx | 4
include/svx/svdsnpv.hxx | 2
include/svx/svxdlg.hxx | 21 +--
include/svx/svxgrahicitem.hxx | 2
include/svx/xpoly.hxx | 2
include/svx/xpool.hxx | 2
svx/inc/sdr/overlay/overlayrectangle.hxx | 1
svx/inc/svdibrow.hxx | 2
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 18 ---
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 15 --
svx/source/dialog/_bmpmask.cxx | 6 -
svx/source/dialog/framelink.cxx | 4
svx/source/dialog/grfflt.cxx | 10 -
svx/source/dialog/imapdlg.cxx | 6 -
svx/source/dialog/pagenumberlistbox.cxx | 4
svx/source/dialog/papersizelistbox.cxx | 4
svx/source/dialog/samecontentlistbox.cxx | 4
svx/source/dialog/spacinglistbox.cxx | 4
svx/source/dialog/svxgrahicitem.cxx | 6 -
svx/source/engine3d/camera3d.cxx | 10 -
svx/source/engine3d/obj3d.cxx | 4
svx/source/inc/GraphCtlAccessibleContext.hxx | 4
svx/source/inc/svxrectctaccessiblecontext.hxx | 4
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 3
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 2
svx/source/sdr/overlay/overlayrectangle.cxx | 3
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 18 ---
svx/source/svdraw/svdattr.cxx | 2
svx/source/svdraw/svdcrtv.cxx | 8 -
svx/source/svdraw/svddrgmt.cxx | 4
svx/source/svdraw/svdglev.cxx | 26 ++--
svx/source/svdraw/svdhdl.cxx | 9 -
svx/source/svdraw/svdibrow.cxx | 4
svx/source/svdraw/svdpoev.cxx | 10 -
svx/source/svdraw/svdsnpv.cxx | 4
svx/source/table/tablecontroller.cxx | 53 ++-------
svx/source/table/tablehandles.cxx | 2
svx/source/tbxctrls/colrctrl.cxx | 4
svx/source/tbxctrls/itemwin.cxx | 12 +-
svx/source/xoutdev/_xpoly.cxx | 4
svx/source/xoutdev/xpool.cxx | 4
sw/source/uibase/shells/tabsh.cxx | 2
sw/source/uibase/sidebar/PageMarginControl.cxx | 10 -
sw/source/uibase/sidebar/PageSizeControl.cxx | 3
67 files changed, 174 insertions(+), 312 deletions(-)
New commits:
commit 02235bc4610f22028c614a61b1493257fda4eaf0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Sep 9 08:45:45 2016 +0200
Some --enable-ext-* switches got removed
...with 8dc38d9ded92960eda46343b67da8a8b95404b5a "Remove obsolete OxygenOffice
bits"
Change-Id: I796505a87a821d6f7f0b79ade9fdeec89932e561
diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf
index bcb3c24..959b5d7 100644
--- a/distro-configs/Jenkins/Linux_ubsan_master.conf
+++ b/distro-configs/Jenkins/Linux_ubsan_master.conf
@@ -6,17 +6,12 @@
--enable-epm
--enable-evolution2
--enable-ext-ct2n
---enable-ext-diagram
--enable-ext-google-docs
---enable-ext-hunart
--enable-ext-languagetool
--enable-ext-mariadb-connector
--with-system-mariadb
--enable-ext-nlpsolver
--enable-ext-numbertext
---enable-ext-typo
---enable-ext-validator
---enable-ext-watch-window
--enable-ext-wiki-publisher
--enable-extra-font
--enable-extra-gallery
commit 8bfcb53c3d1389632fc7f1eca53d73187a489dfa
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 8 14:20:31 2016 +0200
loplugin:constantparam in svx
Change-Id: Id08850b90a0e286ff837dd6b0c1691fa7dc793fa
Reviewed-on: https://gerrit.libreoffice.org/28746
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 8974352..c3e5547 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -512,7 +512,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
if( m_pSymbolShapeProperties )
aSet.Put(SfxTabDialogItem(SID_ATTR_SET,*m_pSymbolShapeProperties));
if( m_pAutoSymbolGraphic )
- aSet.Put(SvxGraphicItem(SID_GRAPHIC,*m_pAutoSymbolGraphic));
+ aSet.Put(SvxGraphicItem(*m_pAutoSymbolGraphic));
}
rPage.PageCreated(aSet);
break;
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 5764328..690cedc 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -141,7 +141,7 @@ void ChartController::executeDispatch_PositionAndSize()
SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE( pFact, "No dialog factory" );
std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSchTransformTabDialog(
- m_pChartWindow, &aItemSet, pSdrView, RID_SCH_TransformTabDLG_SVXPAGE_ANGLE, bResizePossible ));
+ m_pChartWindow, &aItemSet, pSdrView, bResizePossible ));
OSL_ENSURE( pDlg, "Couldn't create SchTransformTabDialog" );
if( pDlg->Execute() == RET_OK )
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 14ffacf..2dac025 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1106,33 +1106,13 @@ AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTab
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
- sal_uInt32 nResId,
bool bSizeTabPage
)
{
- VclPtr<SfxTabDialog> pDlg;
- switch ( nResId )
- {
- case RID_SCH_TransformTabDLG_SVXPAGE_ANGLE :
- {
- pDlg.reset( VclPtr<SvxTransformTabDialog>::Create( pParent, pAttr,pSdrView, bSizeTabPage ? SvxAnchorIds::NoProtect : SvxAnchorIds::NoProtect|SvxAnchorIds::NoResize) );
- pDlg->RemoveTabPage( "RID_SVXPAGE_ANGLE" );
- pDlg->RemoveTabPage( "RID_SVXPAGE_SLANT" );
- }
- break;
- case RID_SCH_TransformTabDLG_SVXPAGE_SLANT:
- {
- pDlg.reset(VclPtr<SvxTransformTabDialog>::Create ( pParent, pAttr,pSdrView, bSizeTabPage ? SvxAnchorIds::NoProtect : SvxAnchorIds::NoProtect|SvxAnchorIds::NoResize ) );
- pDlg->RemoveTabPage( "RID_SVXPAGE_SLANT" );
- }
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new CuiAbstractTabDialog_Impl( pDlg );
- return nullptr;
+ VclPtrInstance<SvxTransformTabDialog> pDlg( pParent, pAttr,pSdrView, bSizeTabPage ? SvxAnchorIds::NoProtect : SvxAnchorIds::NoProtect|SvxAnchorIds::NoResize);
+ pDlg->RemoveTabPage( "RID_SVXPAGE_ANGLE" );
+ pDlg->RemoveTabPage( "RID_SVXPAGE_SLANT" );
+ return new CuiAbstractTabDialog_Impl( pDlg );
}
AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( vcl::Window* pParent,
@@ -1156,22 +1136,10 @@ AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDiction
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent,
- const OUString& rName,
- sal_uInt32 nResId )
+ const OUString& rName )
{
- Dialog* pDlg=nullptr;
- switch ( nResId )
- {
- case RID_SFXDLG_EDITDICT :
- pDlg = VclPtr<SvxEditDictionaryDialog>::Create( pParent, rName );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new CuiVclAbstractDialog_Impl( pDlg );
- return nullptr;
+ VclPtrInstance<SvxEditDictionaryDialog> pDlg( pParent, rName );
+ return new CuiVclAbstractDialog_Impl( pDlg );
}
AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( vcl::Window* pParent,
@@ -1222,26 +1190,23 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::W
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (vcl::Window* pParent,
- const Graphic& rGraphic,
- RectPoint eLightSource)
+ const Graphic& rGraphic)
{
- VclPtrInstance<GraphicFilterEmboss> pDlg( pParent, rGraphic, eLightSource );
+ VclPtrInstance<GraphicFilterEmboss> pDlg( pParent, rGraphic, RectPoint::MM );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPoster(vcl::Window* pParent,
- const Graphic& rGraphic,
- sal_uInt16 nCount)
+ const Graphic& rGraphic)
{
- VclPtrInstance<GraphicFilterPoster> pDlg( pParent, rGraphic, nCount );
+ VclPtrInstance<GraphicFilterPoster> pDlg( pParent, rGraphic, 16 );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSepia (vcl::Window* pParent,
- const Graphic& rGraphic,
- sal_uInt16 nCount)
+ const Graphic& rGraphic)
{
- VclPtrInstance<GraphicFilterSepia> pDlg( pParent, rGraphic, nCount );
+ VclPtrInstance<GraphicFilterSepia> pDlg( pParent, rGraphic, 10 );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
@@ -1253,16 +1218,16 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmo
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt8 nGreyThreshold)
+ const Graphic& rGraphic)
{
- VclPtrInstance<GraphicFilterSolarize> pDlg( pParent, rGraphic, nGreyThreshold, false/*bInvert*/ );
+ VclPtrInstance<GraphicFilterSolarize> pDlg( pParent, rGraphic, 128, false/*bInvert*/ );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight)
+ const Graphic& rGraphic)
{
- VclPtrInstance<GraphicFilterMosaic> pDlg(pParent, rGraphic, nTileWidth, nTileHeight, false/*bEnhanceEdges*/);
+ VclPtrInstance<GraphicFilterMosaic> pDlg(pParent, rGraphic, 4, 4, false/*bEnhanceEdges*/);
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
@@ -1567,9 +1532,9 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( co
return new CuiAbstractTabDialog_Impl( VclPtr<SvxFormatCellsDialog>::Create( nullptr, pAttr, pModel ) );
}
-SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )
+SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical )
{
- return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, nMaxHorizontal );
+ return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, 99 );
}
SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog()
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index f3dff69..63d2a8d 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -519,7 +519,6 @@ public:
virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
- sal_uInt32 nResId,
bool bSizeTabPage
) override;
virtual AbstractSpellDialog * CreateSvxSpellDialog(
@@ -554,8 +553,7 @@ public:
virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog() override;
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent ) override;
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent,
- const OUString& rName,
- sal_uInt32 nResId) override;
+ const OUString& rName) override;
virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent,
const OUString& rName, const OUString& rDesc ) override;
// #i68101#
@@ -571,17 +569,17 @@ public:
sal_Int16 nInitialContext,
const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent,
- const Graphic& rGraphic, RectPoint eLightSource) override;
+ const Graphic& rGraphic) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt16 nCount) override;
+ const Graphic& rGraphic) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt16 nCount) override;
+ const Graphic& rGraphic) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent,
const Graphic& rGraphic, double nRadius) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt8 nGreyThreshold) override;
+ const Graphic& rGraphic) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight) override;
+ const Graphic& rGraphic) override;
virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
@@ -619,7 +617,7 @@ public:
virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj ) override;
- virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) override;
+ virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical ) override;
virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog() override ;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index d9718f9..fc7cc55 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1630,7 +1630,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), RID_SFXDLG_EDITDICT ));
+ std::unique_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName() ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
aDlg->Execute();
}
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index b8c404e..3630f39 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -46,7 +46,7 @@ protected:
const SfxPoolItem* pState ) override;
public:
- SvxBmpMaskSelectItem( sal_uInt16 nId, SvxBmpMask& rMask,
+ SvxBmpMaskSelectItem( SvxBmpMask& rMask,
SfxBindings& rBindings );
};
diff --git a/include/svx/camera3d.hxx b/include/svx/camera3d.hxx
index 2d8021a..b6fd288 100644
--- a/include/svx/camera3d.hxx
+++ b/include/svx/camera3d.hxx
@@ -46,11 +46,11 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC Camera3D : public Viewport3D
public:
Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
- double fFocalLen = 35.0, double fBankAng = 0);
+ double fFocalLen = 35.0);
Camera3D();
void SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
- double fFocalLen, double fBankAng = 0);
+ double fFocalLen);
void SetViewWindow(double fX, double fY, double fW, double fH);
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index 20fc1f8..dbefc7f 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -59,7 +59,7 @@ protected:
DECL_LINK_TYPED(ExecDragHdl, void*, void);
public:
- SvxColorValueSet_docking( vcl::Window* pParent, WinBits nWinStyle = WB_ITEMBORDER );
+ SvxColorValueSet_docking( vcl::Window* pParent );
bool IsLeftButton() const { return mbLeftButton; }
};
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index bbe5234..451c657 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -115,7 +115,7 @@ public:
explicit Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor,
double nP, double nD, double nS, editeng::SvxBorderStyle nType );
/** Constructs a frame style from the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */
- explicit Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
+ explicit Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0 );
inline RefMode GetRefMode() const { return meRefMode; }
inline const Color& GetColorPrim() const { return maColorPrim; }
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index e191a25..c55fb1e 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -71,7 +71,7 @@ protected:
public:
- SvxIMapDlgItem( sal_uInt16 nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings );
+ SvxIMapDlgItem( SvxIMapDlg& rIMapDlg, SfxBindings& rBindings );
};
class IMapOwnData;
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index 450a511..f6a50c3 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -47,8 +47,7 @@ class SvxLineBox : public LineLB
public:
SvxLineBox( vcl::Window* pParent,
- const css::uno::Reference< css::frame::XFrame >& rFrame,
- WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
+ const css::uno::Reference< css::frame::XFrame >& rFrame );
void FillControl();
@@ -95,7 +94,7 @@ public:
class SVX_DLLPUBLIC SvxFillTypeBox : public FillTypeLB
{
public:
- SvxFillTypeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
+ SvxFillTypeBox( vcl::Window* pParent );
void Selected() { bSelect = true; }
@@ -116,7 +115,7 @@ private:
class SVX_DLLPUBLIC SvxFillAttrBox : public FillAttrLB
{
public:
- SvxFillAttrBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
+ SvxFillAttrBox( vcl::Window* pParent );
protected:
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 7c6d38a..a17dd6b 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -81,7 +81,7 @@ class E3dObjList : public SdrObjList
E3dObjList &operator=(const E3dObjList& rSrcList) = delete;
public:
- E3dObjList(SdrModel* pNewModel = nullptr, SdrPage* pNewPage = nullptr, E3dObjList* pNewUpList = nullptr);
+ E3dObjList();
SVX_DLLPUBLIC virtual ~E3dObjList();
virtual E3dObjList* Clone() const override;
diff --git a/include/svx/pagenumberlistbox.hxx b/include/svx/pagenumberlistbox.hxx
index 72424e0..1f0b4f1 100644
--- a/include/svx/pagenumberlistbox.hxx
+++ b/include/svx/pagenumberlistbox.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC PageNumberListBox : public ListBox
{
public:
- PageNumberListBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN );
+ PageNumberListBox( vcl::Window* pParent );
void SetSelection( sal_uInt16 );
sal_uInt16 GetSelection() const;
diff --git a/include/svx/papersizelistbox.hxx b/include/svx/papersizelistbox.hxx
index 2d2cf5b..b477e63 100644
--- a/include/svx/papersizelistbox.hxx
+++ b/include/svx/papersizelistbox.hxx
@@ -33,7 +33,7 @@ enum class PaperSizeApp
class SVX_DLLPUBLIC PaperSizeListBox : public ListBox
{
public:
- PaperSizeListBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN );
+ PaperSizeListBox( vcl::Window* pParent );
void FillPaperSizeEntries( PaperSizeApp eApp );
void SetSelection( Paper eSize );
diff --git a/include/svx/samecontentlistbox.hxx b/include/svx/samecontentlistbox.hxx
index 576ebdf..1996d75 100644
--- a/include/svx/samecontentlistbox.hxx
+++ b/include/svx/samecontentlistbox.hxx
@@ -27,7 +27,7 @@
class SVX_DLLPUBLIC SameContentListBox : public ListBox
{
public:
- SameContentListBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN );
+ SameContentListBox( vcl::Window* pParent );
Size GetOptimalSize() const override;
};
diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx
index ccdaa93..47b3bf6 100644
--- a/include/svx/sdgcpitm.hxx
+++ b/include/svx/sdgcpitm.hxx
@@ -33,9 +33,8 @@ public:
SdrGrafCropItem( sal_Int32 nLeftCrop = 0, sal_Int32 nTopCrop = 0,
- sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0,
- sal_uInt16 nWhichId = SDRATTR_GRAFCROP ) :
- SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, nWhichId ) {}
+ sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0 ) :
+ SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, SDRATTR_GRAFCROP ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override;
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index f584f67..6401931 100644
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -99,9 +99,7 @@ protected:
public:
// basic constructor
- ObjectContactOfPagePainter(
- const SdrPage* pPage,
- ObjectContact& rOriginalObjectContact);
+ ObjectContactOfPagePainter(ObjectContact& rOriginalObjectContact);
virtual ~ObjectContactOfPagePainter();
// set another page
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index aec0bbc..76a7d33 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -134,7 +134,7 @@ private:
SVX_DLLPRIVATE void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow );
- SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, const css::awt::MouseEvent* pMouseEvent, sal_uInt16 nAction = 0 );
+ SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, sal_uInt16 nAction = 0 );
SVX_DLLPRIVATE void StopTextEdit();
SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* pWindow );
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index 9e99155..20be24d 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -54,24 +54,18 @@ public:
// add item for control type IMAGE_TEXT
// if control type does not match IMAGE_TEXT no item is added.
- // @param pSelectedItemImage
- // selection item image is optional. if not provided, it is the same as the image item
// @param pItemHelpText
// help text is optional. if not provided, it is the same as the item text
void AddItem(
const Image& rItemImage,
- const Image* pSelectedItemImage,
const OUString& rItemText,
const OUString* pItemHelpText );
// add item for control type TEXT_TEXT
// if control type does not match TEXT_TEXT no item is added.
- // @param pItemHelpText
- // help text is optional. if not provided, it is the same as the item text
void AddItem(
const OUString& rItemText,
- const OUString& rItemText2,
- const OUString* pItemHelpText );
+ const OUString& rItemText2 );
virtual void UserDraw( const UserDrawEvent& rUDEvt ) override;
diff --git a/include/svx/spacinglistbox.hxx b/include/svx/spacinglistbox.hxx
index eb8ebe4..2e2ca52 100644
--- a/include/svx/spacinglistbox.hxx
+++ b/include/svx/spacinglistbox.hxx
@@ -27,7 +27,7 @@
class SVX_DLLPUBLIC SpacingListBox : public ListBox
{
public:
- SpacingListBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN );
+ SpacingListBox( vcl::Window* pParent );
Size GetOptimalSize() const override;
};
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 7eab877..085f235 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -105,7 +105,7 @@ public:
sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; }
// Beginning the regular Create
- bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=nullptr, short nMinMov=-3, SdrPageView* pPV=nullptr);
+ bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=nullptr, short nMinMov=-3);
bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject);
void MovCreateObj(const Point& rPnt);
bool EndCreateObj(SdrCreateCmd eCmd);
@@ -117,7 +117,7 @@ public:
// BegCreateCaptionObj() creates a SdrCaptionObj (legend item).
// rObjSiz is the initial size of the legend text frame.
// Only the length of the tip is dragged
- bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=nullptr, short nMinMov=-3, SdrPageView* pPV=nullptr);
+ bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=nullptr, short nMinMov=-3);
// Create a circle/rectangle/text frame with the first Point being
// the center of the object instead of the upper-left corner.
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index 6559ddb..a1f84c0 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -33,10 +33,10 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView
{
// copy marked GluePoints and mark instead of the old ones
void ImpCopyMarkedGluePoints();
- typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*);
- typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*, const void*);
- void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr);
- void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr);
+ typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*);
+ typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*);
+ void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr);
+ void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr);
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index 524c371..7cb2e95 100644
--- a/include/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
@@ -41,8 +41,8 @@ private:
SVX_DLLPRIVATE void ImpResetPolyPossibilityFlags();
SVX_DLLPRIVATE void ImpCheckPolyPossibilities();
- typedef void (*PPolyTrFunc)(Point&, Point*, Point*, const void*, const void*, const void*, const void*, const void*);
- SVX_DLLPRIVATE void ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr);
+ typedef void (*PPolyTrFunc)(Point&, Point*, Point*, const void*, const void*, const void*, const void*);
+ SVX_DLLPRIVATE void ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr);
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index 2c484ad..621b03f 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -155,7 +155,7 @@ public:
// SdrSnap::YSNAPPED or SdrSnap::XYSNAPPED
SdrSnap SnapPos(Point& rPnt, const SdrPageView* pPV) const;
Point GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const;
- void CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const;
+ void CheckSnap(const Point& rPt, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const;
// All attitudes to snap are persistent.
bool IsSnapEnabled() const { return bSnapEnab; }
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index af4ea64..9131821 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -334,7 +334,6 @@ public:
virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
- sal_uInt32 nResId,
bool bSizeTabPage
)=0;
virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent,
@@ -343,8 +342,7 @@ public:
virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog() = 0;
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent ) = 0;
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent,
- const OUString& rName,
- sal_uInt32 nResId) = 0;
+ const OUString& rName) = 0;
virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent,
const OUString& rName, const OUString& rDesc ) = 0;
@@ -361,23 +359,18 @@ public:
sal_Int16 nInitialContext,
const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent,
- const Graphic& rGraphic,
- RectPoint eLightSource)=0;
+ const Graphic& rGraphic)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent,
- const Graphic& rGraphic,
- sal_uInt16 nCount)=0;
+ const Graphic& rGraphic)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (vcl::Window* pParent,
- const Graphic& rGraphic,
- sal_uInt16 nCount)=0;
+ const Graphic& rGraphic)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent,
const Graphic& rGraphic,
double nRadius)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent,
- const Graphic& rGraphic,
- sal_uInt8 nGreyThreshold)=0;
+ const Graphic& rGraphic)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent,
- const Graphic& rGraphic,
- sal_uInt16 nTileWidth, sal_uInt16 nTileHeight)=0;
+ const Graphic& rGraphic)=0;
virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
@@ -421,7 +414,7 @@ public:
virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj )=0;
- virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0;
+ virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical )=0;
virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog() = 0;
diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx
index e42fd9b..a5f417f 100644
--- a/include/svx/svxgrahicitem.hxx
+++ b/include/svx/svxgrahicitem.hxx
@@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem
Graphic aGraphic;
public:
- SvxGraphicItem( sal_uInt16 nWhich ,const Graphic& rGraphic);
+ SvxGraphicItem( const Graphic& rGraphic);
SvxGraphicItem( const SvxGraphicItem& );
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index 07e2f5b..e9fe31f 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -61,7 +61,7 @@ protected:
static bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2);
public:
- XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 );
+ XPolygon( sal_uInt16 nSize=16 );
XPolygon( const XPolygon& rXPoly );
XPolygon( XPolygon&& rXPoly );
XPolygon( const tools::Polygon& rPoly );
diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx
index 4fdbdbd..7233f91 100644
--- a/include/svx/xpool.hxx
+++ b/include/svx/xpool.hxx
@@ -39,8 +39,6 @@ protected:
public:
XOutdevItemPool(
SfxItemPool* pMaster = nullptr,
- sal_uInt16 nAttrStart = XATTR_START,
- sal_uInt16 nAttrEnd = XATTR_END,
bool bLoadRefCounts = true);
XOutdevItemPool(const XOutdevItemPool& rPool);
diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx
index 289a8c1..4531c08 100644
--- a/svx/inc/sdr/overlay/overlayrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrectangle.hxx
@@ -56,7 +56,6 @@ namespace sdr
double fDiscreteGrow,
double fDiscreteShrink,
double fRotation,
- sal_uInt64 nBlinkTime,
bool bAnimate);
// data read access
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 11bd21a..5a811a0 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -69,7 +69,7 @@ protected:
virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override;
public:
- SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits=WB_3DLOOK|WB_BORDER|WB_TABSTOP);
+ SdrItemBrowserControl(vcl::Window* pParent);
virtual ~SdrItemBrowserControl();
virtual void dispose() override;
void Clear();
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 46b6c31..47eca96 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -63,9 +63,7 @@ using namespace ::com::sun::star::accessibility;
/** initialize this component and set default values */
SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
const Reference< XAccessible >& rxParent,
- GraphCtrl& rRepr,
- const OUString* pName,
- const OUString* pDesc ) :
+ GraphCtrl& rRepr ) :
SvxGraphCtrlAccessibleContext_Base( m_aMutex ),
mxParent( rxParent ),
@@ -94,23 +92,9 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
}
}
- if( pName )
- {
- msName = *pName;
- }
- else
{
::SolarMutexGuard aSolarGuard;
msName = SVX_RESSTR( RID_SVXSTR_GRAPHCTRL_ACC_NAME );
- }
-
- if( pDesc )
- {
- msDescription = *pDesc;
- }
- else
- {
- ::SolarMutexGuard aSolarGuard;
msDescription = SVX_RESSTR( RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION );
}
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index d43ab2c..828166b 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -133,9 +133,7 @@ static long PointToIndex( RectPoint ePoint, bool bAngleControl )
SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
const Reference< XAccessible >& rxParent,
- SvxRectCtl& rRepr,
- const OUString* pName,
- const OUString* pDesc ) :
+ SvxRectCtl& rRepr ) :
SvxRectCtlAccessibleContext_Base( m_aMutex ),
mxParent( rxParent ),
@@ -145,20 +143,9 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
mnSelectedChild( NOCHILDSELECTED ),
mbAngleMode( rRepr.GetNumOfChildren() == 8 )
{
-
- if( pName )
- msName = *pName;
- else
{
::SolarMutexGuard aSolarGuard;
msName = SVX_RESSTR( mbAngleMode? RID_SVXSTR_RECTCTL_ACC_ANGL_NAME : RID_SVXSTR_RECTCTL_ACC_CORN_NAME );
- }
-
- if( pDesc )
- msDescription = *pDesc;
- else
- {
- ::SolarMutexGuard aSolarGuard;
msDescription = SVX_RESSTR( mbAngleMode? RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR : RID_SVXSTR_RECTCTL_ACC_CORN_DESCR );
}
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index e3147f4..0edba8f 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -318,9 +318,9 @@ void ColorWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& /*
rRenderContext.Pop();
}
-SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16 nId_, SvxBmpMask& rMask,
+SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( SvxBmpMask& rMask,
SfxBindings& rBindings ) :
- SfxControllerItem ( nId_, rBindings ),
+ SfxControllerItem ( SID_BMPMASK_EXEC, rBindings ),
rBmpMask ( rMask)
{
}
@@ -354,7 +354,7 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window*
"svx/ui/dockingcolorreplace.ui" )
, pData(new MaskData(this, *pBindinx))
, aPipetteColor(COL_WHITE)
- , aSelItem(SID_BMPMASK_EXEC, *this, *pBindinx)
+ , aSelItem(*this, *pBindinx)
{
get(m_pTbxPipette, "toolbar");
m_pTbxPipette->SetItemBits(m_pTbxPipette->GetItemId(0),
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 438b37f..05d3a4c 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -1145,11 +1145,11 @@ Style::Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rCo
Set( rColorPrim, rColorSecn, rColorGap, bUseGapColor, nP, nD, nS );
}
-Style::Style( const editeng::SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWidth ) :
+Style::Style( const editeng::SvxBorderLine* pBorder, double fScale ) :
meRefMode(RefMode::Centered),
mfPatternScale(fScale)
{
- Set( pBorder, fScale, nMaxWidth );
+ Set( pBorder, fScale );
}
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 53a98cd..c062367 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -162,7 +162,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterMosaic(pWindow, rGraphic, 4, 4));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterMosaic(pWindow, rGraphic));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -175,7 +175,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterEmboss(pWindow, rGraphic, RectPoint::MM));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterEmboss(pWindow, rGraphic));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -188,7 +188,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterPoster(pWindow, rGraphic, 16));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterPoster(pWindow, rGraphic));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -226,7 +226,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSepia(pWindow, rGraphic, 10));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSepia(pWindow, rGraphic));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -239,7 +239,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSolarize(pWindow, rGraphic, 128));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSolarize(pWindow, rGraphic));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 0c5549f..c3f46e6 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -70,8 +70,8 @@ SFX_IMPL_MODELESSDIALOG_WITHID( SvxIMapDlgChildWindow, SID_IMAP );
// ControllerItem
-SvxIMapDlgItem::SvxIMapDlgItem( sal_uInt16 _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) :
- SfxControllerItem ( _nId, rBindings ),
+SvxIMapDlgItem::SvxIMapDlgItem( SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) :
+ SfxControllerItem ( SID_IMAP_EXEC, rBindings ),
rIMap ( rIMapDlg )
{
}
@@ -118,7 +118,7 @@ VCL_BUILDER_FACTORY(StatusBar)
SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window* _pParent)
: SfxModelessDialog(_pBindings, pCW, _pParent, "ImapDialog", "svx/ui/imapdialog.ui")
, pCheckObj(nullptr)
- , aIMapItem(SID_IMAP_EXEC, *this, *_pBindings)
+ , aIMapItem(*this, *_pBindings)
{
get(m_pTbxIMapDlg1, "toolbar");
m_pTbxIMapDlg1->InsertSeparator(3, 5);
diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx
index dd2162d..830139b 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -22,8 +22,8 @@
#include <tools/resary.hxx>
#include <vcl/builderfactory.hxx>
-PageNumberListBox::PageNumberListBox(vcl::Window* pParent, WinBits nStyle)
- : ListBox( pParent, nStyle)
+PageNumberListBox::PageNumberListBox(vcl::Window* pParent)
+ : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
{
ResStringArray aPaperAry( SVX_RES( RID_SVXSTRARY_PAGE_NUMBERING ) );
sal_uInt32 nCnt = aPaperAry.Count();
diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx
index 67401cf..57cc63f 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -24,8 +24,8 @@
#include <vcl/builderfactory.hxx>
-PaperSizeListBox::PaperSizeListBox(vcl::Window* pParent, WinBits nStyle)
- : ListBox( pParent, nStyle)
+PaperSizeListBox::PaperSizeListBox(vcl::Window* pParent)
+ : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
{
SetDropDownLineCount(6);
}
diff --git a/svx/source/dialog/samecontentlistbox.cxx b/svx/source/dialog/samecontentlistbox.cxx
index 83f42b2..4fe8573 100644
--- a/svx/source/dialog/samecontentlistbox.cxx
+++ b/svx/source/dialog/samecontentlistbox.cxx
@@ -22,8 +22,8 @@
#include <tools/resary.hxx>
#include <vcl/builderfactory.hxx>
-SameContentListBox::SameContentListBox(vcl::Window* pParent, WinBits nStyle)
- : ListBox( pParent, nStyle)
+SameContentListBox::SameContentListBox(vcl::Window* pParent)
+ : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
{
ResStringArray aSameContentAry( SVX_RES( RID_SVXSTRARY_SAMECONTENT ) );
sal_uInt32 nCnt = aSameContentAry.Count();
diff --git a/svx/source/dialog/spacinglistbox.cxx b/svx/source/dialog/spacinglistbox.cxx
index 363385f..b30a3c6 100644
--- a/svx/source/dialog/spacinglistbox.cxx
+++ b/svx/source/dialog/spacinglistbox.cxx
@@ -22,8 +22,8 @@
#include <tools/resary.hxx>
#include <vcl/builderfactory.hxx>
-SpacingListBox::SpacingListBox(vcl::Window* pParent, WinBits nStyle)
- : ListBox( pParent, nStyle)
+SpacingListBox::SpacingListBox(vcl::Window* pParent)
+ : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
{
ResStringArray aSpacingAry( SVX_RES( RID_SVXSTRARY_SPACING ) );
sal_uInt32 nCnt = aSpacingAry.Count();
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx
index 331b835..d7bbd8a 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -18,8 +18,10 @@
*/
#include "svx/svxgrahicitem.hxx"
-SvxGraphicItem::SvxGraphicItem( sal_uInt16 _nWhich, const Graphic& rGraphic )
- : SfxPoolItem( _nWhich ), aGraphic( rGraphic )
+#include "svx/svxids.hrc"
+
+SvxGraphicItem::SvxGraphicItem( const Graphic& rGraphic )
+ : SfxPoolItem( SID_GRAPHIC ), aGraphic( rGraphic )
{
}
diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index 5d33830..f5c3946 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -21,12 +21,12 @@
#include <tools/stream.hxx>
Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
- double fFocalLen, double fBankAng) :
+ double fFocalLen) :
aResetPos(rPos),
aResetLookAt(rLookAt),
fResetFocalLength(fFocalLen),
- fResetBankAngle(fBankAng),
- fBankAngle(fBankAng),
+ fResetBankAngle(0),
+ fBankAngle(0),
bAutoAdjustProjection(true)
{
SetVPD(0);
@@ -48,12 +48,12 @@ Camera3D::Camera3D()
// Set default values for reset
void Camera3D::SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
- double fFocalLen, double fBankAng)
+ double fFocalLen)
{
aResetPos = rPos;
aResetLookAt = rLookAt;
fResetFocalLength = fFocalLen;
- fResetBankAngle = fBankAng;
+ fResetBankAngle = 0;
}
// Set ViewWindow and adjust PRP
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 4699cc7..c7a7d93 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -84,8 +84,8 @@ using namespace com::sun::star;
// List for 3D-Objects
-E3dObjList::E3dObjList(SdrModel* pNewModel, SdrPage* pNewPage, E3dObjList* pNewUpList)
-: SdrObjList(pNewModel, pNewPage, pNewUpList)
+E3dObjList::E3dObjList()
+: SdrObjList(nullptr, nullptr, nullptr)
{
}
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index c8c5c43..63d802c 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -87,9 +87,7 @@ public:
// internal
SvxGraphCtrlAccessibleContext(
const css::uno::Reference< css::accessibility::XAccessible>& rxParent,
- GraphCtrl& rRepresentation,
- const OUString* pName = nullptr,
- const OUString* pDescription = nullptr );
+ GraphCtrl& rRepresentation );
void Notify( SfxBroadcaster& aBC, const SfxHint& aHint ) override;
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 25a2816..9f67fa3 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -74,9 +74,7 @@ public:
// internal
SvxRectCtlAccessibleContext(
const css::uno::Reference< css::accessibility::XAccessible>& rxParent,
- SvxRectCtl& rRepresentation,
- const OUString* pName = nullptr,
- const OUString* pDescription = nullptr );
+ SvxRectCtl& rRepresentation );
protected:
virtual ~SvxRectCtlAccessibleContext();
public:
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index a55607e..0857542 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -164,11 +164,10 @@ ViewContact& ObjectContactOfPagePainter::GetPaintObjectViewContact(sal_uInt32 /*
}
ObjectContactOfPagePainter::ObjectContactOfPagePainter(
- const SdrPage* pPage,
ObjectContact& rOriginalObjectContact)
: ObjectContactPainter(),
mrOriginalObjectContact(rOriginalObjectContact),
- mxStartPage(const_cast< SdrPage* >(pPage)) // no SdrPageWeakRef available to hold a const SdrPage*
+ mxStartPage()
{
}
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 43c860e..09ea521 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -77,7 +77,7 @@ public:
PagePrimitiveExtractor::PagePrimitiveExtractor(
ViewObjectContactOfPageObj& rVOC)
-: ObjectContactOfPagePainter(nullptr, rVOC.GetObjectContact()),
+: ObjectContactOfPagePainter(rVOC.GetObjectContact()),
mrViewObjectContactOfPageObj(rVOC)
{
// make this renderer a preview renderer
diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx
index 1fbfff1..0163434 100644
--- a/svx/source/sdr/overlay/overlayrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrectangle.cxx
@@ -70,7 +70,6 @@ namespace sdr
double fDiscreteGrow,
double fDiscreteShrink,
double fRotation,
- sal_uInt64 nBlinkTime,
bool bAnimate)
: OverlayObjectWithBasePosition(rBasePosition, rHatchColor),
maSecondPosition(rSecondPosition),
@@ -78,7 +77,7 @@ namespace sdr
mfDiscreteGrow(fDiscreteGrow),
mfDiscreteShrink(fDiscreteShrink),
mfRotation(fRotation),
- mnBlinkTime(impCheckBlinkTimeValueRange(nBlinkTime)),
+ mnBlinkTime(impCheckBlinkTimeValueRange(500)),
mbOverlayState(false)
{
if(Application::GetSettings().GetStyleSettings().GetHighContrastMode())
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 258466f..52ca6ca 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -43,7 +43,6 @@ ValueSetWithTextControl::ValueSetWithTextControl(
void ValueSetWithTextControl::AddItem(
const Image& rItemImage,
- const Image* pSelectedItemImage,
const OUString& rItemText,
const OUString* pItemHelpText )
{
@@ -54,22 +53,13 @@ void ValueSetWithTextControl::AddItem(
ValueSetWithTextItem aItem;
aItem.maItemImage = rItemImage;
- aItem.maSelectedItemImage = (pSelectedItemImage != nullptr)
- ? *pSelectedItemImage
- : rItemImage;
+ aItem.maSelectedItemImage = rItemImage;
if ( GetDPIScaleFactor() > 1 )
{
BitmapEx b = aItem.maItemImage.GetBitmapEx();
b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
aItem.maItemImage = Image(b);
-
- if ( pSelectedItemImage != nullptr )
- {
- b = aItem.maSelectedItemImage.GetBitmapEx();
- b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
- aItem.maSelectedItemImage = Image(b);
- }
}
aItem.maItemText = rItemText;
@@ -84,8 +74,7 @@ void ValueSetWithTextControl::AddItem(
void ValueSetWithTextControl::AddItem(
const OUString& rItemText,
- const OUString& rItemText2,
- const OUString* pItemHelpText )
+ const OUString& rItemText2 )
{
if ( meControlType != ControlType::TextText )
{
@@ -99,8 +88,7 @@ void ValueSetWithTextControl::AddItem(
maItems.push_back( aItem );
InsertItem( maItems.size() );
- SetItemText( maItems.size(),
- (pItemHelpText != nullptr) ? *pItemHelpText : rItemText );
+ SetItemText( maItems.size(), rItemText );
}
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 492d84a..83779ac 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -106,7 +106,7 @@ using namespace ::com::sun::star;
SdrItemPool::SdrItemPool(
SfxItemPool* _pMaster,
bool bLoadRefCounts)
-: XOutdevItemPool(_pMaster, SDRATTR_START, SDRATTR_END, bLoadRefCounts)
+: XOutdevItemPool(_pMaster, bLoadRefCounts)
{
// prepare some constants
const Color aNullCol(RGB_Color(COL_BLACK));
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index b5098b7..8243f49 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -517,9 +517,9 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
return bRet;
}
-bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
+bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov)
{
- return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), nullptr);
+ return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,nullptr,Rectangle(), nullptr);
}
bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject)
@@ -537,9 +537,9 @@ bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov
}
bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
- OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
+ OutputDevice* pOut, short nMinMov)
{
- return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV,
+ return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,nullptr,
Rectangle(rPnt,Size(rObjSiz.Width()+1,rObjSiz.Height()+1)), nullptr);
}
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 15c9a57..6dde720 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1010,8 +1010,8 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
bool bXSnapped=false;
bool bYSnapped=false;
Point aDif(aPnt-DragStat().GetStart());
- getSdrDragView().CheckSnap(Ref1()+aDif,nullptr,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
- getSdrDragView().CheckSnap(Ref2()+aDif,nullptr,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
+ getSdrDragView().CheckSnap(Ref1()+aDif,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
+ getSdrDragView().CheckSnap(Ref2()+aDif,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
aPnt.X()+=nBestXSnap;
aPnt.Y()+=nBestYSnap;
}
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 9f547e1..a5978c1 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -40,7 +40,7 @@ SdrGlueEditView::~SdrGlueEditView()
}
-void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
+void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2, const void* p3, const void* p4)
{
const size_t nMarkCount=GetMarkedObjectCount();
for (size_t nm=0; nm<nMarkCount; ++nm) {
@@ -68,7 +68,7 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co
if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
{
SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
- (*pDoFunc)(rGP,pObj,p1,p2,p3,p4,p5);
+ (*pDoFunc)(rGP,pObj,p1,p2,p3,p4);
}
}
if (!bConst)
@@ -83,7 +83,7 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co
}
-static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*)
+static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*)
{
sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet));
if (nRet!=FUZZY) {
@@ -107,7 +107,7 @@ SDR_TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(SdrEscapeDirection nThisE
return (SDR_TRISTATE)nRet;
}
-static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*, const void*)
+static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*)
{
SdrEscapeDirection nEsc=rGP.GetEscDir();
if (*static_cast<bool const *>(pbOn))
@@ -126,7 +126,7 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc, boo
}
-static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*)
+static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*)
{
sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet));
if (nRet!=FUZZY) {
@@ -146,7 +146,7 @@ SDR_TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const
return (SDR_TRISTATE)nRet;
}
-static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*, const void*)
+static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*)
{
Point aPos(rGP.GetAbsolutePos(*pObj));
rGP.SetPercent(*static_cast<bool const *>(pbOn));
@@ -162,7 +162,7 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(bool bOn)
}
-static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*)
+static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet)
{
SdrAlign& nRet=*const_cast<SdrAlign *>(static_cast<SdrAlign const *>(pnRet));
bool& bDontCare=*const_cast<bool *>(static_cast<bool const *>(pbDontCare));
@@ -197,7 +197,7 @@ SdrAlign SdrGlueEditView::GetMarkedGluePointsAlign(bool bVert) const
return nRet;
}
-static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbVert, const void* pnAlign, const void*, const void*, const void*)
+static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbVert, const void* pnAlign, const void*, const void*)
{
Point aPos(rGP.GetAbsolutePos(*pObj));
if (*static_cast<bool const *>(pbVert)) { // bVert?
@@ -310,7 +310,7 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
}
-void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
+void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4)
{
const size_t nMarkCount=GetMarkedObjectCount();
for (size_t nm=0; nm<nMarkCount; ++nm) {
@@ -332,7 +332,7 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo
if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) {
SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
Point aPos(rGP.GetAbsolutePos(*pObj));
- (*pTrFunc)(aPos,p1,p2,p3,p4,p5);
+ (*pTrFunc)(aPos,p1,p2,p3,p4);
rGP.SetAbsolutePos(aPos,*pObj);
}
}
@@ -345,7 +345,7 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo
}
-static void ImpMove(Point& rPt, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/)
+static void ImpMove(Point& rPt, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/)
{
rPt.X()+=static_cast<const Size*>(p1)->Width();
rPt.Y()+=static_cast<const Size*>(p1)->Height();
@@ -364,7 +364,7 @@ void SdrGlueEditView::MoveMarkedGluePoints(const Size& rSiz, bool bCopy)
}
-static void ImpResize(Point& rPt, const void* p1, const void* p2, const void* p3, const void* /*p4*/, const void* /*p5*/)
+static void ImpResize(Point& rPt, const void* p1, const void* p2, const void* p3, const void* /*p4*/)
{
ResizePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3));
}
@@ -382,7 +382,7 @@ void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, const Fraction&
}
-static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void* p3, const void* p4, const void* /*p5*/)
+static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void* p3, const void* p4)
{
RotatePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4));
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index b4c3bee..3216a7f 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -88,7 +88,7 @@ class SdrHdlBitmapSet
BitmapEx& impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const Rectangle& rRectangle);
public:
- explicit SdrHdlBitmapSet(sal_uInt16 nResId);
+ explicit SdrHdlBitmapSet();
~SdrHdlBitmapSet();
const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
@@ -99,8 +99,8 @@ public:
#define INDEX_COUNT (6)
#define INDIVIDUAL_COUNT (5)
-SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
- : maMarkersBitmap(ResId(nResId, *ImpGetResMgr())),
+SdrHdlBitmapSet::SdrHdlBitmapSet()
+ : maMarkersBitmap(ResId(SIP_SA_MARKERS, *ImpGetResMgr())),
// 15 kinds (BitmapMarkerKind) use index [0..5] + 5 extra
maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
{
@@ -675,7 +675,7 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd)
BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd)
{
- static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet(SIP_SA_MARKERS));
+ static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet);
return aModernSet.get()->GetBitmapEx(eKindOfMarker, nInd);
}
@@ -1706,7 +1706,6 @@ void ImpTextframeHdl::CreateB2dIAObject()
3.0,
3.0,
nRotationAngle * -F_PI18000,
- 500,
true); // allow animation; the Handle is not shown at text edit time
// OVERLAYMANAGER
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 0c4e458..3a98974 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -205,8 +205,8 @@ void ImpItemEdit::KeyInput(const KeyEvent& rKEvt)
#define MYBROWSEMODE (BrowserMode::THUMBDRAGGING|BrowserMode::KEEPHIGHLIGHT|BrowserMode::NO_HSCROLL|BrowserMode::HIDECURSOR)
-SdrItemBrowserControl::SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits):
- BrowseBox(pParent,nBits,MYBROWSEMODE),
+SdrItemBrowserControl::SdrItemBrowserControl(vcl::Window* pParent):
+ BrowseBox(pParent, WB_3DLOOK | WB_BORDER | WB_TABSTOP, MYBROWSEMODE),
aList()
{
ImpCtor();
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index d4c2e2a..8a1644a 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -537,7 +537,7 @@ SdrObjClosedKind SdrPolyEditView::GetMarkedObjectsClosedState() const
}
}
-void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
+void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4)
{
const bool bUndo = IsUndoEnabled();
@@ -588,7 +588,7 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void*
bC2 = true;
}
- (*pTrFunc)(aPos,&aC1,&aC2,p1,p2,p3,p4,p5);
+ (*pTrFunc)(aPos,&aC1,&aC2,p1,p2,p3,p4);
aNewXP.setB2DPoint(nPointNum, basegfx::B2DPoint(aPos.X(), aPos.Y()));
if (bC1)
@@ -611,7 +611,7 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void*
}
-static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/)
+static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/)
{
MovePoint(rPt,*static_cast<const Size*>(p1));
if (pC1!=nullptr) MovePoint(*pC1,*static_cast<const Size*>(p1));
@@ -628,7 +628,7 @@ void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz)
AdjustMarkHdl();
}
-static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* p2, const void* p3, const void* /*p4*/, const void* /*p5*/)
+static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* p2, const void* p3, const void* /*p4*/)
{
ResizePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3));
if (pC1!=nullptr) ResizePoint(*pC1,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3));
@@ -645,7 +645,7 @@ void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFac
AdjustMarkHdl();
}
-static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* p3, const void* p4, const void* /*p5*/)
+static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* p3, const void* p4)
{
RotatePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4));
if (pC1!=nullptr) RotatePoint(*pC1,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4));
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 20466bb..2129b24 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -416,10 +416,10 @@ SdrSnap SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
return bRet;
}
-void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const
+void SdrSnapView::CheckSnap(const Point& rPt, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const
{
Point aPt(rPt);
- SdrSnap nRet=SnapPos(aPt,pPV);
+ SdrSnap nRet=SnapPos(aPt,nullptr);
aPt-=rPt;
if (nRet & SdrSnap::XSNAPPED) {
if (bXSnapped) {
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index f5899a6..5120452 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1246,7 +1246,7 @@ void SvxTableController::SplitMarkedCells()
getSelectedCells( aStart, aEnd );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr< SvxAbstractSplittTableDialog > xDlg( pFact ? pFact->CreateSvxSplittTableDialog( nullptr, false, 99, 99 ) : nullptr );
+ std::unique_ptr< SvxAbstractSplittTableDialog > xDlg( pFact ? pFact->CreateSvxSplittTableDialog( nullptr, false, 99 ) : nullptr );
if( xDlg.get() && xDlg->Execute() )
{
const sal_Int32 nCount = xDlg->GetCount() - 1;
@@ -1709,7 +1709,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W
}
case ACTION_EDIT_CELL:
- EditCell( getSelectionStart(), pWindow, nullptr, nAction );
+ EditCell( getSelectionStart(), pWindow, nAction );
break;
case ACTION_STOP_TEXT_EDIT:
@@ -1770,7 +1770,7 @@ void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, vcl::Windo
else
{
RemoveSelection();
- EditCell( rPos, pWindow, nullptr, nAction );
+ EditCell( rPos, pWindow, nAction );
}
}
@@ -1856,7 +1856,7 @@ void SvxTableController::findMergeOrigin( CellPos& rPos )
}
-void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, const awt::MouseEvent* pMouseEvent /*= 0*/, sal_uInt16 nAction /*= ACTION_NONE */ )
+void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, sal_uInt16 nAction /*= ACTION_NONE */ )
{
SdrPageView* pPV = mpView->GetSdrPageView();
@@ -1902,46 +1902,19 @@ void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, co
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
- bool bNoSel = true;
+ // Move cursor to end of text
+ ESelection aNewSelection;
- if( pMouseEvent )
+ const WritingMode eMode = pTableObj->GetWritingMode();
+ if( ((nAction == ACTION_GOTO_LEFT_CELL) || (nAction == ACTION_GOTO_RIGHT_CELL)) && (eMode != WritingMode_TB_RL) )
{
- ::MouseEvent aMEvt( *pMouseEvent );
+ const bool bLast = ((nAction == ACTION_GOTO_LEFT_CELL) && (eMode == WritingMode_LR_TB)) ||
+ ((nAction == ACTION_GOTO_RIGHT_CELL) && (eMode == WritingMode_RL_TB));
- SdrViewEvent aVEvt;
- SdrHitKind eHit = mpView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
-
- if (eHit == SdrHitKind::TextEdit)
- {
- // Text getroffen
- pOLV->MouseButtonDown(aMEvt);
- pOLV->MouseMove(aMEvt);
- pOLV->MouseButtonUp(aMEvt);
-// pOLV->MouseButtonDown(aMEvt);
- bNoSel = false;
- }
- else
- {
- nAction = ACTION_GOTO_LEFT_CELL;
- }
- }
-
- if( bNoSel )
- {
- // Move cursor to end of text
- ESelection aNewSelection;
-
- const WritingMode eMode = pTableObj->GetWritingMode();
- if( ((nAction == ACTION_GOTO_LEFT_CELL) || (nAction == ACTION_GOTO_RIGHT_CELL)) && (eMode != WritingMode_TB_RL) )
- {
- const bool bLast = ((nAction == ACTION_GOTO_LEFT_CELL) && (eMode == WritingMode_LR_TB)) ||
- ((nAction == ACTION_GOTO_RIGHT_CELL) && (eMode == WritingMode_RL_TB));
-
- if( bLast )
- aNewSelection = ESelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND);
- }
- pOLV->SetSelection(aNewSelection);
+ if( bLast )
+ aNewSelection = ESelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND);
}
+ pOLV->SetSelection(aNewSelection);
}
}
}
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 8c8e11f..d369ed8 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -296,7 +296,7 @@ void TableBorderHdl::CreateB2dIAObject()
sdr::overlay::OverlayObject* pOverlayObject =
new sdr::overlay::OverlayRectangle(aRange.getMinimum(), aRange.getMaximum(),
aHilightColor, fTransparence,
- fWidth, 0.0, 0.0, 500, bAnimate);
+ fWidth, 0.0, 0.0, bAnimate);
xManager->add(*pOverlayObject);
maOverlayGroup.append(*pOverlayObject);
}
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 3832b9e..6db593c 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -85,8 +85,8 @@ bool SvxColorValueSetData::WriteObject( tools::SvRef<SotStorageStream>& rxOStm,
return( rxOStm->GetError() == ERRCODE_NONE );
}
-SvxColorValueSet_docking::SvxColorValueSet_docking( vcl::Window* _pParent, WinBits nWinStyle ) :
- SvxColorValueSet( _pParent, nWinStyle ),
+SvxColorValueSet_docking::SvxColorValueSet_docking( vcl::Window* _pParent ) :
+ SvxColorValueSet( _pParent, WB_ITEMBORDER ),
DragSourceHelper( this ),
mbLeftButton(true)
{
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 7d26b8f..858c0ed 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -52,8 +52,8 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
-SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) :
- LineLB( pParent, nBits ),
+SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame ) :
+ LineLB( pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ),
nCurPos ( 0 ),
aLogicalSize(40,140),
bRelease ( true ),
@@ -382,8 +382,8 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt )
MetricField::DataChanged( rDCEvt );
}
-SvxFillTypeBox::SvxFillTypeBox( vcl::Window* pParent, WinBits nBits ) :
- FillTypeLB( pParent, nBits | WB_TABSTOP ),
+SvxFillTypeBox::SvxFillTypeBox( vcl::Window* pParent ) :
+ FillTypeLB( pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL | WB_TABSTOP ),
nCurPos ( 0 ),
bSelect ( false ),
bRelease( true )
@@ -463,8 +463,8 @@ void SvxFillTypeBox::ReleaseFocus_Impl()
}
}
-SvxFillAttrBox::SvxFillAttrBox( vcl::Window* pParent, WinBits nBits ) :
- FillAttrLB( pParent, nBits | WB_TABSTOP ),
+SvxFillAttrBox::SvxFillAttrBox( vcl::Window* pParent ) :
+ FillAttrLB( pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL | WB_TABSTOP ),
nCurPos( 0 ),
bRelease( true )
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index d2410a4..711a57c 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -202,8 +202,8 @@ void ImpXPolygon::CheckPointDelete() const
}
}
-XPolygon::XPolygon( sal_uInt16 nSize, sal_uInt16 nResize )
- : pImpXPolygon( ImpXPolygon( nSize, nResize ) )
+XPolygon::XPolygon( sal_uInt16 nSize )
+ : pImpXPolygon( ImpXPolygon( nSize, 16 ) )
{
}
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 476e2ab..d427aa0 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -26,10 +26,8 @@
XOutdevItemPool::XOutdevItemPool(
SfxItemPool* _pMaster,
- sal_uInt16 nAttrStart,
- sal_uInt16 nAttrEnd,
bool bLoadRefCounts)
-: SfxItemPool("XOutdevItemPool", nAttrStart, nAttrEnd, nullptr, nullptr, bLoadRefCounts)
+: SfxItemPool("XOutdevItemPool", SDRATTR_START, SDRATTR_END, nullptr, nullptr, bLoadRefCounts)
{
// prepare some defaults
const OUString aNullStr;
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 132b91c..0923545 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -986,7 +986,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if( pFact )
{
const long nMaxVert = rSh.GetAnyCurRect( RECT_FRM ).Width() / MINLAY;
- std::unique_ptr<SvxAbstractSplittTableDialog> pDlg(pFact->CreateSvxSplittTableDialog( GetView().GetWindow(), rSh.IsTableVertical(), nMaxVert, 99 ));
+ std::unique_ptr<SvxAbstractSplittTableDialog> pDlg(pFact->CreateSvxSplittTableDialog( GetView().GetWindow(), rSh.IsTableVertical(), nMaxVert ));
if( pDlg && (pDlg->Execute() == RET_OK) )
{
nCount = pDlg->GetCount();
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 04b198f..ca73e95 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -204,7 +204,7 @@ void PageMarginControl::FillValueSet(
aHelpText += aBottom;
aHelpText += aNarrowValText;
mpMarginValueSet->AddItem(
- Image((bLandscape) ? SW_RES(IMG_NARROW_L) : SW_RES(IMG_NARROW)), nullptr,
+ Image((bLandscape) ? SW_RES(IMG_NARROW_L) : SW_RES(IMG_NARROW)),
SW_RESSTR(STR_NARROW), &aHelpText );
SetMetricValue( *maWidthHeightField.get(), SWPAGE_NORMAL_VALUE, meUnit );
@@ -218,7 +218,7 @@ void PageMarginControl::FillValueSet(
aHelpText += aBottom;
aHelpText += aNormalValText;
mpMarginValueSet->AddItem(
- Image((bLandscape) ? SW_RES(IMG_NORMAL_L) : SW_RES(IMG_NORMAL)), nullptr,
+ Image((bLandscape) ? SW_RES(IMG_NORMAL_L) : SW_RES(IMG_NORMAL)),
SW_RESSTR(STR_NORMAL), &aHelpText );
SetMetricValue( *maWidthHeightField.get(), SWPAGE_WIDE_VALUE1, meUnit );
@@ -234,7 +234,7 @@ void PageMarginControl::FillValueSet(
aHelpText += aBottom;
aHelpText += aWide1ValText;
mpMarginValueSet->AddItem(
- Image((bLandscape) ? SW_RES(IMG_WIDE_L) : SW_RES(IMG_WIDE)), nullptr,
+ Image((bLandscape) ? SW_RES(IMG_WIDE_L) : SW_RES(IMG_WIDE)),
SW_RESSTR(STR_WIDE), &aHelpText );
const OUString aInner = SW_RESSTR(STR_MARGIN_TOOLTIP_INNER);
@@ -251,7 +251,7 @@ void PageMarginControl::FillValueSet(
aHelpText += aBottom;
aHelpText += aWide1ValText;
mpMarginValueSet->AddItem(
- Image((bLandscape) ? SW_RES(IMG_MIRRORED_L) : SW_RES(IMG_MIRRORED)), nullptr,
+ Image((bLandscape) ? SW_RES(IMG_MIRRORED_L) : SW_RES(IMG_MIRRORED)),
SW_RESSTR(STR_MIRRORED), &aHelpText );
if ( bUserCustomValuesAvailable )
@@ -274,7 +274,7 @@ void PageMarginControl::FillValueSet(
aHelpText.clear();
}
mpMarginValueSet->AddItem(
- Image((bUserCustomValuesAvailable) ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS)), nullptr,
+ Image((bUserCustomValuesAvailable) ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS)),
SW_RESSTR(STR_LCVALUE), &aHelpText );
}
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 4ad77ae..29151a1 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -117,8 +117,7 @@ PageSizeControl::PageSizeControl(
mpSizeValueSet->AddItem(
SvxPaperInfo::GetName( maPaperList[ nPaperIdx ] ),
- aItemText2,
- nullptr );
+ aItemText2 );
if ( maPaperList[ nPaperIdx ] == mePaper )
{
More information about the Libreoffice-commits
mailing list