[Libreoffice-commits] core.git: cui/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu May 17 10:15:21 UTC 2018
cui/source/customize/cfg.cxx | 2 +-
cui/source/dialogs/colorpicker.cxx | 6 ++----
cui/source/dialogs/cuigaldlg.cxx | 5 ++---
cui/source/dialogs/insrc.cxx | 7 ++-----
cui/source/dialogs/linkdlg.cxx | 3 +--
cui/source/dialogs/screenshotannotationdlg.cxx | 10 ++++------
cui/source/inc/bbdlg.hxx | 1 -
cui/source/inc/cfg.hxx | 1 -
cui/source/inc/cuigaldlg.hxx | 1 -
cui/source/inc/cuitabarea.hxx | 5 -----
cui/source/inc/cuitabline.hxx | 3 ---
cui/source/inc/dbregister.hxx | 3 ---
cui/source/inc/insrc.hxx | 5 -----
cui/source/inc/labdlg.hxx | 1 -
cui/source/inc/linkdlg.hxx | 1 -
cui/source/options/dbregister.cxx | 6 ++----
cui/source/options/doclinkdialog.cxx | 3 +--
cui/source/options/doclinkdialog.hxx | 2 --
cui/source/tabpages/bbdlg.cxx | 3 +--
cui/source/tabpages/labdlg.cxx | 9 +++++----
cui/source/tabpages/tpbitmap.cxx | 3 +--
cui/source/tabpages/tpcolor.cxx | 3 +--
cui/source/tabpages/tpgradnt.cxx | 5 +----
cui/source/tabpages/tphatch.cxx | 5 +----
cui/source/tabpages/tplnedef.cxx | 6 ++----
cui/source/tabpages/tplneend.cxx | 3 +--
cui/source/tabpages/tppattern.cxx | 3 +--
27 files changed, 29 insertions(+), 76 deletions(-)
New commits:
commit ea955e2f2bfcf05c276b7f7598c7136c732a8542
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed May 16 16:51:14 2018 +0200
loplugin:unusedfields in cui
Change-Id: If92e31342f587b5e0e9fc7efd85fdcb48f3043c7
Reviewed-on: https://gerrit.libreoffice.org/54457
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 2a377bea5183..250c2a3f0e90 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2854,7 +2854,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
get(pBtnImport, "importButton");
get(pBtnDelete, "deleteButton");
- aTbSize = pTbSymbol->LogicToPixel(Size(160, 80), MapMode(MapUnit::MapAppFont));
+ Size aTbSize = pTbSymbol->LogicToPixel(Size(160, 80), MapMode(MapUnit::MapAppFont));
pTbSymbol->set_width_request(aTbSize.Width());
pTbSymbol->set_height_request(aTbSize.Height());
pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL);
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 7c64bb23a136..0106a3acdf70 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -776,7 +776,6 @@ public:
void setColorComponent(ColorComponent nComp, double dValue);
private:
- sal_Int16 mnDialogMode;
ColorMode meMode;
double mdRed, mdGreen, mdBlue;
@@ -784,7 +783,7 @@ private:
double mdCyan, mdMagenta, mdYellow, mdKey;
};
-ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_Int16 nMode)
+ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_Int16 nDialogMode)
: GenericDialogController(pParent, "cui/ui/colorpickerdialog.ui", "ColorPicker")
, m_xColorField(new ColorFieldControl(m_xBuilder->weld_drawing_area("colorField")))
, m_xColorSlider(new ColorSliderControl(m_xBuilder->weld_drawing_area("colorSlider")))
@@ -809,7 +808,6 @@ ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_In
, m_xMFMagenta(m_xBuilder->weld_metric_spin_button("magSpinbutton", FUNIT_PERCENT))
, m_xMFYellow(m_xBuilder->weld_metric_spin_button("yellowSpinbutton", FUNIT_PERCENT))
, m_xMFKey(m_xBuilder->weld_metric_spin_button("keySpinbutton", FUNIT_PERCENT))
- , mnDialogMode( nMode )
, meMode( DefaultMode )
{
m_xColorField->SetModifyHdl( LINK( this, ColorPickerDialog, ColorFieldControlModifydl ) );
@@ -847,7 +845,7 @@ ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_In
Color aColor(nColor);
// modify
- if (mnDialogMode == 2)
+ if (nDialogMode == 2)
{
m_xColorPrevious->SetColor(aColor);
m_xColorPrevious->show();
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 6729b7fcd912..90c8d01a0b0d 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -558,13 +558,12 @@ GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent,
"cui/ui/gallerythemedialog.ui", pItemSet)
, pData(_pData)
, m_nGeneralPageId(0)
- , m_nFilesPageId(0)
{
m_nGeneralPageId = AddTabPage("general", TPGalleryThemeGeneral::Create, nullptr);
- m_nFilesPageId = AddTabPage("files", TPGalleryThemeProperties::Create, nullptr);
+ sal_uInt16 nFilesPageId = AddTabPage("files", TPGalleryThemeProperties::Create, nullptr);
if( pData->pTheme->IsReadOnly() )
- RemoveTabPage(m_nFilesPageId);
+ RemoveTabPage(nFilesPageId);
OUString aText = GetText() + pData->pTheme->GetName();
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 9e29733e7486..5cecafd62c82 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -33,16 +33,13 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
return m_xCountEdit->get_value();
}
-SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId)
+SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bColumn, const OString& rHelpId)
: GenericDialogController(pParent, "cui/ui/insertrowcolumn.ui", "InsertRowColumnDialog")
, m_xCountEdit(m_xBuilder->weld_spin_button("insert_number"))
, m_xBeforeBtn(m_xBuilder->weld_radio_button("insert_before"))
, m_xAfterBtn(m_xBuilder->weld_radio_button("insert_after"))
- , aRow(CuiResId(RID_SVXSTR_ROW))
- , aCol(CuiResId(RID_SVXSTR_COL))
- , bColumn(bCol)
{
- m_xDialog->set_title(bColumn ? aCol : aRow);
+ m_xDialog->set_title(bColumn ? CuiResId(RID_SVXSTR_COL) : CuiResId(RID_SVXSTR_ROW));
m_xDialog->set_help_id(rHelpId);
}
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 261de3cf79cf..dfa899f3feb3 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -84,7 +84,7 @@ static long nTabs[] =
};
-SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool bHtml )
+SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool bHtmlMode )
: ModalDialog( pParent, "BaseLinksDialog", "cui/ui/baselinksdialog.ui"),
aStrAutolink( CuiResId( STR_AUTOLINK ) ),
aStrManuallink( CuiResId( STR_MANUALLINK ) ),
@@ -93,7 +93,6 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b
aStrCloselinkmsgMulti( CuiResId( STR_CLOSELINKMSG_MULTI ) ),
aStrWaitinglink( CuiResId( STR_WAITINGLINK ) ),
pLinkMgr( nullptr ),
- bHtmlMode(bHtml),
aUpdateIdle("cui SvBaseLinksDlg UpdateIdle")
{
get(m_pTbLinks, "TB_LINKS");
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 5fe3ed3596d9..a1e7cc404c49 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -158,7 +158,6 @@ private:
Point GetOffsetInPicture() const;
// local variables
- ScreenshotAnnotationDlg& mrParent;
Dialog& mrParentDialog;
Bitmap maParentDialogBitmap;
Bitmap maDimmedDialogBitmap;
@@ -193,8 +192,7 @@ OUString ScreenshotAnnotationDlg_Impl::maLastFolderURL = OUString();
ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
ScreenshotAnnotationDlg& rParent,
Dialog& rParentDialog)
-: mrParent(rParent),
- mrParentDialog(rParentDialog),
+: mrParentDialog(rParentDialog),
maParentDialogBitmap(rParentDialog.createScreenshot()),
maDimmedDialogBitmap(maParentDialogBitmap),
maParentDialogSize(maParentDialogBitmap.GetSizePixel()),
@@ -213,11 +211,11 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
assert(0 != maParentDialogBitmap.GetSizePixel().Height());
// get needed widgets
- mrParent.get(mpPicture, "picture");
+ rParent.get(mpPicture, "picture");
assert(mpPicture.get());
- mrParent.get(mpText, "text");
+ rParent.get(mpText, "text");
assert(mpText.get());
- mrParent.get(mpSave, "save");
+ rParent.get(mpSave, "save");
assert(mpSave.get());
// set screenshot image at FixedImage, resize, set event listener
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index 1a3a2afa3da6..7176890b1c4f 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -37,7 +37,6 @@ protected:
private:
bool mbEnableBackgroundSelector : 1; ///< for Border/Background
- bool mbEnableDrawingLayerFillStyles : 1; ///< for full DrawingLayer FillStyles
sal_uInt16 m_nBackgroundPageId;
sal_uInt16 m_nAreaPageId;
sal_uInt16 m_nTransparencePageId;
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 686749a217dc..5438f48a625e 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -595,7 +595,6 @@ private:
VclPtr<FixedText> pFtNote;
VclPtr<PushButton> pBtnImport;
VclPtr<PushButton> pBtnDelete;
- Size aTbSize;
sal_uInt16 m_nNextId;
sal_Int32 m_nExpectedSize;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index a2089ed6ee53..0d84f4abacff 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -197,7 +197,6 @@ class GalleryThemeProperties : public SfxTabDialog
ExchangeData* pData;
sal_uInt16 m_nGeneralPageId;
- sal_uInt16 m_nFilesPageId;
virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) override;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 2790b5323888..da368bf460e0 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -378,7 +378,6 @@ private:
ChangeType* m_pnGradientListState;
ChangeType* m_pnColorListState;
- XFillGradientItem m_aXGradientItem;
XFillAttrSetItem m_aXFillAttr;
SfxItemSet& m_rXFSet;
@@ -447,7 +446,6 @@ private:
ChangeType* m_pnHatchingListState;
ChangeType* m_pnColorListState;
- XFillHatchItem m_aXHatchItem;
XFillAttrSetItem m_aXFillAttr;
SfxItemSet& m_rXFSet;
@@ -526,7 +524,6 @@ private:
XBitmapListRef m_pBitmapList;
ChangeType* m_pnBitmapListState;
- XFillBitmapItem m_aXBitmapItem;
double m_fObjectWidth;
double m_fObjectHeight;
@@ -600,7 +597,6 @@ private:
ChangeType* m_pnPatternListState;
ChangeType* m_pnColorListState;
- XFillBitmapItem m_aXPatternItem;
XFillAttrSetItem m_aXFillAttr;
SfxItemSet& m_rXFSet;
@@ -696,7 +692,6 @@ private:
ChangeType* pnColorListState;
- XFillColorItem aXFillColorItem;
XFillAttrSetItem aXFillAttr;
SfxItemSet& rXFSet;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 89c5ec790bb8..9f2ccc13ae4e 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -260,8 +260,6 @@ private:
const SfxItemSet& rOutAttrs;
XDash aDash;
- XLineDashItem aXDash;
- XLineColorItem aXColor;
XLineAttrSetItem aXLineAttr;
SfxItemSet& rXLSet;
@@ -339,7 +337,6 @@ private:
const SfxItemSet& rOutAttrs;
const SdrObject* pPolyObj;
- XLineColorItem aXColor;
XLineAttrSetItem aXLineAttr;
SfxItemSet& rXLSet;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 8204dec674ae..b880f38e332d 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -38,9 +38,6 @@ namespace svx
class DbRegistrationOptionsPage : public SfxTabPage
{
private:
- OUString m_aTypeText;
- OUString m_aPathText;
-
VclPtr<SvSimpleTableContainer> m_pPathCtrl;
VclPtr<PushButton> m_pNew;
VclPtr<PushButton> m_pEdit;
diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index aed5617d8065..b712c080ca9a 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -31,11 +31,6 @@ private:
std::unique_ptr<weld::RadioButton> m_xBeforeBtn;
std::unique_ptr<weld::RadioButton> m_xAfterBtn;
- OUString aRow;
- OUString aCol;
-
- bool bColumn;
-
public:
SvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId);
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 631b662b7206..42fbc5faaa3e 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -54,7 +54,6 @@ private:
std::vector<OUString> m_aStrHorzList;
std::vector<OUString> m_aStrVertList;
- std::vector<OUString> m_aLineTypes;
SdrCaptionType nCaptionType;
sal_Int32 nGap;
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 3db4f16401eb..d9ca0bc67db4 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -61,7 +61,6 @@ class SvBaseLinksDlg : public ModalDialog
OUString aStrCloselinkmsgMulti;
OUString aStrWaitinglink;
sfx2::LinkManager* pLinkMgr;
- bool bHtmlMode;
Idle aUpdateIdle;
DECL_LINK( LinksSelectHdl, SvTreeListBox*, void );
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index fb9c836b2d87..40ec9d950f87 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -100,8 +100,6 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
SfxTabPage( pParent, "DbRegisterPage", "cui/ui/dbregisterpage.ui", &rSet ),
- m_aTypeText ( CuiResId( RID_SVXSTR_TYPE ) ),
- m_aPathText ( CuiResId( RID_SVXSTR_PATH ) ),
m_pPathBox ( nullptr ),
m_pCurEntry ( nullptr ),
m_nOldCount ( 0 ),
@@ -132,11 +130,11 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
rBar.SetEndDragHdl( LINK( this, DbRegistrationOptionsPage, HeaderEndDrag_Impl ) );
Size aSz;
aSz.setWidth( TAB_WIDTH1 );
- rBar.InsertItem( ITEMID_TYPE, m_aTypeText,
+ rBar.InsertItem( ITEMID_TYPE, CuiResId( RID_SVXSTR_TYPE ),
LogicToPixel( aSz, MapMode( MapUnit::MapAppFont ) ).Width(),
HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW );
aSz.setWidth( TAB_WIDTH2 );
- rBar.InsertItem( ITEMID_PATH, m_aPathText,
+ rBar.InsertItem( ITEMID_PATH, CuiResId( RID_SVXSTR_PATH ),
LogicToPixel( aSz, MapMode( MapUnit::MapAppFont ) ).Width(),
HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER );
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 2da00f389325..201cb18c7549 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -43,14 +43,13 @@ namespace svx
ODocumentLinkDialog::ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew )
: ModalDialog(_pParent, "DatabaseLinkDialog",
"cui/ui/databaselinkdialog.ui")
- ,m_bCreatingNew(_bCreateNew)
{
get(m_pURL, "url");
get(m_pOK, "ok");
get(m_pName, "name");
get(m_pBrowseFile, "browse");
- if (!m_bCreatingNew)
+ if (!_bCreateNew)
SetText(get<FixedText>("alttitle")->GetText());
m_pURL->SetFilter("*.odb");
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 435bc286efc7..96a0577020e9 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -40,8 +40,6 @@ namespace svx
VclPtr<Edit> m_pName;
VclPtr<OKButton> m_pOK;
- bool m_bCreatingNew;
-
Link<const OUString&,bool> m_aNameValidator;
public:
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index 0f2a229093c7..034a43132b83 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -36,13 +36,12 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(vcl::Window *pParent,
: OUString("cui/ui/borderbackgrounddialog.ui"),
&rCoreSet)
, mbEnableBackgroundSelector(bEnableSelector)
- , mbEnableDrawingLayerFillStyles(bEnableDrawingLayerFillStyles)
, m_nBackgroundPageId(0)
, m_nAreaPageId(0)
, m_nTransparencePageId(0)
{
AddTabPage("borders", SvxBorderTabPage::Create, nullptr );
- if (mbEnableDrawingLayerFillStyles)
+ if (bEnableDrawingLayerFillStyles)
{
// Here we want full DrawingLayer FillStyle access, so add Area and Transparency TabPages
m_nAreaPageId = AddTabPage("area", SvxAreaTabPage::Create, nullptr);
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 796b2976df8f..efaa03fbbe20 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -105,8 +105,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rIn
ListBox *pLineTypes = get<ListBox>("linetypes");
assert(pLineTypes->GetEntryCount() == 3);
+ std::vector<OUString> aLineTypes;
for (int i = 0; i < 3; ++i)
- m_aLineTypes.push_back(pLineTypes->GetEntry(i));
+ aLineTypes.push_back(pLineTypes->GetEntry(i));
get(m_pFT_LAENGE, "lengthft");
get(m_pMF_LAENGE, "length");
@@ -125,9 +126,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rIn
m_pCT_CAPTTYPE->SetSelectHdl(LINK( this, SvxCaptionTabPage, SelectCaptTypeHdl_Impl));
Image aImage;
- m_pCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_1, aImage, m_aLineTypes[0]);
- m_pCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_2, aImage, m_aLineTypes[1]);
- m_pCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_3, aImage, m_aLineTypes[2]);
+ m_pCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_1, aImage, aLineTypes[0]);
+ m_pCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_2, aImage, aLineTypes[1]);
+ m_pCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_3, aImage, aLineTypes[2]);
FillValueSet();
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 75ddd68ce72f..52ca43fb6892 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -77,7 +77,6 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInA
m_pBitmapList( nullptr ),
m_pnBitmapListState( nullptr ),
- m_aXBitmapItem( OUString(), Graphic() ),
m_fObjectWidth(0.0),
m_fObjectHeight(0.0),
m_bLogicalSize(false),
@@ -104,7 +103,7 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInA
// setting the output device
m_rXFSet.Put( XFillStyleItem(drawing::FillStyle_BITMAP) );
- m_rXFSet.Put( m_aXBitmapItem );
+ m_rXFSet.Put( XFillBitmapItem(OUString(), Graphic()) );
m_pCtlBitmapPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
m_pBitmapLB->SetSelectHdl( LINK(this, SvxBitmapTabPage, ModifyBitmapHdl) );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 0e709f09e0f4..f73359468cbe 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -59,7 +59,6 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
, rOutAttrs ( rInAttrs )
// All the horrific pointers we store and should not
, pnColorListState( nullptr )
- , aXFillColorItem( OUString(), COL_BLACK )
, aXFillAttr( rInAttrs.GetPool() )
, rXFSet( aXFillAttr.GetItemSet() )
, eCM( ColorModel::RGB )
@@ -109,7 +108,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
// setting the output device
rXFSet.Put( XFillStyleItem(drawing::FillStyle_SOLID) );
- rXFSet.Put( aXFillColorItem );
+ rXFSet.Put( XFillColorItem(OUString(), COL_BLACK) );
m_pCtlPreviewOld->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 6b5bd18b9202..0a91b2c02f0c 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -56,11 +56,8 @@ SvxGradientTabPage::SvxGradientTabPage
SfxTabPage ( pParent, "GradientPage", "cui/ui/gradientpage.ui", &rInAttrs ),
m_rOutAttrs ( rInAttrs ),
-
m_pnGradientListState ( nullptr ),
m_pnColorListState ( nullptr ),
-
- m_aXGradientItem ( OUString(), XGradient( COL_BLACK, COL_WHITE ) ),
m_aXFillAttr ( rInAttrs.GetPool() ),
m_rXFSet ( m_aXFillAttr.GetItemSet() )
{
@@ -100,7 +97,7 @@ SvxGradientTabPage::SvxGradientTabPage
// setting the output device
m_rXFSet.Put( XFillStyleItem(drawing::FillStyle_GRADIENT) );
- m_rXFSet.Put( m_aXGradientItem );
+ m_rXFSet.Put( XFillGradientItem(OUString(), XGradient( COL_BLACK, COL_WHITE )) );
m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
// set handler
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 78c70ba84923..9f7985e3d9e5 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -59,11 +59,8 @@ SvxHatchTabPage::SvxHatchTabPage
m_rOutAttrs ( rInAttrs ),
m_pnHatchingListState ( nullptr ),
m_pnColorListState ( nullptr ),
-
- m_aXHatchItem ( OUString(), XHatch() ),
m_aXFillAttr ( rInAttrs.GetPool() ),
m_rXFSet ( m_aXFillAttr.GetItemSet() )
-
{
get(m_pMtrDistance, "distancemtr");
get(m_pMtrAngle, "anglemtr");
@@ -105,7 +102,7 @@ SvxHatchTabPage::SvxHatchTabPage
// setting the output device
m_rXFSet.Put( XFillStyleItem(drawing::FillStyle_HATCH) );
- m_rXFSet.Put( m_aXHatchItem );
+ m_rXFSet.Put( XFillHatchItem(OUString(), XHatch()) );
m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
m_pHatchLB->SetSelectHdl( LINK( this, SvxHatchTabPage, ChangeHatchHdl ) );
m_pHatchLB->SetRenameHdl( LINK( this, SvxHatchTabPage, ClickRenameHdl_Impl ) );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4a84e8d52976..409de2429405 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -62,8 +62,6 @@ SvxLineDefTabPage::SvxLineDefTabPage
, &rInAttrs ),
rOutAttrs ( rInAttrs ),
- aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3, 7, 2, 40, 15 ) ),
- aXColor ( OUString(), COL_BLACK ),
aXLineAttr ( rInAttrs.GetPool() ),
rXLSet ( aXLineAttr.GetItemSet() ),
pnDashListState(nullptr),
@@ -116,8 +114,8 @@ SvxLineDefTabPage::SvxLineDefTabPage
rXLSet.Put( XLineStyleItem(drawing::LineStyle_DASH) );
rXLSet.Put( XLineWidthItem(XOUT_WIDTH) );
- rXLSet.Put( aXDash );
- rXLSet.Put( aXColor );
+ rXLSet.Put( XLineDashItem( OUString(), XDash( css::drawing::DashStyle_RECT, 3, 7, 2, 40, 15 ) ) );
+ rXLSet.Put( XLineColorItem(OUString(), COL_BLACK) );
// #i34740#
m_pCtlPreview->SetLineAttributes(aXLineAttr.GetItemSet());
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 63bca6e153c7..091b1fa04192 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -63,7 +63,6 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
rOutAttrs ( rInAttrs ),
pPolyObj ( nullptr ),
- aXColor ( OUString(), COL_BLACK ),
aXLineAttr ( rInAttrs.GetPool() ),
rXLSet ( aXLineAttr.GetItemSet() ),
pLineEndList ( nullptr ),
@@ -86,7 +85,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
rXLSet.Put( XLineStyleItem(css::drawing::LineStyle_SOLID) );
rXLSet.Put( XLineWidthItem(XOUT_WIDTH) );
- rXLSet.Put( aXColor );
+ rXLSet.Put( XLineColorItem( OUString(), COL_BLACK ) );
rXLSet.Put( XLineStartWidthItem( m_pCtlPreview->GetOutputSize().Height() / 2 ) );
rXLSet.Put( XLineEndWidthItem( m_pCtlPreview->GetOutputSize().Height() / 2 ) );
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 50c2f59b4f18..4768d0189a49 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -91,7 +91,6 @@ SvxPatternTabPage::SvxPatternTabPage( vcl::Window* pParent, const SfxItemSet& r
m_pnPatternListState ( nullptr ),
m_pnColorListState ( nullptr ),
- m_aXPatternItem ( OUString(), Graphic() ),
m_aXFillAttr ( rInAttrs.GetPool() ),
m_rXFSet ( m_aXFillAttr.GetItemSet() )
{
@@ -117,7 +116,7 @@ SvxPatternTabPage::SvxPatternTabPage( vcl::Window* pParent, const SfxItemSet& r
// setting the output device
m_rXFSet.Put( XFillStyleItem(drawing::FillStyle_BITMAP) );
- m_rXFSet.Put( m_aXPatternItem );
+ m_rXFSet.Put( XFillBitmapItem(OUString(), Graphic()) );
m_pBtnAdd->SetClickHdl( LINK( this, SvxPatternTabPage, ClickAddHdl_Impl ) );
m_pBtnModify->SetClickHdl( LINK( this, SvxPatternTabPage, ClickModifyHdl_Impl ) );
More information about the Libreoffice-commits
mailing list