Kaydet (Commit) 3ff8ecb5 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in extensions..framework

Change-Id: I687c67c8f3c0e03c6ab2da0a93a9e62f0caf12cd
Reviewed-on: https://gerrit.libreoffice.org/40292Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 760a7791
...@@ -284,14 +284,6 @@ embeddedobj/source/inc/oleembobj.hxx:170 ...@@ -284,14 +284,6 @@ embeddedobj/source/inc/oleembobj.hxx:170
OleEmbeddedObject m_nStatusAspect sal_Int64 OleEmbeddedObject m_nStatusAspect sal_Int64
embeddedobj/source/inc/oleembobj.hxx:184 embeddedobj/source/inc/oleembobj.hxx:184
OleEmbeddedObject m_bFromClipboard _Bool OleEmbeddedObject m_bFromClipboard _Bool
extensions/source/bibliography/bibbeam.hxx:48
bib::BibBeamer m_xToolBarRef css::uno::Reference<css::frame::XFrame>
extensions/source/bibliography/bibcont.hxx:67
BibBookContainer xTopFrameRef css::uno::Reference<css::frame::XFrame>
extensions/source/bibliography/bibcont.hxx:68
BibBookContainer xBottomFrameRef css::uno::Reference<css::frame::XFrame>
extensions/source/bibliography/framectr.hxx:70
BibFrameController_Impl pBibMod HdlBibModul
extensions/source/propctrlr/eformshelper.hxx:62 extensions/source/propctrlr/eformshelper.hxx:62
pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet
extensions/source/propctrlr/eformshelper.hxx:64 extensions/source/propctrlr/eformshelper.hxx:64
...@@ -300,10 +292,6 @@ extensions/source/propctrlr/propertyhandler.hxx:80 ...@@ -300,10 +292,6 @@ extensions/source/propctrlr/propertyhandler.hxx:80
pcr::PropertyHandler m_aEnsureResAccess class pcr::PcrClient pcr::PropertyHandler m_aEnsureResAccess class pcr::PcrClient
extensions/source/scanner/scanner.hxx:46 extensions/source/scanner/scanner.hxx:46
ScannerManager maProtector osl::Mutex ScannerManager maProtector osl::Mutex
filter/inc/gfxtypes.hxx:193
svgi::State meTextDisplayAlign enum svgi::TextAlign
filter/inc/gfxtypes.hxx:204
svgi::State meViewportFillType enum svgi::PaintType
filter/source/graphicfilter/eps/eps.cxx:112 filter/source/graphicfilter/eps/eps.cxx:112
PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice> PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice>
filter/source/graphicfilter/icgm/chart.hxx:44 filter/source/graphicfilter/icgm/chart.hxx:44
...@@ -340,8 +328,6 @@ formula/source/ui/dlg/structpg.hxx:68 ...@@ -340,8 +328,6 @@ formula/source/ui/dlg/structpg.hxx:68
formula::StructPage m_aModuleClient class formula::OModuleClient formula::StructPage m_aModuleClient class formula::OModuleClient
framework/inc/dispatch/dispatchprovider.hxx:81 framework/inc/dispatch/dispatchprovider.hxx:81
framework::DispatchProvider m_aProtocolHandlerCache class framework::HandlerCache framework::DispatchProvider m_aProtocolHandlerCache class framework::HandlerCache
framework/inc/dispatch/oxt_handler.hxx:92
framework::Oxt_Handler m_xSelfHold css::uno::Reference<css::uno::XInterface>
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx:184 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx:184
(anonymous namespace)::ModuleUIConfigurationManager::UIElementType aElementsHashMap (anonymous namespace)::ModuleUIConfigurationManager::UIElementDataHashMap (anonymous namespace)::ModuleUIConfigurationManager::UIElementType aElementsHashMap (anonymous namespace)::ModuleUIConfigurationManager::UIElementDataHashMap
framework/source/uiconfiguration/uiconfigurationmanager.cxx:164 framework/source/uiconfiguration/uiconfigurationmanager.cxx:164
......
...@@ -203,9 +203,6 @@ namespace bib ...@@ -203,9 +203,6 @@ namespace bib
if ( isFormConnected() ) if ( isFormConnected() )
disconnectForm(); disconnectForm();
if ( m_xToolBarRef.is() )
m_xToolBarRef->dispose();
if ( pToolBar ) if ( pToolBar )
pDatMan->SetToolbar(nullptr); pDatMan->SetToolbar(nullptr);
......
...@@ -45,7 +45,6 @@ namespace bib ...@@ -45,7 +45,6 @@ namespace bib
private: private:
css::uno::Reference< css::frame::XController > m_xController; css::uno::Reference< css::frame::XController > m_xController;
css::uno::Reference< css::frame::XFrame > m_xToolBarRef;
BibDataManager* pDatMan; BibDataManager* pDatMan;
VclPtr<BibToolBar> pToolBar; VclPtr<BibToolBar> pToolBar;
......
...@@ -126,11 +126,6 @@ BibBookContainer::~BibBookContainer() ...@@ -126,11 +126,6 @@ BibBookContainer::~BibBookContainer()
void BibBookContainer::dispose() void BibBookContainer::dispose()
{ {
if( xTopFrameRef.is() )
xTopFrameRef->dispose();
if( xBottomFrameRef.is() )
xBottomFrameRef->dispose();
if( pTopWin ) if( pTopWin )
{ {
VclPtr<vcl::Window> pDel = pTopWin; VclPtr<vcl::Window> pDel = pTopWin;
...@@ -166,8 +161,6 @@ IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Timer*, void) ...@@ -166,8 +161,6 @@ IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Timer*, void)
void BibBookContainer::createTopFrame( BibShortCutHandler* pWin ) void BibBookContainer::createTopFrame( BibShortCutHandler* pWin )
{ {
if ( xTopFrameRef.is() ) xTopFrameRef->dispose();
if(pTopWin) if(pTopWin)
{ {
RemoveItem(TOP_WINDOW); RemoveItem(TOP_WINDOW);
...@@ -183,8 +176,6 @@ void BibBookContainer::createTopFrame( BibShortCutHandler* pWin ) ...@@ -183,8 +176,6 @@ void BibBookContainer::createTopFrame( BibShortCutHandler* pWin )
void BibBookContainer::createBottomFrame( BibShortCutHandler* pWin ) void BibBookContainer::createBottomFrame( BibShortCutHandler* pWin )
{ {
if ( xBottomFrameRef.is() ) xBottomFrameRef->dispose();
if(pBottomWin) if(pBottomWin)
{ {
RemoveItem(BOTTOM_WINDOW); RemoveItem(BOTTOM_WINDOW);
......
...@@ -64,9 +64,6 @@ class BibBookContainer: public BibSplitWindow ...@@ -64,9 +64,6 @@ class BibBookContainer: public BibSplitWindow
{ {
private: private:
css::uno::Reference< css::frame::XFrame > xTopFrameRef;
css::uno::Reference< css::frame::XFrame > xBottomFrameRef;
VclPtr<BibWindowContainer> pTopWin; VclPtr<BibWindowContainer> pTopWin;
VclPtr<BibWindowContainer> pBottomWin; VclPtr<BibWindowContainer> pBottomWin;
HdlBibModul pBibMod; HdlBibModul pBibMod;
......
...@@ -163,7 +163,6 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi ...@@ -163,7 +163,6 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi
BibDataManager* pDataManager) BibDataManager* pDataManager)
:xWindow( xComponent ) :xWindow( xComponent )
,m_xDatMan( pDataManager ) ,m_xDatMan( pDataManager )
,pBibMod(nullptr)
{ {
bDisposing=false; bDisposing=false;
bHierarchical=true; bHierarchical=true;
...@@ -175,8 +174,6 @@ BibFrameController_Impl::~BibFrameController_Impl() ...@@ -175,8 +174,6 @@ BibFrameController_Impl::~BibFrameController_Impl()
{ {
mxImpl->pController = nullptr; mxImpl->pController = nullptr;
m_xDatMan.clear(); m_xDatMan.clear();
if(pBibMod)
CloseBibModul(pBibMod);
} }
OUString SAL_CALL BibFrameController_Impl::getImplementationName() OUString SAL_CALL BibFrameController_Impl::getImplementationName()
......
...@@ -67,7 +67,6 @@ friend class BibFrameCtrl_Impl; ...@@ -67,7 +67,6 @@ friend class BibFrameCtrl_Impl;
bool bDisposing; bool bDisposing;
bool bHierarchical; bool bHierarchical;
rtl::Reference<BibDataManager> m_xDatMan; rtl::Reference<BibDataManager> m_xDatMan;
HdlBibModul pBibMod;
DECL_LINK( DisposeHdl, void*, void ); DECL_LINK( DisposeHdl, void*, void );
......
...@@ -149,7 +149,6 @@ struct State ...@@ -149,7 +149,6 @@ struct State
mnFontWeight(400.0), mnFontWeight(400.0),
meTextAnchor(BEFORE), meTextAnchor(BEFORE),
meTextDisplayAlign(BEFORE), meTextDisplayAlign(BEFORE),
mnTextLineIncrement(0.0),
maCurrentColor(0.0), maCurrentColor(0.0),
mbVisibility(true), mbVisibility(true),
meFillType(SOLID), meFillType(SOLID),
...@@ -157,7 +156,6 @@ struct State ...@@ -157,7 +156,6 @@ struct State
mnOpacity(1.0), mnOpacity(1.0),
meStrokeType(NONE), meStrokeType(NONE),
mnStrokeOpacity(1.0), mnStrokeOpacity(1.0),
meViewportFillType(NONE),
mnViewportFillOpacity(1.0), mnViewportFillOpacity(1.0),
maFillColor(0.0), maFillColor(0.0),
maFillGradient(Gradient::LINEAR), maFillGradient(Gradient::LINEAR),
...@@ -191,7 +189,6 @@ struct State ...@@ -191,7 +189,6 @@ struct State
TextAlign meTextAnchor; // text-anchor TextAlign meTextAnchor; // text-anchor
TextAlign meTextDisplayAlign; // display-align TextAlign meTextDisplayAlign; // display-align
double mnTextLineIncrement; // 0.0 means auto
ARGBColor maCurrentColor; ARGBColor maCurrentColor;
bool mbVisibility; bool mbVisibility;
...@@ -201,7 +198,6 @@ struct State ...@@ -201,7 +198,6 @@ struct State
double mnOpacity; double mnOpacity;
PaintType meStrokeType; PaintType meStrokeType;
double mnStrokeOpacity; double mnStrokeOpacity;
PaintType meViewportFillType;
double mnViewportFillOpacity; double mnViewportFillOpacity;
ARGBColor maFillColor; ARGBColor maFillColor;
...@@ -238,7 +234,6 @@ inline bool operator==(const State& rLHS, const State& rRHS ) ...@@ -238,7 +234,6 @@ inline bool operator==(const State& rLHS, const State& rRHS )
rLHS.mnFontWeight==rRHS.mnFontWeight && rLHS.mnFontWeight==rRHS.mnFontWeight &&
rLHS.meTextAnchor==rRHS.meTextAnchor && rLHS.meTextAnchor==rRHS.meTextAnchor &&
rLHS.meTextDisplayAlign==rRHS.meTextDisplayAlign && rLHS.meTextDisplayAlign==rRHS.meTextDisplayAlign &&
rLHS.mnTextLineIncrement==rRHS.mnTextLineIncrement &&
rLHS.maCurrentColor==rRHS.maCurrentColor && rLHS.maCurrentColor==rRHS.maCurrentColor &&
rLHS.mbVisibility==rRHS.mbVisibility && rLHS.mbVisibility==rRHS.mbVisibility &&
rLHS.meFillType==rRHS.meFillType && rLHS.meFillType==rRHS.meFillType &&
...@@ -246,7 +241,6 @@ inline bool operator==(const State& rLHS, const State& rRHS ) ...@@ -246,7 +241,6 @@ inline bool operator==(const State& rLHS, const State& rRHS )
rLHS.mnOpacity==rRHS.mnOpacity && rLHS.mnOpacity==rRHS.mnOpacity &&
rLHS.meStrokeType==rRHS.meStrokeType && rLHS.meStrokeType==rRHS.meStrokeType &&
rLHS.mnStrokeOpacity==rRHS.mnStrokeOpacity && rLHS.mnStrokeOpacity==rRHS.mnStrokeOpacity &&
rLHS.meViewportFillType==rRHS.meViewportFillType &&
rLHS.mnViewportFillOpacity==rRHS.mnViewportFillOpacity && rLHS.mnViewportFillOpacity==rRHS.mnViewportFillOpacity &&
rLHS.maFillColor==rRHS.maFillColor && rLHS.maFillColor==rRHS.maFillColor &&
rLHS.maFillGradient==rRHS.maFillGradient && rLHS.maFillGradient==rRHS.maFillGradient &&
...@@ -292,14 +286,12 @@ namespace std ...@@ -292,14 +286,12 @@ namespace std
^ std::hash<double>()(rState.mnFontWeight) ^ std::hash<double>()(rState.mnFontWeight)
^ size_t(rState.meTextAnchor) ^ size_t(rState.meTextAnchor)
^ size_t(rState.meTextDisplayAlign) ^ size_t(rState.meTextDisplayAlign)
^ std::hash<double>()(rState.mnTextLineIncrement)
^ size_t(rState.mbVisibility) ^ size_t(rState.mbVisibility)
^ size_t(rState.meFillType) ^ size_t(rState.meFillType)
^ std::hash<double>()(rState.mnFillOpacity) ^ std::hash<double>()(rState.mnFillOpacity)
^ std::hash<double>()(rState.mnOpacity) ^ std::hash<double>()(rState.mnOpacity)
^ size_t(rState.meStrokeType) ^ size_t(rState.meStrokeType)
^ std::hash<double>()(rState.mnStrokeOpacity) ^ std::hash<double>()(rState.mnStrokeOpacity)
^ size_t(rState.meViewportFillType)
^ std::hash<double>()(rState.mnViewportFillOpacity) ^ std::hash<double>()(rState.mnViewportFillOpacity)
^ size_t(rState.maFillColor.a) ^ size_t(rState.maFillColor.a)
^ size_t(rState.maFillColor.r) ^ size_t(rState.maFillColor.r)
......
...@@ -89,7 +89,6 @@ class Oxt_Handler : public ::cppu::WeakImplHelper< ...@@ -89,7 +89,6 @@ class Oxt_Handler : public ::cppu::WeakImplHelper<
osl::Mutex m_mutex; osl::Mutex m_mutex;
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; /// global uno service factory to create new services css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; /// global uno service factory to create new services
css::uno::Reference< css::uno::XInterface > m_xSelfHold; /// we must protect us against dying during async(!) dispatch() call!
css::uno::Reference< css::frame::XDispatchResultListener > m_xListener; css::uno::Reference< css::frame::XDispatchResultListener > m_xListener;
}; };
......
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