[Libreoffice-commits] core.git: cui/source include/svx reportdesign/source sc/source sd/source svx/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri May 5 06:51:27 UTC 2017
cui/source/tabpages/tptrans.cxx | 6 ++--
include/svx/SpellDialogChildWindow.hxx | 3 --
include/svx/fmgridcl.hxx | 8 ++---
include/svx/fontworkgallery.hxx | 2 -
include/svx/gridctrl.hxx | 6 ++--
include/svx/sdr/table/tablecontroller.hxx | 2 -
include/svx/svddrgv.hxx | 4 +-
include/svx/svdotable.hxx | 2 -
include/svx/svdotext.hxx | 2 -
include/svx/svdpntv.hxx | 6 ++--
include/svx/xbtmpit.hxx | 2 -
include/svx/xflftrit.hxx | 2 -
include/svx/xflhtit.hxx | 2 -
include/svx/xlndsit.hxx | 2 -
include/svx/xlnedit.hxx | 2 -
include/svx/xlnstit.hxx | 2 -
reportdesign/source/ui/report/ReportController.cxx | 6 ++--
sc/source/ui/view/spelldialog.cxx | 4 +-
sd/source/core/drawdoc4.cxx | 11 +++----
sd/source/ui/dlg/SpellDialogChildWindow.cxx | 4 +-
sd/source/ui/view/sdview3.cxx | 2 -
sd/source/ui/view/sdview4.cxx | 2 -
svx/source/customshapes/EnhancedCustomShape3d.cxx | 4 +-
svx/source/customshapes/EnhancedCustomShape3d.hxx | 2 -
svx/source/dialog/SpellDialogChildWindow.cxx | 3 --
svx/source/fmcomp/fmgridcl.cxx | 10 +++----
svx/source/fmcomp/fmgridif.cxx | 8 ++---
svx/source/fmcomp/gridcell.cxx | 2 -
svx/source/fmcomp/gridctrl.cxx | 14 ++++-----
svx/source/form/fmshimp.cxx | 2 -
svx/source/form/fmtextcontrolshell.cxx | 2 -
svx/source/inc/fmtextcontrolshell.hxx | 2 -
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 3 --
svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx | 3 --
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 20 +++++++-------
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 6 ++--
svx/source/svdraw/svddrgv.cxx | 5 +--
svx/source/svdraw/svdfmtf.cxx | 2 -
svx/source/svdraw/svdoashp.cxx | 4 +-
svx/source/svdraw/svdotxln.cxx | 4 +-
svx/source/svdraw/svdpntv.cxx | 17 ++++-------
svx/source/table/svdotable.cxx | 12 ++++----
svx/source/table/tablecontroller.cxx | 4 +-
svx/source/tbxctrls/fontworkgallery.cxx | 12 ++++----
svx/source/toolbars/fontworkbar.cxx | 2 -
svx/source/xoutdev/xattr.cxx | 10 +++----
svx/source/xoutdev/xattrbmp.cxx | 2 -
svx/source/xoutdev/xpool.cxx | 12 ++++----
sw/source/core/unocore/unoframe.cxx | 10 +++----
sw/source/core/unocore/unostyle.cxx | 4 +-
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 4 +-
sw/source/uibase/uiview/viewdraw.cxx | 2 -
52 files changed, 129 insertions(+), 140 deletions(-)
New commits:
commit ac11e45bad895e9f7de0b38fe22b7f2acf8c8e4b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu May 4 16:10:13 2017 +0200
loplugin:checkunusedparams in svx(part4)
Change-Id: I032b49f4e1228ef275d7ff8d87ba969dcef687ab
Reviewed-on: https://gerrit.libreoffice.org/37248
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 90cea669a8a8..5b1ce71a644a 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -171,7 +171,7 @@ void SvxTransparenceTabPage::ModifiedTrgrHdl_Impl(void* pControl)
(sal_uInt16)m_pMtrTrgrBorder->GetValue(),
100, 100);
- XFillFloatTransparenceItem aItem( rXFSet.GetPool()/*aString*/, aTmpGradient);
+ XFillFloatTransparenceItem aItem( aTmpGradient);
rXFSet.Put ( aItem );
InvalidatePreview();
@@ -356,7 +356,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
(sal_uInt16)m_pMtrTrgrBorder->GetValue(),
100, 100);
- XFillFloatTransparenceItem aItem( rXFSet.GetPool()/*aString*/, aTmpGradient);
+ XFillFloatTransparenceItem aItem(aTmpGradient);
const SfxPoolItem* pOld = GetOldItem(*rAttrs, XATTR_FILLFLOATTRANSPARENCE);
if(!pOld || !(*static_cast<const XFillFloatTransparenceItem*>(pOld) == aItem) || !bGradActive)
@@ -381,7 +381,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
XGradient aGrad(aColor, Color(COL_WHITE));
aGrad.SetStartIntens(100);
aGrad.SetEndIntens(100);
- XFillFloatTransparenceItem aItem( rXFSet.GetPool()/*aString*/, aGrad);
+ XFillFloatTransparenceItem aItem(aGrad);
aItem.SetEnabled(false);
rAttrs->Put(aItem);
bModified = true;
diff --git a/include/svx/SpellDialogChildWindow.hxx b/include/svx/SpellDialogChildWindow.hxx
index b3d938c15b07..15c0f6868891 100644
--- a/include/svx/SpellDialogChildWindow.hxx
+++ b/include/svx/SpellDialogChildWindow.hxx
@@ -51,8 +51,7 @@ public:
SpellDialogChildWindow (
vcl::Window*pParent,
sal_uInt16 nId,
- SfxBindings* pBindings,
- SfxChildWinInfo* pInfo);
+ SfxBindings* pBindings);
virtual ~SpellDialogChildWindow () override;
protected:
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 78ad042e4571..a47ef033d7a9 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -112,13 +112,13 @@ public:
void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt);
// css::form::XPositioningListener
- void positioned(const css::lang::EventObject& rEvent);
+ void positioned();
// XBound
bool commit();
// css::form::XInsertListener
- void inserted(const css::lang::EventObject& rEvent);
+ void inserted();
void markColumn(sal_uInt16 nId);
bool isColumnMarked(sal_uInt16 nId) const;
@@ -186,14 +186,12 @@ protected:
bool selectBookmarks(const css::uno::Sequence< css::uno::Any>& _rBookmarks);
/** returns if a column is selected
- @param nColumnId
- The column id.
@param _pColumn
The column to compare with.
@return
<TRUE/> if the column is selected, otherwise <FALSE/>
*/
- bool isColumnSelected(sal_uInt16 nColumnId,DbGridColumn* _pColumn);
+ bool isColumnSelected(DbGridColumn* _pColumn);
};
#endif // INCLUDED_SVX_FMGRIDCL_HXX
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 3c2368cdb9c2..5699f1791cfc 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -81,7 +81,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog
std::vector< BitmapEx> maFavoritesHorizontal;
public:
- FontWorkGalleryDialog( SdrView* pView, vcl::Window* pParent, sal_uInt16 nSID );
+ FontWorkGalleryDialog( SdrView* pView, vcl::Window* pParent );
virtual ~FontWorkGalleryDialog() override;
virtual void dispose() override;
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 43a6a12ee059..5a49a5835255 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -353,10 +353,10 @@ protected:
/// @throws css::uno::RuntimeException
void DataSourcePropertyChanged(const css::beans::PropertyChangeEvent& evt);
- void FieldValueChanged(sal_uInt16 _nId, const css::beans::PropertyChangeEvent& _evt);
+ void FieldValueChanged(sal_uInt16 _nId);
void FieldListenerDisposing(sal_uInt16 _nId);
- void disposing(sal_uInt16 _nId, const css::lang::EventObject& _rEvt);
+ void disposing(sal_uInt16 _nId);
// own overridables
/// called when the current row changed
@@ -467,7 +467,7 @@ public:
void RowRemoved( long nRow, long nNumRows = 1, bool bDoPaint = true );
void RowInserted( long nRow, long nNumRows = 1, bool bDoPaint = true );
- void RowModified( long nRow, sal_uInt16 nColId = USHRT_MAX );
+ void RowModified( long nRow );
void resetCurrentRow();
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 40011b10f1e9..d08f5abc0ceb 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -148,7 +148,7 @@ private:
SVX_DLLPRIVATE void EditCell(const CellPos& rPos, vcl::Window* pWindow, TblAction nAction);
SVX_DLLPRIVATE void StopTextEdit();
- SVX_DLLPRIVATE TblAction getKeyboardAction(const KeyEvent& rKEvt, vcl::Window* pWindow);
+ SVX_DLLPRIVATE TblAction getKeyboardAction(const KeyEvent& rKEvt);
SVX_DLLPRIVATE bool executeAction(TblAction nAction, bool bSelect, vcl::Window* pWindow);
SVX_DLLPRIVATE void gotoCell(const CellPos& rCell, bool bSelect, vcl::Window* pWindow, TblAction nAction = TblAction::NONE);
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 5da66b5eaa90..76228abf3c16 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -64,7 +64,7 @@ protected:
virtual void SetMarkHandles(SfxViewShell* pOtherShell) override;
void ShowDragObj();
void HideDragObj();
- bool ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut);
+ bool ImpBegInsObjPoint(bool bIdxZwang, const Point& rPnt, bool bNewObj, OutputDevice* pOut);
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -115,7 +115,7 @@ public:
// Interactive insertion of a new point. nIdx=0 => in front of the first point
bool IsInsObjPointPossible() const;
- bool BegInsObjPoint(const Point& rPnt, bool bNewObj) { return ImpBegInsObjPoint(false, 0L, rPnt, bNewObj, nullptr); }
+ bool BegInsObjPoint(const Point& rPnt, bool bNewObj) { return ImpBegInsObjPoint(false, rPnt, bNewObj, nullptr); }
void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); }
bool EndInsObjPoint(SdrCreateCmd eCmd);
bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && mbInsPolyPoint; }
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 905b4aa2ea98..29495ab5524b 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -175,7 +175,7 @@ public:
/** At the same time, we set the text in the outliner (if applicable the EditOutliners')
* as well as the PaperSize
*/
- void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::tools::Rectangle& rTextRect, bool bNoEditText, ::tools::Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const;
+ void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::tools::Rectangle& rTextRect, bool bNoEditText, ::tools::Rectangle* pAnchorRect=nullptr ) const;
virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const override;
void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::tools::Rectangle& rAnchorRect ) const;
virtual void TakeTextAnchorRect(::tools::Rectangle& rAnchorRect) const override;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 9f6f383b5344..5b23e70fe25f 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -338,7 +338,7 @@ public:
void ReleaseTextLink();
bool IsLinkedText() const { return pPlusData!=nullptr && GetLinkUserData()!=nullptr; }
bool ReloadLinkedText(bool bForceLoad);
- bool LoadText(const OUString& rFileName, const OUString& rFilterName, rtl_TextEncoding eCharSet);
+ bool LoadText(const OUString& rFileName, rtl_TextEncoding eCharSet);
virtual bool AdjustTextFrameWidthAndHeight(tools::Rectangle& rR, bool bHgt = true, bool bWdt = true) const;
virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true);
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 62cf75f7918f..5b58bd4be6e8 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -432,8 +432,8 @@ public:
const SfxItemSet& GetDefaultAttr() const { return maDefaultAttr; }
void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr);
- void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll);
- void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
+ void SetNotPersistDefaultAttr(const SfxItemSet& rAttr);
+ void MergeNotPersistDefaultAttr(SfxItemSet& rAttr) const;
/// Execute a swap-in of e.g. graphics asynchronously.
/// This does not reload all graphics like Paint does, but kicks off
@@ -486,7 +486,7 @@ public:
/// Must be called by the App when scrolling etc. in order for
/// an active FormularControl to be moved too
void VisAreaChanged(const OutputDevice* pOut);
- void VisAreaChanged(const SdrPageWindow& rWindow);
+ void VisAreaChanged();
bool IsPrintPreview() const { return mbPrintPreview; }
void SetPrintPreview(bool bOn = true) { mbPrintPreview=bOn; }
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index c86afdd28ba4..fb9cebdd01b3 100644
--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -45,7 +45,7 @@ public:
static SfxPoolItem* CreateDefault();
XFillBitmapItem() : NameOrIndex(XATTR_FILLBITMAP, -1 ) {}
XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject);
- XFillBitmapItem(SfxItemPool* pPool, const GraphicObject& rGraphicObject);
+ XFillBitmapItem( const GraphicObject& rGraphicObject );
XFillBitmapItem( const XFillBitmapItem& rItem );
XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer );
diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx
index a5b819251d3b..4d3154fa99ab 100644
--- a/include/svx/xflftrit.hxx
+++ b/include/svx/xflftrit.hxx
@@ -38,7 +38,7 @@ public:
static SfxPoolItem* CreateDefault();
XFillFloatTransparenceItem();
XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, bool bEnable = true );
- XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, bool bEnable = true );
+ XFillFloatTransparenceItem( const XGradient& rTheGradient, bool bEnable = true );
XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem );
virtual bool operator==( const SfxPoolItem& rItem ) const override;
diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index 0d8ce071c852..973de794b24d 100644
--- a/include/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
@@ -37,7 +37,7 @@ public:
static SfxPoolItem* CreateDefault();
XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {}
XFillHatchItem(const OUString& rName, const XHatch& rTheHatch);
- XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch);
+ XFillHatchItem(const XHatch& rTheHatch);
XFillHatchItem(const XFillHatchItem& rItem);
XFillHatchItem(SvStream& rIn);
diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index 6d47aa257372..8f783e4cf327 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -38,7 +38,7 @@ public:
static SfxPoolItem* CreateDefault();
XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {}
XLineDashItem(const OUString& rName, const XDash& rTheDash);
- XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash);
+ XLineDashItem(const XDash& rTheDash);
XLineDashItem(const XLineDashItem& rItem);
XLineDashItem(SvStream& rIn);
diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx
index 240065f6efdf..1d6449bdd6cb 100644
--- a/include/svx/xlnedit.hxx
+++ b/include/svx/xlnedit.hxx
@@ -37,7 +37,7 @@ public:
static SfxPoolItem* CreateDefault();
XLineEndItem(sal_Int32 nIndex = -1);
XLineEndItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
- XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
+ XLineEndItem(const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineEndItem(const XLineEndItem& rItem);
XLineEndItem(SvStream& rIn);
diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx
index 4d67374bfceb..a47d2ec5114f 100644
--- a/include/svx/xlnstit.hxx
+++ b/include/svx/xlnstit.hxx
@@ -37,7 +37,7 @@ public:
static SfxPoolItem* CreateDefault();
XLineStartItem(sal_Int32 nIndex = -1);
XLineStartItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
- XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
+ XLineStartItem(const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineStartItem(const XLineStartItem& rItem);
XLineStartItem(SvStream& rIn);
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 2957f39e73f7..2404ff61e236 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2377,8 +2377,8 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
new XFillStyleItem,
new XFillColorItem("", aNullFillCol),
new XFillGradientItem(aNullGrad),
- new XFillHatchItem(pPool, aNullHatch),
- new XFillBitmapItem(pPool, aNullGraphic),
+ new XFillHatchItem(aNullHatch),
+ new XFillBitmapItem(aNullGraphic),
new XFillTransparenceItem,
new XGradientStepCountItem,
new XFillBmpTileItem,
@@ -2391,7 +2391,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
new XFillBmpStretchItem,
new XFillBmpPosOffsetXItem,
new XFillBmpPosOffsetYItem,
- new XFillFloatTransparenceItem(pPool, aNullGrad, false),
+ new XFillFloatTransparenceItem(aNullGrad, false),
new XSecondaryFillColorItem("", aNullFillCol),
new XFillBackgroundItem,
new SfxUInt16Item(RPTUI_ID_METRIC,static_cast<sal_uInt16>(eUserMetric))
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index 776eade337d1..8f493fde86db 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -40,8 +40,8 @@
SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG )
ScSpellDialogChildWindow::ScSpellDialogChildWindow( vcl::Window* pParentP, sal_uInt16 nId,
- SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
- svx::SpellDialogChildWindow( pParentP, nId, pBindings, pInfo ),
+ SfxBindings* pBindings, SfxChildWinInfo* /*pInfo*/ ) :
+ svx::SpellDialogChildWindow( pParentP, nId, pBindings ),
mpViewShell( nullptr ),
mpViewData( nullptr ),
mpDocShell( nullptr ),
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index d11df6530604..79c882a5e6d3 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -137,7 +137,6 @@ void SdDrawDocument::CreateLayoutTemplates()
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetHelpId( aHelpFile, HID_STANDARD_STYLESHEET_NAME );
SfxItemSet& rISet = pSheet->GetItemSet();
- SfxItemPool* pPool = rISet.GetPool();
::basegfx::B2DPolyPolygon aNullPolyPolygon;
Color aNullCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE));
@@ -152,9 +151,9 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(XLineStyleItem(drawing::LineStyle_SOLID));
rISet.Put(XLineColorItem(OUString(), RGB_Color(COL_DEFAULT_SHAPE_STROKE)));
rISet.Put(XLineWidthItem(0));
- rISet.Put(XLineDashItem(pPool,aNullDash));
- rISet.Put(XLineStartItem(pPool,aNullPolyPolygon));
- rISet.Put(XLineEndItem(pPool,aNullPolyPolygon));
+ rISet.Put(XLineDashItem(aNullDash));
+ rISet.Put(XLineStartItem(aNullPolyPolygon));
+ rISet.Put(XLineEndItem(aNullPolyPolygon));
rISet.Put(XLineStartWidthItem(200));
rISet.Put(XLineEndWidthItem(200));
rISet.Put(XLineStartCenterItem());
@@ -166,12 +165,12 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(XFillColorItem(OUString(), RGB_Color(COL_DEFAULT_SHAPE_FILLING)));
rISet.Put( XFillGradientItem( aNullGrad) );
- rISet.Put(XFillHatchItem(pPool,aNullHatch));
+ rISet.Put(XFillHatchItem(aNullHatch));
Size aNullSize( 32, 32 );
Color aNullColor( COL_WHITE );
Bitmap aNullBmp( aNullSize, 8 );
aNullBmp.Erase( aNullColor );
- rISet.Put(XFillBitmapItem(pPool, Graphic(aNullBmp)));
+ rISet.Put(XFillBitmapItem(Graphic(aNullBmp)));
// Shadow attributes (Drawing Engine)
rISet.Put(makeSdrShadowItem(false));
diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
index ca88b379c6f2..0ced6dc52ff4 100644
--- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
@@ -35,8 +35,8 @@ SpellDialogChildWindow::SpellDialogChildWindow (
vcl::Window* _pParent,
sal_uInt16 nId,
SfxBindings* pBindings,
- SfxChildWinInfo* pInfo)
- : svx::SpellDialogChildWindow (_pParent, nId, pBindings, pInfo),
+ SfxChildWinInfo* /*pInfo*/)
+ : svx::SpellDialogChildWindow (_pParent, nId, pBindings),
mpSdOutliner (nullptr),
mbOwnOutliner (false)
{
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 9ae250f5ad36..5fa5158618bf 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -782,7 +782,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
// If we have a graphic as source object, use its graphic
// content as fill style
aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
- aSet.Put(XFillBitmapItem(&mrDoc.GetPool(), pSdrGrafObj->GetGraphic()));
+ aSet.Put(XFillBitmapItem(pSdrGrafObj->GetGraphic()));
}
pPickObj->SetMergedItemSetAndBroadcast( aSet );
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 972ec47696a9..af1bafb11a81 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -164,7 +164,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
SfxItemSet aSet(mpDocSh->GetPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP);
aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
- aSet.Put(XFillBitmapItem(&mpDocSh->GetPool(), rGraphic));
+ aSet.Put(XFillBitmapItem(rGraphic));
pPickObj->SetMergedItemSetAndBroadcast(aSet);
}
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index da6ad1357d8c..da7502ebf99c 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -178,7 +178,7 @@ drawing::Direction3D GetDirection3D( const SdrCustomShapeGeometryItem& rItem, co
}
-EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCustomShape, const tools::Rectangle& /*rBoundRect*/, const double *pM )
+EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCustomShape, const double *pM )
: aCenter( pCustomShape->GetSnapRect().Center() )
, eProjectionMode( drawing::ProjectionMode_PARALLEL )
, fSkewAngle(0.0)
@@ -781,7 +781,7 @@ tools::Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* p
aMatrix.translate(aRotationCenter.DirectionX, aRotationCenter.DirectionY, aRotationCenter.DirectionZ);
aBoundVolume.transform(aMatrix);
- Transformation2D aTransformation2D( pCustomShape, rSnapRect, pMap );
+ Transformation2D aTransformation2D( pCustomShape, pMap );
if ( aTransformation2D.IsParallel() )
aBoundVolume = aTransformation2D.ApplySkewSettings( aBoundVolume );
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index 16b5ccffb2ce..8d774e3edf92 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
@@ -50,7 +50,7 @@ class EnhancedCustomShape3d
public:
- Transformation2D( const SdrObject* pCustomShape, const tools::Rectangle& rBoundRect, const double* pMap );
+ Transformation2D( const SdrObject* pCustomShape, const double* pMap );
basegfx::B3DPolygon ApplySkewSettings( const basegfx::B3DPolygon& rPolygon3D ) const;
Point Transform2D( const basegfx::B3DPoint& rPoint ) const;
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index 6fb2e1f6cff5..4e1c4eda1cc8 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -27,8 +27,7 @@ namespace svx {
SpellDialogChildWindow::SpellDialogChildWindow (
vcl::Window* _pParent,
sal_uInt16 nId,
- SfxBindings* pBindings,
- SfxChildWinInfo* /*pInfo*/)
+ SfxBindings* pBindings)
: SfxChildWindow (_pParent, nId)
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index cd52829e1bcb..51744355fa5a 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1410,7 +1410,7 @@ void FmGridControl::DeleteSelectedRows()
}
// XCurrentRecordListener
-void FmGridControl::positioned(const css::lang::EventObject& /*rEvent*/)
+void FmGridControl::positioned()
{
SAL_INFO("svx.fmcomp", "FmGridControl::positioned");
// position on the data source (force it to be done in the main thread)
@@ -1432,7 +1432,7 @@ bool FmGridControl::commit()
return true;
}
-void FmGridControl::inserted(const css::lang::EventObject& /*rEvent*/)
+void FmGridControl::inserted()
{
const DbGridRowRef& xRow = GetCurrentRow();
if (!xRow.is())
@@ -1574,7 +1574,7 @@ void FmGridControl::ColumnMoved(sal_uInt16 nId)
xColumns->insertByIndex(GetModelColumnPos(nId), aElement);
pCol->setModel(xCol);
// if the column which is shown here is selected ...
- if ( isColumnSelected(nId,pCol) )
+ if ( isColumnSelected(pCol) )
markColumn(nId); // ... -> mark it
}
@@ -1745,7 +1745,7 @@ void FmGridControl::HideColumn(sal_uInt16 nId)
m_nMarkedColumnId = (sal_uInt16)-1;
}
-bool FmGridControl::isColumnSelected(sal_uInt16 /*nId*/,DbGridColumn* _pColumn)
+bool FmGridControl::isColumnSelected(DbGridColumn* _pColumn)
{
OSL_ENSURE(_pColumn,"Column can not be null!");
bool bSelected = false;
@@ -1773,7 +1773,7 @@ void FmGridControl::ShowColumn(sal_uInt16 nId)
GetPeer()->columnVisible(pColumn);
// if the column which is shown here is selected ...
- if ( isColumnSelected(nId,pColumn) )
+ if ( isColumnSelected(pColumn) )
markColumn(nId); // ... -> mark it
}
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 1b2e19c29059..6f510bc8c9e4 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1517,11 +1517,11 @@ void FmXGridPeer::cursorMoved(const EventObject& _rEvent)
// we are not interested in move to insert row only in the resetted event
// which is fired after positioning an the insert row
if (pGrid && pGrid->IsOpen() && !::comphelper::getBOOL(Reference< XPropertySet > (_rEvent.Source, UNO_QUERY)->getPropertyValue(FM_PROP_ISNEW)))
- pGrid->positioned(_rEvent);
+ pGrid->positioned();
}
-void FmXGridPeer::rowChanged(const EventObject& _rEvent)
+void FmXGridPeer::rowChanged(const EventObject& /*_rEvent*/)
{
VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
if (pGrid && pGrid->IsOpen())
@@ -1529,7 +1529,7 @@ void FmXGridPeer::rowChanged(const EventObject& _rEvent)
if (m_xCursor->rowUpdated() && !pGrid->IsCurrentAppending())
pGrid->RowModified(pGrid->GetCurrentPos());
else if (m_xCursor->rowInserted())
- pGrid->inserted(_rEvent);
+ pGrid->inserted();
}
}
@@ -2646,7 +2646,7 @@ void FmXGridPeer::resetted(const EventObject& rEvent)
SolarMutexGuard aGuard;
VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
if (pGrid && pGrid->IsOpen())
- pGrid->positioned(rEvent);
+ pGrid->positioned();
}
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 3f56ca90b3b9..f7da0e13f846 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2960,7 +2960,7 @@ void DbFilterField::SetText(const OUString& rText)
}
// now force a repaint on the window
- m_rColumn.GetParent().RowModified(0,m_rColumn.GetId());
+ m_rColumn.GetParent().RowModified(0);
}
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index b71767efeffa..5837920e2a3d 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -166,11 +166,11 @@ GridFieldValueListener::~GridFieldValueListener()
dispose();
}
-void GridFieldValueListener::_propertyChanged(const PropertyChangeEvent& _evt)
+void GridFieldValueListener::_propertyChanged(const PropertyChangeEvent& /*_evt*/)
{
DBG_ASSERT(m_nSuspended>=0, "GridFieldValueListener::_propertyChanged : resume > suspend !");
if (m_nSuspended <= 0)
- m_rParent.FieldValueChanged(m_nId, _evt);
+ m_rParent.FieldValueChanged(m_nId);
}
void GridFieldValueListener::dispose()
@@ -200,7 +200,7 @@ public:
DisposeListenerGridBridge( DbGridControl& _rParent, const Reference< XComponent >& _rxObject);
virtual ~DisposeListenerGridBridge() override;
- virtual void disposing(const EventObject& _rEvent, sal_Int16 _nId) override { m_rParent.disposing(_nId, _rEvent); }
+ virtual void disposing(const EventObject& /*_rEvent*/, sal_Int16 _nId) override { m_rParent.disposing(_nId); }
};
DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject)
@@ -3082,7 +3082,7 @@ void DbGridControl::resetCurrentRow()
RowModified(GetCurRow()); // will update the current controller if affected
}
-void DbGridControl::RowModified( long nRow, sal_uInt16 /*nColId*/ )
+void DbGridControl::RowModified( long nRow )
{
if (nRow == m_nCurrentPos && IsEditing())
{
@@ -3573,7 +3573,7 @@ void DbGridControl::DisconnectFromFields()
m_pFieldListeners = nullptr;
}
-void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent& /*_evt*/)
+void DbGridControl::FieldValueChanged(sal_uInt16 _nId)
{
osl::MutexGuard aPreventDestruction(m_aDestructionSafety);
// needed as this may run in a thread other than the main one
@@ -3598,7 +3598,7 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent
// and finally do the update ...
pColumn->UpdateFromField(m_xCurrentRow.get(), m_xFormatter);
- RowModified(GetCurRow(), _nId);
+ RowModified(GetCurRow());
}
}
@@ -3623,7 +3623,7 @@ void DbGridControl::FieldListenerDisposing(sal_uInt16 _nId)
pListeners->erase(aPos);
}
-void DbGridControl::disposing(sal_uInt16 _nId, const EventObject& /*_rEvt*/)
+void DbGridControl::disposing(sal_uInt16 _nId)
{
if (_nId == 0)
{ // the seek cursor is being disposed
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 039be85edc82..ce711538b8df 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2785,7 +2785,7 @@ void FmXFormShell::SetDesignMode(bool bDesign)
m_pShell->m_bDesignMode = bDesign;
UpdateForms( false );
- m_pTextShell->designModeChanged( m_pShell->m_bDesignMode );
+ m_pTextShell->designModeChanged();
if (bDesign)
{
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 724a831188b8..466f25003ce0 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -1029,7 +1029,7 @@ namespace svx
}
- void FmTextControlShell::designModeChanged( bool /*_bNewDesignMode*/ )
+ void FmTextControlShell::designModeChanged()
{
m_rBindings.Invalidate( pTextControlSlots );
}
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 76c87c64f468..7ae1a8f0bb2d 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -133,7 +133,7 @@ namespace svx
/** notifies the instance that the design mode has changed
*/
- void designModeChanged( bool _bNewDesignMode );
+ void designModeChanged();
void Invalidate( SfxSlotId _nSlot );
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 7e19f32dfac4..90140dfdb894 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -1370,8 +1370,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, void)
break;
}
- SfxItemPool* pPool = nullptr;
- const XFillFloatTransparenceItem aGradientItem(pPool, aTmpGradient, bGradient);
+ const XFillFloatTransparenceItem aGradientItem(aTmpGradient, bGradient);
setFillFloatTransparence(aGradientItem);
}
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
index f05087ec039f..ca5e5139aa1a 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
@@ -135,9 +135,8 @@ void AreaTransparencyGradientPopup::ExecuteValueModify(sal_uInt8 nStartCol, sal_
mrAreaPropertyPanel.SetGradient(aTmpGradient);
- SfxItemPool* pPool = nullptr;
bool bEnable = true;
- XFillFloatTransparenceItem aGradientItem(pPool, aTmpGradient, bEnable );
+ XFillFloatTransparenceItem aGradientItem(aTmpGradient, bEnable );
mrAreaPropertyPanel.setFillFloatTransparence(aGradientItem);
}
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 5ec8863f837d..ef308e354797 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -81,7 +81,7 @@ void ParaPropertyPanel::HandleContextChange (
mpTBxVertAlign->Show();
mpTBxBackColor->Hide();
mpTBxNumBullet->Hide();
- ReSize(false);
+ ReSize();
break;
case CombinedEnumContext(Application::DrawImpress, Context::Draw):
@@ -92,7 +92,7 @@ void ParaPropertyPanel::HandleContextChange (
mpTBxVertAlign->Show();
mpTBxBackColor->Hide();
mpTBxNumBullet->Show();
- ReSize(true);
+ ReSize();
break;
case CombinedEnumContext(Application::WriterVariants, Context::Default):
@@ -100,21 +100,21 @@ void ParaPropertyPanel::HandleContextChange (
mpTBxVertAlign->Hide();
mpTBxBackColor->Show();
mpTBxNumBullet->Show();
- ReSize(true);
+ ReSize();
break;
case CombinedEnumContext(Application::WriterVariants, Context::Table):
mpTBxVertAlign->Show();
mpTBxBackColor->Show();
mpTBxNumBullet->Show();
- ReSize(true);
+ ReSize();
break;
case CombinedEnumContext(Application::WriterVariants, Context::Annotation):
mpTBxVertAlign->Hide();
mpTBxBackColor->Hide();
mpTBxNumBullet->Hide();
- ReSize(false);
+ ReSize();
break;
case CombinedEnumContext(Application::Calc, Context::EditCell):
@@ -136,7 +136,7 @@ void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent)
(void)rEvent;
}
-void ParaPropertyPanel::ReSize(bool /* bSize */)
+void ParaPropertyPanel::ReSize()
{
if (mxSidebar.is())
mxSidebar->requestLayout();
@@ -220,16 +220,16 @@ void ParaPropertyPanel::NotifyItemUpdate(
break;
case SID_ATTR_PARA_LRSPACE:
- StateChangedIndentImpl( nSID, eState, pState );
+ StateChangedIndentImpl( eState, pState );
break;
case SID_ATTR_PARA_ULSPACE:
- StateChangedULImpl( nSID, eState, pState );
+ StateChangedULImpl( eState, pState );
break;
}
}
-void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
+void ParaPropertyPanel::StateChangedIndentImpl( SfxItemState eState, const SfxPoolItem* pState )
{
switch (maContext.GetCombinedContext_DI())
{
@@ -333,7 +333,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
}
}
-void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
+void ParaPropertyPanel::StateChangedULImpl( SfxItemState eState, const SfxPoolItem* pState )
{
mpTopDist->SetMax( mpTopDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) );
mpBottomDist->SetMax( mpBottomDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) );
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 98ce983c4ed7..915ec39f1d14 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -108,11 +108,11 @@ private:
DECL_LINK(ModifyIndentHdl_Impl, Edit&, void);
DECL_LINK(ULSpaceHdl_Impl, Edit&, void);
- void StateChangedIndentImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
- void StateChangedULImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+ void StateChangedIndentImpl( SfxItemState eState, const SfxPoolItem* pState );
+ void StateChangedULImpl( SfxItemState eState, const SfxPoolItem* pState );
void initial();
- void ReSize(bool bSize);
+ void ReSize();
void InitToolBoxIndent();
void InitToolBoxSpacing();
};
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 7feb11c33959..2c4d78762e03 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -627,7 +627,7 @@ bool SdrDragView::IsInsObjPointPossible() const
return mpMarkedObj!=nullptr && mpMarkedObj->IsPolyObj();
}
-bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 /*nIdx*/, const Point& rPnt, bool bNewObj, OutputDevice* pOut)
+bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, const Point& rPnt, bool bNewObj, OutputDevice* pOut)
{
bool bRet(false);
@@ -694,13 +694,12 @@ bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
{
if(IsInsObjPoint())
{
- sal_uInt32 nNextPnt(mnInsPointNum);
Point aPnt(maDragStat.GetNow());
bool bOk=EndDragObj();
if (bOk && eCmd!=SdrCreateCmd::ForceEnd)
{
// Ret=True means: Action is over.
- bOk=!(ImpBegInsObjPoint(true, nNextPnt, aPnt, eCmd == SdrCreateCmd::NextObject, mpDragWin));
+ bOk = ! ImpBegInsObjPoint(true, aPnt, eCmd == SdrCreateCmd::NextObject, mpDragWin);
}
return bOk;
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index d0d6be8d9dd5..104e0bb47892 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1150,7 +1150,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct )
SetAttributes(pPath);
aHatchAttr.Put(XFillStyleItem(drawing::FillStyle_HATCH));
- aHatchAttr.Put(XFillHatchItem(&mpModel->GetItemPool(), XHatch(rHatch.GetColor(), eStyle, rHatch.GetDistance(), rHatch.GetAngle())));
+ aHatchAttr.Put(XFillHatchItem(XHatch(rHatch.GetColor(), eStyle, rHatch.GetDistance(), rHatch.GetAngle())));
pPath->SetMergedItemSet(aHatchAttr);
InsertObj(pPath, false);
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 0925ee583a62..f612e2e6304c 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -337,7 +337,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
{
XHatch aHatch(static_cast<const XFillHatchItem&>(rOriginalSet.Get(XATTR_FILLHATCH)).GetHatchValue());
aHatch.SetColor(aShadowColor);
- aTempSet.Put(XFillHatchItem(aTempSet.GetPool(), aHatch));
+ aTempSet.Put(XFillHatchItem(aHatch));
aTempSet.Put(XFillTransparenceItem(nShadowTransparence));
}
@@ -395,7 +395,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
}
}
- aTempSet.Put(XFillBitmapItem(aTempSet.GetPool(), aGraphicObject));
+ aTempSet.Put(XFillBitmapItem(aGraphicObject));
aTempSet.Put(XFillTransparenceItem(nShadowTransparence));
}
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 5568347090a5..cff5b03aae4c 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -186,7 +186,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
if( bLoad )
{
- bRet = LoadText( pData->aFileName, pData->aFilterName, pData->eCharSet );
+ bRet = LoadText( pData->aFileName, pData->eCharSet );
}
pData->aFileDate0 = aFileDT;
@@ -196,7 +196,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
return bRet;
}
-bool SdrTextObj::LoadText(const OUString& rFileName, const OUString& /*rFilterName*/, rtl_TextEncoding eCharSet)
+bool SdrTextObj::LoadText(const OUString& rFileName, rtl_TextEncoding eCharSet)
{
INetURLObject aFileURL( rFileName );
bool bRet = false;
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 85f5c4648ebf..b24b96f7222b 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -978,7 +978,7 @@ bool SdrPaintView::IsGroupEntered() const
return false;
}
-void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool /*bReplaceAll*/)
+void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr)
{
// bReplaceAll has no effect here at all.
bool bMeasure= dynamic_cast<const SdrView*>(this) != nullptr && static_cast<SdrView*>(this)->IsMeasureTool();
@@ -997,7 +997,7 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool /*bRep
}
}
-void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool /*bOnlyHardAttr*/) const
+void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr) const
{
// bOnlyHardAttr has no effect here at all.
bool bMeasure= dynamic_cast<const SdrView*>(this) != nullptr && static_cast<const SdrView*>(this)->IsMeasureTool();
@@ -1033,7 +1033,7 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll)
#endif
if (bReplaceAll) maDefaultAttr.Set(rAttr);
else maDefaultAttr.Put(rAttr,false); // if FALSE, regard InvalidItems as "holes," not as Default
- SetNotPersistDefaultAttr(rAttr,bReplaceAll);
+ SetNotPersistDefaultAttr(rAttr);
#ifdef DBG_UTIL
if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
@@ -1074,7 +1074,7 @@ bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) con
rTargetSet.Put(mpDefaultStyleSheet->GetItemSet(), false);
rTargetSet.Put(maDefaultAttr, false);
}
- MergeNotPersistDefaultAttr(rTargetSet, bOnlyHardAttr);
+ MergeNotPersistDefaultAttr(rTargetSet);
return true;
}
@@ -1217,20 +1217,17 @@ void SdrPaintView::VisAreaChanged(const OutputDevice* pOut)
if(pWindow)
{
- VisAreaChanged(*pWindow);
+ VisAreaChanged();
}
}
else
{
- for(sal_uInt32 a(0L); a < mpPageView->PageWindowCount(); a++)
- {
- VisAreaChanged(*mpPageView->GetPageWindow(a));
- }
+ VisAreaChanged();
}
}
}
-void SdrPaintView::VisAreaChanged(const SdrPageWindow& /*rWindow*/)
+void SdrPaintView::VisAreaChanged()
{
// notify SfxListener
Broadcast(SvxViewChangedHint());
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 1e44e1f23e09..4c51d4149465 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -201,7 +201,7 @@ public:
std::vector<std::unique_ptr<SdrUndoAction>> maUndos;
bool mbSkipChangeLayout;
- void SetModel(SdrModel* pOldModel, SdrModel* pNewModel);
+ void SetModel(SdrModel* pNewModel);
CellRef getCell( const CellPos& rPos ) const;
void LayoutTable( tools::Rectangle& rArea, bool bFitWidth, bool bFitHeight );
@@ -323,7 +323,7 @@ SdrTableObjImpl& SdrTableObjImpl::operator=( const SdrTableObjImpl& rSource )
}
-void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel)
+void SdrTableObjImpl::SetModel(SdrModel* pNewModel)
{
// try to find new table style
disconnectTableStyle();
@@ -1369,7 +1369,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel)
if( mpImpl.is() )
{
- mpImpl->SetModel( pOldModel, pNewModel );
+ mpImpl->SetModel( pNewModel );
if( !maLogicRect.IsEmpty() )
{
@@ -1381,14 +1381,14 @@ void SdrTableObj::SetModel(SdrModel* pNewModel)
}
-void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect, bool bLineWidth ) const
+void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const
{
if( mpImpl.is() )
- TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
+ TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect );
}
-void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const
+void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect ) const
{
if( !mpImpl.is())
return;
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index c21432de3cb8..47ca6dbcd5ad 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -237,7 +237,7 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWindow
}
}
- TblAction nAction = getKeyboardAction(rKEvt, pWindow);
+ TblAction nAction = getKeyboardAction(rKEvt);
return executeAction( nAction, rKEvt.GetKeyCode().IsShift(), pWindow );
}
@@ -1447,7 +1447,7 @@ bool SvxTableController::checkTableObject()
}
-SvxTableController::TblAction SvxTableController::getKeyboardAction(const KeyEvent& rKEvt, vcl::Window* /*pWindow*/)
+SvxTableController::TblAction SvxTableController::getKeyboardAction(const KeyEvent& rKEvt)
{
const bool bMod1 = rKEvt.GetKeyCode().IsMod1(); // ctrl
const bool bMod2 = rKEvt.GetKeyCode().IsMod2(); // Alt
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index ec20d84df027..3c9d23c959c4 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -68,7 +68,7 @@ namespace svx
const int nColCount = 4;
const int nLineCount = 4;
-FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pParent, sal_uInt16 /*nSID*/ ) :
+FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pParent ) :
ModalDialog(pParent, "FontworkGalleryDialog", "svx/ui/fontworkgallerydialog.ui" ),
mnThemeId ( 0xffff ),
mpSdrView ( pSdrView ),
@@ -422,7 +422,7 @@ private:
DECL_LINK( SelectHdl, ToolbarMenu*, void );
void implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
- void implSetKernCharacterPairs( bool bKernOnOff, bool bEnabled );
+ void implSetKernCharacterPairs( bool bEnabled );
};
@@ -474,7 +474,7 @@ void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact
}
-void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool, bool bEnabled )
+void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool bEnabled )
{
enableEntry( 6, bEnabled );
checkEntry( 6, bEnabled );
@@ -500,13 +500,13 @@ void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureSta
{
if( !Event.IsEnabled )
{
- implSetKernCharacterPairs( false, false );
+ implSetKernCharacterPairs( false );
}
else
{
bool bValue = false;
if( Event.State >>= bValue )
- implSetKernCharacterPairs( bValue, true );
+ implSetKernCharacterPairs( true );
}
}
}
@@ -544,7 +544,7 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void)
mrController.dispatchCommand( msFontworkKernCharacterPairs, aArgs );
- implSetKernCharacterPairs( true, true );
+ implSetKernCharacterPairs( true );
}
else if( nSelection >= 0 )
{
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index fbcd1003de73..ec473f4b5e9e 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -424,7 +424,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
{
case SID_FONTWORK_GALLERY_FLOATER:
{
- ScopedVclPtrInstance< FontWorkGalleryDialog > aDlg( pSdrView, ImpGetViewWin(pSdrView), nSID );
+ ScopedVclPtrInstance< FontWorkGalleryDialog > aDlg( pSdrView, ImpGetViewWin(pSdrView) );
aDlg->Execute();
}
break;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 2b9126ca8746..eb8afb7d5532 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -680,7 +680,7 @@ XLineDashItem::XLineDashItem(SvStream& rIn) :
}
}
-XLineDashItem::XLineDashItem(SfxItemPool* /*pPool*/, const XDash& rTheDash)
+XLineDashItem::XLineDashItem(const XDash& rTheDash)
: NameOrIndex( XATTR_LINEDASH, -1 ),
aDash(rTheDash)
{
@@ -1249,7 +1249,7 @@ XLineStartItem::XLineStartItem(SvStream& rIn) :
}
}
-XLineStartItem::XLineStartItem(SfxItemPool* /*pPool*/, const basegfx::B2DPolyPolygon& rPolyPolygon)
+XLineStartItem::XLineStartItem(const basegfx::B2DPolyPolygon& rPolyPolygon)
: NameOrIndex( XATTR_LINESTART, -1 ),
maPolyPolygon(rPolyPolygon)
{
@@ -1592,7 +1592,7 @@ XLineEndItem::XLineEndItem(SvStream& rIn) :
}
}
-XLineEndItem::XLineEndItem(SfxItemPool* /*pPool*/, const basegfx::B2DPolyPolygon& rPolyPolygon)
+XLineEndItem::XLineEndItem(const basegfx::B2DPolyPolygon& rPolyPolygon)
: NameOrIndex( XATTR_LINEEND, -1 ),
maPolyPolygon(rPolyPolygon)
{
@@ -2768,7 +2768,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, bool bEnable )
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XGradient& rTheGradient, bool bEnable )
: XFillGradientItem ( -1, rTheGradient ),
bEnabled ( bEnable )
{
@@ -2910,7 +2910,7 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
}
}
-XFillHatchItem::XFillHatchItem(SfxItemPool* /*pPool*/, const XHatch& rTheHatch)
+XFillHatchItem::XFillHatchItem(const XHatch& rTheHatch)
: NameOrIndex( XATTR_FILLHATCH, -1 ),
aHatch(rTheHatch)
{
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 519a10a40963..a1dc1b56685c 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -271,7 +271,7 @@ XFillBitmapItem::XFillBitmapItem(SvStream& rIn, sal_uInt16 nVer)
}
}
-XFillBitmapItem::XFillBitmapItem(SfxItemPool* /*pPool*/, const GraphicObject& rGraphicObject)
+XFillBitmapItem::XFillBitmapItem(const GraphicObject& rGraphicObject)
: NameOrIndex( XATTR_FILLBITMAP, -1),
maGraphicObject(rGraphicObject)
{
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index d1dc85aed859..ff064151105b 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -60,11 +60,11 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster, bool bLoadRefCounts)
// prepare PoolDefaults
std::vector<SfxPoolItem*>& rPoolDefaults = *mpLocalPoolDefaults;
rPoolDefaults[XATTR_LINESTYLE -XATTR_START] = new XLineStyleItem;
- rPoolDefaults[XATTR_LINEDASH -XATTR_START] = new XLineDashItem(this,aNullDash);
+ rPoolDefaults[XATTR_LINEDASH -XATTR_START] = new XLineDashItem(aNullDash);
rPoolDefaults[XATTR_LINEWIDTH -XATTR_START] = new XLineWidthItem;
rPoolDefaults[XATTR_LINECOLOR -XATTR_START] = new XLineColorItem(aNullStr,aNullLineCol);
- rPoolDefaults[XATTR_LINESTART -XATTR_START] = new XLineStartItem(this,aNullPol);
- rPoolDefaults[XATTR_LINEEND -XATTR_START] = new XLineEndItem (this,aNullPol);
+ rPoolDefaults[XATTR_LINESTART -XATTR_START] = new XLineStartItem(aNullPol);
+ rPoolDefaults[XATTR_LINEEND -XATTR_START] = new XLineEndItem (aNullPol);
rPoolDefaults[XATTR_LINESTARTWIDTH -XATTR_START] = new XLineStartWidthItem;
rPoolDefaults[XATTR_LINEENDWIDTH -XATTR_START] = new XLineEndWidthItem;
rPoolDefaults[XATTR_LINESTARTCENTER -XATTR_START] = new XLineStartCenterItem;
@@ -75,8 +75,8 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster, bool bLoadRefCounts)
rPoolDefaults[XATTR_FILLSTYLE -XATTR_START] = new XFillStyleItem;
rPoolDefaults[XATTR_FILLCOLOR -XATTR_START] = new XFillColorItem (aNullStr,aNullFillCol);
rPoolDefaults[XATTR_FILLGRADIENT -XATTR_START] = new XFillGradientItem(aNullGrad);
- rPoolDefaults[XATTR_FILLHATCH -XATTR_START] = new XFillHatchItem (this,aNullHatch);
- rPoolDefaults[XATTR_FILLBITMAP -XATTR_START] = new XFillBitmapItem (this, aNullGraphic);
+ rPoolDefaults[XATTR_FILLHATCH -XATTR_START] = new XFillHatchItem (aNullHatch);
+ rPoolDefaults[XATTR_FILLBITMAP -XATTR_START] = new XFillBitmapItem (aNullGraphic);
rPoolDefaults[XATTR_FILLTRANSPARENCE -XATTR_START] = new XFillTransparenceItem;
rPoolDefaults[XATTR_GRADIENTSTEPCOUNT -XATTR_START] = new XGradientStepCountItem;
rPoolDefaults[XATTR_FILLBMP_TILE -XATTR_START] = new XFillBmpTileItem;
@@ -89,7 +89,7 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster, bool bLoadRefCounts)
rPoolDefaults[XATTR_FILLBMP_STRETCH -XATTR_START] = new XFillBmpStretchItem;
rPoolDefaults[XATTR_FILLBMP_POSOFFSETX -XATTR_START] = new XFillBmpPosOffsetXItem;
rPoolDefaults[XATTR_FILLBMP_POSOFFSETY -XATTR_START] = new XFillBmpPosOffsetYItem;
- rPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, false );
+ rPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( aNullGrad, false );
rPoolDefaults[XATTR_SECONDARYFILLCOLOR -XATTR_START] = new XSecondaryFillColorItem(aNullStr, aNullFillCol);
rPoolDefaults[XATTR_FILLBACKGROUND -XATTR_START] = new XFillBackgroundItem;
rPoolDefaults[XATTR_FORMTXTSTYLE -XATTR_START] = new XFormTextStyleItem;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 7115af7c8686..850a38942d27 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -417,7 +417,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
const Color aNullCol(COL_DEFAULT_SHAPE_STROKE);
const XHatch aNullHatch(aNullCol);
- XFillHatchItem aXFillHatchItem(rToSet.GetPool(), aNullHatch);
+ XFillHatchItem aXFillHatchItem(aNullHatch);
aXFillHatchItem.PutValue(*pXFillHatchItem, MID_FILLHATCH);
rToSet.Put(aXFillHatchItem);
@@ -441,7 +441,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
if(pXFillBitmapItem)
{
const Graphic aNullGraphic;
- XFillBitmapItem aXFillBitmapItem(rToSet.GetPool(), aNullGraphic);
+ XFillBitmapItem aXFillBitmapItem(aNullGraphic);
aXFillBitmapItem.PutValue(*pXFillBitmapItem, MID_BITMAP);
rToSet.Put(aXFillBitmapItem);
@@ -462,7 +462,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
if(pXFillBitmapURLItem)
{
const Graphic aNullGraphic;
- XFillBitmapItem aXFillBitmapItem(rToSet.GetPool(), aNullGraphic);
+ XFillBitmapItem aXFillBitmapItem(aNullGraphic);
aXFillBitmapItem.PutValue(*pXFillBitmapURLItem, MID_GRAFURL);
rToSet.Put(aXFillBitmapItem);
@@ -533,7 +533,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
if(pXFillFloatTransparenceItem)
{
const XGradient aNullGrad(RGB_Color(COL_BLACK), RGB_Color(COL_WHITE));
- XFillFloatTransparenceItem aXFillFloatTransparenceItem(rToSet.GetPool(), aNullGrad, false);
+ XFillFloatTransparenceItem aXFillFloatTransparenceItem(aNullGrad, false);
aXFillFloatTransparenceItem.PutValue(*pXFillFloatTransparenceItem, MID_FILLGRADIENT);
rToSet.Put(aXFillFloatTransparenceItem);
@@ -1873,7 +1873,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any&
case XATTR_FILLBITMAP:
{
const Graphic aNullGraphic;
- XFillBitmapItem aXFillBitmapItem(aSet.GetPool(), aNullGraphic);
+ XFillBitmapItem aXFillBitmapItem(aNullGraphic);
aXFillBitmapItem.PutValue(aValue, nMemberId);
aSet.Put(aXFillBitmapItem);
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 60c8d64d11c8..a8a1cd70b735 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1609,7 +1609,7 @@ void SwXStyle::SetPropertyValue<XATTR_FILLGRADIENT>(const SfxItemPropertySimpleE
// Bitmap also has the MID_GRAFURL mode where a Bitmap URL is used
const Graphic aNullGraphic;
SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet();
- XFillBitmapItem aXFillBitmapItem(rStyleSet.GetPool(), aNullGraphic);
+ XFillBitmapItem aXFillBitmapItem(aNullGraphic);
aXFillBitmapItem.PutValue(aValue, nMemberId);
rStyleSet.Put(aXFillBitmapItem);
}
@@ -3594,7 +3594,7 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
{
// Bitmap also has the MID_GRAFURL mode where a Bitmap URL is used
const Graphic aNullGraphic;
- XFillBitmapItem aXFillBitmapItem(aSet.GetPool(), aNullGraphic);
+ XFillBitmapItem aXFillBitmapItem(aNullGraphic);
aXFillBitmapItem.PutValue(aValue, nMemberId);
aSet.Put(aXFillBitmapItem);
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index d6b57f01d282..7221ba49a545 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -151,9 +151,9 @@ SwSpellDialogChildWindow::SwSpellDialogChildWindow (
vcl::Window* _pParent,
sal_uInt16 nId,
SfxBindings* pBindings,
- SfxChildWinInfo* pInfo)
+ SfxChildWinInfo* /*pInfo*/)
: svx::SpellDialogChildWindow (
- _pParent, nId, pBindings, pInfo)
+ _pParent, nId, pBindings)
, m_bIsGrammarCheckingOn(false)
, m_pSpellState(new SpellState)
{
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 4b4b62e9567e..67a827b1f231 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -156,7 +156,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
if ( pSdrView )
{
SdrObject* pObj = nullptr;
- ScopedVclPtrInstance< svx::FontWorkGalleryDialog > aDlg( pSdrView, pWin, nSlotId );
+ ScopedVclPtrInstance< svx::FontWorkGalleryDialog > aDlg( pSdrView, pWin );
aDlg->SetSdrObjectRef( &pObj, pSdrView->GetModel() );
aDlg->Execute();
if ( pObj )
More information about the Libreoffice-commits
mailing list