diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-20 12:13:42 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-20 10:45:14 +0000 |
commit | b18e1bc61ccba9d0c74274e2fe45b2b422c601cf (patch) | |
tree | 13d90e6939c5d152c30b948148125be7b0cb6f22 /svx | |
parent | 8a382d4ad190cf07cbd6b1fd6b903975134b0cf1 (diff) |
loplugin:unusedfields
Change-Id: I852e98b16fdcb88b04e39d11e3101d502c918c24
Reviewed-on: https://gerrit.libreoffice.org/29078
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/sdr/overlay/overlayhandle.hxx | 4 | ||||
-rw-r--r-- | svx/source/form/dataaccessdescriptor.cxx | 31 | ||||
-rw-r--r-- | svx/source/sdr/overlay/overlayhandle.cxx | 4 | ||||
-rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 10 | ||||
-rw-r--r-- | svx/source/svdraw/svdhdl.cxx | 2 |
5 files changed, 22 insertions, 29 deletions
diff --git a/svx/inc/sdr/overlay/overlayhandle.hxx b/svx/inc/sdr/overlay/overlayhandle.hxx index 5e916bfe568e..64d6cd4312fd 100644 --- a/svx/inc/sdr/overlay/overlayhandle.hxx +++ b/svx/inc/sdr/overlay/overlayhandle.hxx @@ -22,7 +22,6 @@ class SVX_DLLPUBLIC OverlayHandle : public OverlayObjectWithBasePosition protected: basegfx::B2DSize maSize; Color maStrokeColor; - float mfTransparency; // geometry creation for OverlayObject virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; @@ -31,8 +30,7 @@ public: OverlayHandle(const basegfx::B2DPoint& rBasePos, const basegfx::B2DSize& rSize, Color& rStrokeColor, - Color& rFillColor, - float fTransparency = 0.0f); + Color& rFillColor); virtual ~OverlayHandle() override; }; diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 3004f300d8e3..b4ca33928b51 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -37,9 +37,6 @@ namespace svx { OUString maName; DataAccessDescriptorProperty mnHandle; - css::uno::Type maType; - sal_Int16 mnAttributes; - sal_uInt8 mnMemberId; }; class ODADescriptorImpl @@ -183,20 +180,20 @@ namespace svx { static PropertyMapEntry const s_aDesriptorProperties[] = { - { OUString("ActiveConnection"), DataAccessDescriptorProperty::Connection, cppu::UnoType<XConnection>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("BookmarkSelection"), DataAccessDescriptorProperty::BookmarkSelection, cppu::UnoType<bool>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Column"), DataAccessDescriptorProperty::ColumnObject, cppu::UnoType<XPropertySet>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("ColumnName"), DataAccessDescriptorProperty::ColumnName, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Command"), DataAccessDescriptorProperty::Command, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("CommandType"), DataAccessDescriptorProperty::CommandType, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Component"), DataAccessDescriptorProperty::Component, cppu::UnoType<XContent>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("ConnectionResource"), DataAccessDescriptorProperty::ConnectionResource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Cursor"), DataAccessDescriptorProperty::Cursor, cppu::UnoType<XResultSet>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("DataSourceName"), DataAccessDescriptorProperty::DataSource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("DatabaseLocation"), DataAccessDescriptorProperty::DatabaseLocation, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("EscapeProcessing"), DataAccessDescriptorProperty::EscapeProcessing, cppu::UnoType<bool>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Filter"), DataAccessDescriptorProperty::Filter, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Selection"), DataAccessDescriptorProperty::Selection, cppu::UnoType<Sequence< Any >>::get(), PropertyAttribute::TRANSIENT, 0 } + { OUString("ActiveConnection"), DataAccessDescriptorProperty::Connection, }, + { OUString("BookmarkSelection"), DataAccessDescriptorProperty::BookmarkSelection, }, + { OUString("Column"), DataAccessDescriptorProperty::ColumnObject, }, + { OUString("ColumnName"), DataAccessDescriptorProperty::ColumnName, }, + { OUString("Command"), DataAccessDescriptorProperty::Command, }, + { OUString("CommandType"), DataAccessDescriptorProperty::CommandType, }, + { OUString("Component"), DataAccessDescriptorProperty::Component, }, + { OUString("ConnectionResource"), DataAccessDescriptorProperty::ConnectionResource, }, + { OUString("Cursor"), DataAccessDescriptorProperty::Cursor, }, + { OUString("DataSourceName"), DataAccessDescriptorProperty::DataSource, }, + { OUString("DatabaseLocation"), DataAccessDescriptorProperty::DatabaseLocation, }, + { OUString("EscapeProcessing"), DataAccessDescriptorProperty::EscapeProcessing, }, + { OUString("Filter"), DataAccessDescriptorProperty::Filter, }, + { OUString("Selection"), DataAccessDescriptorProperty::Selection, } }; for (unsigned i=0; i<SAL_N_ELEMENTS(s_aDesriptorProperties); ++i) diff --git a/svx/source/sdr/overlay/overlayhandle.cxx b/svx/source/sdr/overlay/overlayhandle.cxx index c5f1c0c8175c..0c89165e4634 100644 --- a/svx/source/sdr/overlay/overlayhandle.cxx +++ b/svx/source/sdr/overlay/overlayhandle.cxx @@ -47,12 +47,10 @@ primitive2d::Primitive2DContainer OverlayHandle::createOverlayObjectPrimitive2DS OverlayHandle::OverlayHandle(const B2DPoint& rBasePos, const B2DSize& rSize, Color& rStrokeColor, - Color& rFillColor, - float fTransparency) + Color& rFillColor) : OverlayObjectWithBasePosition(rBasePos, rFillColor) , maSize(rSize) , maStrokeColor(rStrokeColor) - , mfTransparency(fTransparency) { } diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index f0be420741e8..2d4d0a1ef193 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -245,7 +245,7 @@ sal_Unicode BulletsTypeMgr::aDynamicBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' sal_Unicode BulletsTypeMgr::aDynamicRTLBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '}; BulletsTypeMgr::BulletsTypeMgr() - : NBOTypeMgrBase(eNBOType::BULLETS) + : NBOTypeMgrBase() { Init(); } @@ -495,7 +495,7 @@ vcl::Font BulletsTypeMgr::GetBulCharFont(sal_uInt16 nIndex) } // Graphic Bullet Type lib GraphicBulletsTypeMgr::GraphicBulletsTypeMgr() - : NBOTypeMgrBase(eNBOType::BULLETS) + : NBOTypeMgrBase() { Init(); } @@ -717,7 +717,7 @@ MixBulletsSettings_Impl* MixBulletsTypeMgr::pActualBullets[] ={nullptr,nullptr,n MixBulletsSettings_Impl* MixBulletsTypeMgr::pDefaultActualBullets[] ={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}; MixBulletsTypeMgr::MixBulletsTypeMgr() - : NBOTypeMgrBase(eNBOType::MIXBULLETS) + : NBOTypeMgrBase() { Init(); for(sal_Int32 nItem = 0; nItem < DEFAULT_BULLET_TYPES; nItem++ ) @@ -1170,7 +1170,7 @@ bool MixBulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) } // Numbering Type lib NumberingTypeMgr::NumberingTypeMgr() - : NBOTypeMgrBase(eNBOType::NUMBERING) + : NBOTypeMgrBase() , pNumberSettingsArr (new NumberSettingsArr_Impl) { Init(); @@ -1357,7 +1357,7 @@ bool NumberingTypeMgr::IsCustomized(sal_uInt16 nIndex) } // Multi-level /Outline Type lib OutlineTypeMgr::OutlineTypeMgr() - : NBOTypeMgrBase(eNBOType::OUTLINE) + : NBOTypeMgrBase() { Init(); for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ ) diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 3216a7ff64de..0ba525c6c065 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -616,7 +616,7 @@ void SdrHdl::CreateB2dIAObject() default: break; } - pNewOverlayObject = new sdr::overlay::OverlayHandle(aPosition, aB2DSize, aHandleStrokeColor, aHandleFillColor, nRotationAngle); + pNewOverlayObject = new sdr::overlay::OverlayHandle(aPosition, aB2DSize, aHandleStrokeColor, aHandleFillColor); } else { |