Kaydet (Commit) 970ca8de authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in various

Change-Id: I31d0e6c3559af2e322fb474b97f3bbf4d5064831
Reviewed-on: https://gerrit.libreoffice.org/68280
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 880af067
...@@ -66,7 +66,6 @@ private: ...@@ -66,7 +66,6 @@ private:
sal_uInt32 m_nClientId; sal_uInt32 m_nClientId;
rtl::Reference< VCLXAccessibleList > m_xParent; rtl::Reference< VCLXAccessibleList > m_xParent;
css::uno::Reference< css::accessibility::XAccessibleContext > m_xParentContext;
virtual ~VCLXAccessibleListItem() override = default; virtual ~VCLXAccessibleListItem() override = default;
/** this function is called upon disposing the component /** this function is called upon disposing the component
......
...@@ -72,7 +72,6 @@ VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 _nIndexInParent, const ...@@ -72,7 +72,6 @@ VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 _nIndexInParent, const
, m_xParent(_xParent) , m_xParent(_xParent)
{ {
assert(m_xParent.is()); assert(m_xParent.is());
m_xParentContext = m_xParent->getAccessibleContext();
::accessibility::IComboListBoxHelper* pListBoxHelper = m_xParent->getListBoxHelper(); ::accessibility::IComboListBoxHelper* pListBoxHelper = m_xParent->getListBoxHelper();
if (pListBoxHelper) if (pListBoxHelper)
m_sEntryText = pListBoxHelper->GetEntry(static_cast<sal_uInt16>(_nIndexInParent)); m_sEntryText = pListBoxHelper->GetEntry(static_cast<sal_uInt16>(_nIndexInParent));
...@@ -157,7 +156,6 @@ void SAL_CALL VCLXAccessibleListItem::disposing() ...@@ -157,7 +156,6 @@ void SAL_CALL VCLXAccessibleListItem::disposing()
VCLXAccessibleListItem_BASE::disposing(); VCLXAccessibleListItem_BASE::disposing();
m_sEntryText.clear(); m_sEntryText.clear();
m_xParent = nullptr; m_xParent = nullptr;
m_xParentContext = nullptr;
nId = m_nClientId; nId = m_nClientId;
m_nClientId = 0; m_nClientId = 0;
......
...@@ -1261,7 +1261,6 @@ ItemType DialogWindow::GetType () const ...@@ -1261,7 +1261,6 @@ ItemType DialogWindow::GetType () const
DialogWindowLayout::DialogWindowLayout (vcl::Window* pParent, ObjectCatalog& rObjectCatalog_) : DialogWindowLayout::DialogWindowLayout (vcl::Window* pParent, ObjectCatalog& rObjectCatalog_) :
Layout(pParent), Layout(pParent),
pChild(nullptr),
rObjectCatalog(rObjectCatalog_), rObjectCatalog(rObjectCatalog_),
pPropertyBrowser(nullptr) pPropertyBrowser(nullptr)
{ {
...@@ -1278,7 +1277,6 @@ void DialogWindowLayout::dispose() ...@@ -1278,7 +1277,6 @@ void DialogWindowLayout::dispose()
if (pPropertyBrowser) if (pPropertyBrowser)
Remove(pPropertyBrowser); Remove(pPropertyBrowser);
pPropertyBrowser.disposeAndClear(); pPropertyBrowser.disposeAndClear();
pChild.clear();
Layout::dispose(); Layout::dispose();
} }
...@@ -1321,7 +1319,6 @@ void DialogWindowLayout::UpdatePropertyBrowser () ...@@ -1321,7 +1319,6 @@ void DialogWindowLayout::UpdatePropertyBrowser ()
void DialogWindowLayout::Activating (BaseWindow& rChild) void DialogWindowLayout::Activating (BaseWindow& rChild)
{ {
assert(dynamic_cast<DialogWindow*>(&rChild)); assert(dynamic_cast<DialogWindow*>(&rChild));
pChild = &static_cast<DialogWindow&>(rChild);
rObjectCatalog.SetLayoutWindow(this); rObjectCatalog.SetLayoutWindow(this);
rObjectCatalog.UpdateEntries(); rObjectCatalog.UpdateEntries();
rObjectCatalog.Show(); rObjectCatalog.Show();
...@@ -1336,7 +1333,6 @@ void DialogWindowLayout::Deactivating () ...@@ -1336,7 +1333,6 @@ void DialogWindowLayout::Deactivating ()
rObjectCatalog.Hide(); rObjectCatalog.Hide();
if (pPropertyBrowser) if (pPropertyBrowser)
pPropertyBrowser->Hide(); pPropertyBrowser->Hide();
pChild = nullptr;
} }
void DialogWindowLayout::ExecuteGlobal (SfxRequest& rReq) void DialogWindowLayout::ExecuteGlobal (SfxRequest& rReq)
......
...@@ -137,8 +137,6 @@ protected: ...@@ -137,8 +137,6 @@ protected:
virtual void OnFirstSize (long nWidth, long nHeight) override; virtual void OnFirstSize (long nWidth, long nHeight) override;
private: private:
// child window
VclPtr<DialogWindow> pChild;
// dockable windows: // dockable windows:
// object catalog (owned by Shell) // object catalog (owned by Shell)
ObjectCatalog& rObjectCatalog; ObjectCatalog& rObjectCatalog;
......
...@@ -348,7 +348,6 @@ public: ...@@ -348,7 +348,6 @@ public:
protected: protected:
DataSeriesPointWrapper* m_pDataSeriesPointWrapper; DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
mutable Any m_aDefaultValue; mutable Any m_aDefaultValue;
mutable Any m_aOuterValue;
}; };
WrappedLineColorProperty::WrappedLineColorProperty( WrappedLineColorProperty::WrappedLineColorProperty(
...@@ -356,23 +355,18 @@ WrappedLineColorProperty::WrappedLineColorProperty( ...@@ -356,23 +355,18 @@ WrappedLineColorProperty::WrappedLineColorProperty(
: WrappedSeriesAreaOrLineProperty("LineColor","BorderColor","Color", pDataSeriesPointWrapper ) : WrappedSeriesAreaOrLineProperty("LineColor","BorderColor","Color", pDataSeriesPointWrapper )
, m_pDataSeriesPointWrapper( pDataSeriesPointWrapper ) , m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
, m_aDefaultValue(uno::Any(sal_Int32( 0x0099ccff ))) // blue 8 , m_aDefaultValue(uno::Any(sal_Int32( 0x0099ccff ))) // blue 8
, m_aOuterValue(m_aDefaultValue)
{ {
} }
void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
{ {
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) if( !m_pDataSeriesPointWrapper || !m_pDataSeriesPointWrapper->isLinesForbidden() )
m_aOuterValue = rOuterValue;
else
WrappedSeriesAreaOrLineProperty::setPropertyValue( rOuterValue, xInnerPropertySet ); WrappedSeriesAreaOrLineProperty::setPropertyValue( rOuterValue, xInnerPropertySet );
} }
void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
{ {
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) if( !m_pDataSeriesPointWrapper || !m_pDataSeriesPointWrapper->isLinesForbidden() )
m_aOuterValue = m_aDefaultValue;
else
WrappedSeriesAreaOrLineProperty::setPropertyToDefault( xInnerPropertyState ); WrappedSeriesAreaOrLineProperty::setPropertyToDefault( xInnerPropertyState );
} }
...@@ -396,7 +390,6 @@ public: ...@@ -396,7 +390,6 @@ public:
protected: protected:
DataSeriesPointWrapper* m_pDataSeriesPointWrapper; DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
mutable Any m_aDefaultValue; mutable Any m_aDefaultValue;
mutable Any m_aOuterValue;
}; };
WrappedLineStyleProperty::WrappedLineStyleProperty( WrappedLineStyleProperty::WrappedLineStyleProperty(
...@@ -404,7 +397,6 @@ WrappedLineStyleProperty::WrappedLineStyleProperty( ...@@ -404,7 +397,6 @@ WrappedLineStyleProperty::WrappedLineStyleProperty(
: WrappedSeriesAreaOrLineProperty("LineStyle","BorderStyle", "LineStyle", pDataSeriesPointWrapper ) : WrappedSeriesAreaOrLineProperty("LineStyle","BorderStyle", "LineStyle", pDataSeriesPointWrapper )
, m_pDataSeriesPointWrapper( pDataSeriesPointWrapper ) , m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
, m_aDefaultValue(uno::Any(drawing::LineStyle_SOLID)) , m_aDefaultValue(uno::Any(drawing::LineStyle_SOLID))
, m_aOuterValue(m_aDefaultValue)
{ {
} }
...@@ -413,7 +405,6 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R ...@@ -413,7 +405,6 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R
Any aNewValue(rOuterValue); Any aNewValue(rOuterValue);
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
{ {
m_aOuterValue = rOuterValue;
aNewValue <<= drawing::LineStyle_NONE; aNewValue <<= drawing::LineStyle_NONE;
} }
WrappedSeriesAreaOrLineProperty::setPropertyValue( aNewValue, xInnerPropertySet ); WrappedSeriesAreaOrLineProperty::setPropertyValue( aNewValue, xInnerPropertySet );
...@@ -421,9 +412,7 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R ...@@ -421,9 +412,7 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R
void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
{ {
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) if( !m_pDataSeriesPointWrapper || !m_pDataSeriesPointWrapper->isLinesForbidden() )
m_aOuterValue = m_aDefaultValue;
else
WrappedSeriesAreaOrLineProperty::setPropertyToDefault( xInnerPropertyState ); WrappedSeriesAreaOrLineProperty::setPropertyToDefault( xInnerPropertyState );
} }
......
...@@ -657,9 +657,6 @@ public: ...@@ -657,9 +657,6 @@ public:
explicit WrappedErrorBarRangePositiveProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, explicit WrappedErrorBarRangePositiveProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType ); tSeriesOrDiagramPropertyType ePropertyType );
private:
mutable Any m_aOuterValue;
}; };
WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty( WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty(
...@@ -720,9 +717,6 @@ public: ...@@ -720,9 +717,6 @@ public:
explicit WrappedErrorBarRangeNegativeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, explicit WrappedErrorBarRangeNegativeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType ); tSeriesOrDiagramPropertyType ePropertyType );
private:
mutable Any m_aOuterValue;
}; };
WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty( WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty(
......
...@@ -40,18 +40,11 @@ void OSelectionChangeListener::_disposing(const EventObject&) ...@@ -40,18 +40,11 @@ void OSelectionChangeListener::_disposing(const EventObject&)
} }
void OSelectionChangeListener::setAdapter(OSelectionChangeMultiplexer* pAdapter)
{
::osl::MutexGuard aGuard(m_rMutex);
m_xAdapter = pAdapter;
}
OSelectionChangeMultiplexer::OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const Reference< XSelectionSupplier>& _rxSet) OSelectionChangeMultiplexer::OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const Reference< XSelectionSupplier>& _rxSet)
:m_xSet(_rxSet) :m_xSet(_rxSet)
,m_pListener(_pListener) ,m_pListener(_pListener)
,m_nLockCount(0) ,m_nLockCount(0)
{ {
m_pListener->setAdapter(this);
osl_atomic_increment(&m_refCount); osl_atomic_increment(&m_refCount);
{ {
Reference< XSelectionChangeListener> xPreventDelete(this); Reference< XSelectionChangeListener> xPreventDelete(this);
...@@ -87,9 +80,6 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSour ...@@ -87,9 +80,6 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSour
// tell the listener // tell the listener
if (!locked()) if (!locked())
m_pListener->_disposing(_rSource); m_pListener->_disposing(_rSource);
// disconnect the listener
if (m_pListener) // may have been reset whilst calling into _disposing
m_pListener->setAdapter(nullptr);
} }
m_pListener = nullptr; m_pListener = nullptr;
......
...@@ -63,7 +63,6 @@ namespace cppcanvas ...@@ -63,7 +63,6 @@ namespace cppcanvas
boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
CanvasSharedPtr mpCanvas; CanvasSharedPtr mpCanvas;
css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice;
}; };
} }
......
...@@ -43,19 +43,12 @@ namespace cppcanvas ...@@ -43,19 +43,12 @@ namespace cppcanvas
{ {
CanvasGraphicHelper::CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas ) : CanvasGraphicHelper::CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas ) :
maClipPolyPolygon(), maClipPolyPolygon(),
mpCanvas( rParentCanvas ), mpCanvas( rParentCanvas )
mxGraphicDevice()
{ {
OSL_ENSURE( mpCanvas.get() != nullptr && OSL_ENSURE( mpCanvas.get() != nullptr &&
mpCanvas->getUNOCanvas().is(), mpCanvas->getUNOCanvas().is(),
"CanvasGraphicHelper::CanvasGraphicHelper: no valid canvas" ); "CanvasGraphicHelper::CanvasGraphicHelper: no valid canvas" );
if( mpCanvas.get() != nullptr &&
mpCanvas->getUNOCanvas().is() )
{
mxGraphicDevice = mpCanvas->getUNOCanvas()->getDevice();
}
::canvas::tools::initRenderState( maRenderState ); ::canvas::tools::initRenderState( maRenderState );
} }
......
...@@ -45,22 +45,14 @@ namespace comphelper ...@@ -45,22 +45,14 @@ namespace comphelper
{ {
friend class OSelectionChangeMultiplexer; friend class OSelectionChangeMultiplexer;
rtl::Reference<OSelectionChangeMultiplexer> m_xAdapter;
::osl::Mutex& m_rMutex;
public: public:
OSelectionChangeListener(::osl::Mutex& _rMutex) OSelectionChangeListener() {}
: m_rMutex(_rMutex) { }
virtual ~OSelectionChangeListener(); virtual ~OSelectionChangeListener();
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
virtual void _selectionChanged( const css::lang::EventObject& aEvent ) = 0; virtual void _selectionChanged( const css::lang::EventObject& aEvent ) = 0;
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
virtual void _disposing(const css::lang::EventObject& _rSource); virtual void _disposing(const css::lang::EventObject& _rSource);
protected:
// pseudo-private. Making it private now could break compatibility
void setAdapter( OSelectionChangeMultiplexer* _pAdapter );
}; };
......
...@@ -38,9 +38,7 @@ public: ...@@ -38,9 +38,7 @@ public:
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
protected: protected:
ShapePtr mpGroupShapePtr; ShapePtr mpGroupShapePtr;
ShapePtr mpMasterShapePtr;
}; };
} } } }
......
...@@ -47,12 +47,11 @@ namespace oox { namespace drawingml { ...@@ -47,12 +47,11 @@ namespace oox { namespace drawingml {
ShapeGroupContext::ShapeGroupContext( ContextHandler2Helper const & rParent, ShapePtr const & pMasterShapePtr, ShapePtr const & pGroupShapePtr ) ShapeGroupContext::ShapeGroupContext( ContextHandler2Helper const & rParent, ShapePtr const & pMasterShapePtr, ShapePtr const & pGroupShapePtr )
: ContextHandler2( rParent ) : ContextHandler2( rParent )
, mpGroupShapePtr( pGroupShapePtr ) , mpGroupShapePtr( pGroupShapePtr )
, mpMasterShapePtr( pMasterShapePtr )
{ {
if( pMasterShapePtr ) if( pMasterShapePtr )
mpGroupShapePtr->setWps(pMasterShapePtr->getWps()); mpGroupShapePtr->setWps(pMasterShapePtr->getWps());
if( mpMasterShapePtr.get() && mpGroupShapePtr.get() ) if( pMasterShapePtr.get() && mpGroupShapePtr.get() )
mpMasterShapePtr->addChild( mpGroupShapePtr ); pMasterShapePtr->addChild( mpGroupShapePtr );
} }
ShapeGroupContext::~ShapeGroupContext() ShapeGroupContext::~ShapeGroupContext()
......
...@@ -207,7 +207,7 @@ private: ...@@ -207,7 +207,7 @@ private:
NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rController ) NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rController )
:SvTreeListBox( pParent, WB_TABSTOP| WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL|WB_HASBUTTONSATROOT ) :SvTreeListBox( pParent, WB_TABSTOP| WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL|WB_HASBUTTONSATROOT )
,comphelper::OSelectionChangeListener(m_aMutex) ,comphelper::OSelectionChangeListener()
,OPropertyChangeListener(m_aMutex) ,OPropertyChangeListener(m_aMutex)
,m_aTimerTriggered(-1,-1) ,m_aTimerTriggered(-1,-1)
,m_aDropActionType( DA_SCROLLUP ) ,m_aDropActionType( DA_SCROLLUP )
......
...@@ -50,7 +50,6 @@ DictionaryList::DictionaryList(std::unique_ptr<weld::TreeView> xControl) ...@@ -50,7 +50,6 @@ DictionaryList::DictionaryList(std::unique_ptr<weld::TreeView> xControl)
, m_pED_Mapping(nullptr) , m_pED_Mapping(nullptr)
, m_pLB_Property(nullptr) , m_pLB_Property(nullptr)
, m_aToBeDeleted() , m_aToBeDeleted()
, m_nSortColumnIndex(0)
{ {
m_xControl->make_sorted(); m_xControl->make_sorted();
} }
......
...@@ -67,7 +67,6 @@ public: ...@@ -67,7 +67,6 @@ public:
DictionaryEntry* getFirstSelectedEntry() const; DictionaryEntry* getFirstSelectedEntry() const;
void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ); void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ );
sal_uInt16 getSortColumn() const { return m_nSortColumnIndex;}
void set_size_request(int nWidth, int nHeight) { m_xControl->set_size_request(nWidth, nHeight); } void set_size_request(int nWidth, int nHeight) { m_xControl->set_size_request(nWidth, nHeight); }
void hide() { m_xControl->hide(); } void hide() { m_xControl->hide(); }
...@@ -100,8 +99,6 @@ private: ...@@ -100,8 +99,6 @@ private:
weld::ComboBox* m_pLB_Property; weld::ComboBox* m_pLB_Property;
std::vector< DictionaryEntry* > m_aToBeDeleted; std::vector< DictionaryEntry* > m_aToBeDeleted;
sal_uInt16 m_nSortColumnIndex;
}; };
class ChineseDictionaryDialog : public weld::GenericDialogController class ChineseDictionaryDialog : public weld::GenericDialogController
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment