[Libreoffice-commits] core.git: compilerplugins/clang extensions/source filter/inc framework/inc
Noel Grandin
noel.grandin at collabora.co.uk
Sat Jul 22 06:51:29 UTC 2017
compilerplugins/clang/unusedfields.readonly.results | 14 --------------
extensions/source/bibliography/bibbeam.cxx | 3 ---
extensions/source/bibliography/bibbeam.hxx | 1 -
extensions/source/bibliography/bibcont.cxx | 9 ---------
extensions/source/bibliography/bibcont.hxx | 3 ---
extensions/source/bibliography/framectr.cxx | 3 ---
extensions/source/bibliography/framectr.hxx | 1 -
filter/inc/gfxtypes.hxx | 8 --------
framework/inc/dispatch/oxt_handler.hxx | 1 -
9 files changed, 43 deletions(-)
New commits:
commit 3ff8ecb53ed53d138b4e435d6d048d8abb6cb0e9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Jul 21 12:22:49 2017 +0200
loplugin:unusedfields in extensions..framework
Change-Id: I687c67c8f3c0e03c6ab2da0a93a9e62f0caf12cd
Reviewed-on: https://gerrit.libreoffice.org/40292
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 1fb3f0f431cd..7d45f9e52041 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -284,14 +284,6 @@ embeddedobj/source/inc/oleembobj.hxx:170
OleEmbeddedObject m_nStatusAspect sal_Int64
embeddedobj/source/inc/oleembobj.hxx:184
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
pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet
extensions/source/propctrlr/eformshelper.hxx:64
@@ -300,10 +292,6 @@ extensions/source/propctrlr/propertyhandler.hxx:80
pcr::PropertyHandler m_aEnsureResAccess class pcr::PcrClient
extensions/source/scanner/scanner.hxx:46
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
PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice>
filter/source/graphicfilter/icgm/chart.hxx:44
@@ -340,8 +328,6 @@ formula/source/ui/dlg/structpg.hxx:68
formula::StructPage m_aModuleClient class formula::OModuleClient
framework/inc/dispatch/dispatchprovider.hxx:81
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
(anonymous namespace)::ModuleUIConfigurationManager::UIElementType aElementsHashMap (anonymous namespace)::ModuleUIConfigurationManager::UIElementDataHashMap
framework/source/uiconfiguration/uiconfigurationmanager.cxx:164
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 4637a3f41c62..5b69893dfe72 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -203,9 +203,6 @@ namespace bib
if ( isFormConnected() )
disconnectForm();
- if ( m_xToolBarRef.is() )
- m_xToolBarRef->dispose();
-
if ( pToolBar )
pDatMan->SetToolbar(nullptr);
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index b69aa41b8fe9..21d557dd711b 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -45,7 +45,6 @@ namespace bib
private:
css::uno::Reference< css::frame::XController > m_xController;
- css::uno::Reference< css::frame::XFrame > m_xToolBarRef;
BibDataManager* pDatMan;
VclPtr<BibToolBar> pToolBar;
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 9266949b1159..f06869b2e314 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -126,11 +126,6 @@ BibBookContainer::~BibBookContainer()
void BibBookContainer::dispose()
{
- if( xTopFrameRef.is() )
- xTopFrameRef->dispose();
- if( xBottomFrameRef.is() )
- xBottomFrameRef->dispose();
-
if( pTopWin )
{
VclPtr<vcl::Window> pDel = pTopWin;
@@ -166,8 +161,6 @@ IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Timer*, void)
void BibBookContainer::createTopFrame( BibShortCutHandler* pWin )
{
- if ( xTopFrameRef.is() ) xTopFrameRef->dispose();
-
if(pTopWin)
{
RemoveItem(TOP_WINDOW);
@@ -183,8 +176,6 @@ void BibBookContainer::createTopFrame( BibShortCutHandler* pWin )
void BibBookContainer::createBottomFrame( BibShortCutHandler* pWin )
{
- if ( xBottomFrameRef.is() ) xBottomFrameRef->dispose();
-
if(pBottomWin)
{
RemoveItem(BOTTOM_WINDOW);
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 996c408340ef..8574f36dc4ba 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -64,9 +64,6 @@ class BibBookContainer: public BibSplitWindow
{
private:
- css::uno::Reference< css::frame::XFrame > xTopFrameRef;
- css::uno::Reference< css::frame::XFrame > xBottomFrameRef;
-
VclPtr<BibWindowContainer> pTopWin;
VclPtr<BibWindowContainer> pBottomWin;
HdlBibModul pBibMod;
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 4f7f811fb5a5..b5cfe93794b7 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -163,7 +163,6 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi
BibDataManager* pDataManager)
:xWindow( xComponent )
,m_xDatMan( pDataManager )
- ,pBibMod(nullptr)
{
bDisposing=false;
bHierarchical=true;
@@ -175,8 +174,6 @@ BibFrameController_Impl::~BibFrameController_Impl()
{
mxImpl->pController = nullptr;
m_xDatMan.clear();
- if(pBibMod)
- CloseBibModul(pBibMod);
}
OUString SAL_CALL BibFrameController_Impl::getImplementationName()
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 7a46633c34db..524eb8ed0317 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -67,7 +67,6 @@ friend class BibFrameCtrl_Impl;
bool bDisposing;
bool bHierarchical;
rtl::Reference<BibDataManager> m_xDatMan;
- HdlBibModul pBibMod;
DECL_LINK( DisposeHdl, void*, void );
diff --git a/filter/inc/gfxtypes.hxx b/filter/inc/gfxtypes.hxx
index 6b6951f11b47..e6404def6c98 100644
--- a/filter/inc/gfxtypes.hxx
+++ b/filter/inc/gfxtypes.hxx
@@ -149,7 +149,6 @@ struct State
mnFontWeight(400.0),
meTextAnchor(BEFORE),
meTextDisplayAlign(BEFORE),
- mnTextLineIncrement(0.0),
maCurrentColor(0.0),
mbVisibility(true),
meFillType(SOLID),
@@ -157,7 +156,6 @@ struct State
mnOpacity(1.0),
meStrokeType(NONE),
mnStrokeOpacity(1.0),
- meViewportFillType(NONE),
mnViewportFillOpacity(1.0),
maFillColor(0.0),
maFillGradient(Gradient::LINEAR),
@@ -191,7 +189,6 @@ struct State
TextAlign meTextAnchor; // text-anchor
TextAlign meTextDisplayAlign; // display-align
- double mnTextLineIncrement; // 0.0 means auto
ARGBColor maCurrentColor;
bool mbVisibility;
@@ -201,7 +198,6 @@ struct State
double mnOpacity;
PaintType meStrokeType;
double mnStrokeOpacity;
- PaintType meViewportFillType;
double mnViewportFillOpacity;
ARGBColor maFillColor;
@@ -238,7 +234,6 @@ inline bool operator==(const State& rLHS, const State& rRHS )
rLHS.mnFontWeight==rRHS.mnFontWeight &&
rLHS.meTextAnchor==rRHS.meTextAnchor &&
rLHS.meTextDisplayAlign==rRHS.meTextDisplayAlign &&
- rLHS.mnTextLineIncrement==rRHS.mnTextLineIncrement &&
rLHS.maCurrentColor==rRHS.maCurrentColor &&
rLHS.mbVisibility==rRHS.mbVisibility &&
rLHS.meFillType==rRHS.meFillType &&
@@ -246,7 +241,6 @@ inline bool operator==(const State& rLHS, const State& rRHS )
rLHS.mnOpacity==rRHS.mnOpacity &&
rLHS.meStrokeType==rRHS.meStrokeType &&
rLHS.mnStrokeOpacity==rRHS.mnStrokeOpacity &&
- rLHS.meViewportFillType==rRHS.meViewportFillType &&
rLHS.mnViewportFillOpacity==rRHS.mnViewportFillOpacity &&
rLHS.maFillColor==rRHS.maFillColor &&
rLHS.maFillGradient==rRHS.maFillGradient &&
@@ -292,14 +286,12 @@ namespace std
^ std::hash<double>()(rState.mnFontWeight)
^ size_t(rState.meTextAnchor)
^ size_t(rState.meTextDisplayAlign)
- ^ std::hash<double>()(rState.mnTextLineIncrement)
^ size_t(rState.mbVisibility)
^ size_t(rState.meFillType)
^ std::hash<double>()(rState.mnFillOpacity)
^ std::hash<double>()(rState.mnOpacity)
^ size_t(rState.meStrokeType)
^ std::hash<double>()(rState.mnStrokeOpacity)
- ^ size_t(rState.meViewportFillType)
^ std::hash<double>()(rState.mnViewportFillOpacity)
^ size_t(rState.maFillColor.a)
^ size_t(rState.maFillColor.r)
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 03143577c51e..ccdc70d29366 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -89,7 +89,6 @@ class Oxt_Handler : public ::cppu::WeakImplHelper<
osl::Mutex m_mutex;
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;
};
More information about the Libreoffice-commits
mailing list