[Libreoffice-commits] core.git: compilerplugins/clang framework/inc framework/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Jul 4 08:52:12 UTC 2017
compilerplugins/clang/unusedfields.writeonly.results | 10 ----------
framework/inc/classes/rootactiontriggercontainer.hxx | 1 -
framework/inc/helper/statusindicatorfactory.hxx | 7 +------
framework/inc/uielement/uielement.hxx | 8 +-------
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 3 ---
framework/source/helper/statusindicatorfactory.cxx | 2 +-
framework/source/layoutmanager/layoutmanager.cxx | 10 ----------
framework/source/layoutmanager/uielement.cxx | 2 --
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 4 ----
9 files changed, 3 insertions(+), 44 deletions(-)
New commits:
commit 2b24fba09c3eaf5d412aa3c3135dfa403b92c788
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Jul 4 09:46:09 2017 +0200
loplugin:unusedfields in framework
Change-Id: Ibb602e037bcee518c31dfe9734a5c5773cff23ab
Reviewed-on: https://gerrit.libreoffice.org/39492
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 8ad874f1c892..4f8918808a3c 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -722,28 +722,18 @@ formula/source/ui/dlg/formula.cxx:150
formula::FormulaDlg_Impl m_pBinaryOpCodesEnd const sheet::FormulaOpCodeMapEntry *
formula/source/ui/dlg/parawin.hxx:85
formula::ParaWin bRefMode _Bool
-framework/inc/classes/rootactiontriggercontainer.hxx:96
- framework::RootActionTriggerContainer m_bInContainerCreation _Bool
framework/inc/dispatch/oxt_handler.hxx:92
framework::Oxt_Handler m_xSelfHold css::uno::Reference<css::uno::XInterface>
-framework/inc/helper/statusindicatorfactory.hxx:72
- framework::IndicatorInfo m_nRange sal_Int32
framework/inc/services/layoutmanager.hxx:262
framework::LayoutManager m_bGlobalSettings _Bool
framework/inc/services/layoutmanager.hxx:276
framework::LayoutManager m_pGlobalSettings class framework::GlobalSettings *
-framework/inc/uielement/uielement.hxx:100
- framework::UIElement m_bContextActive _Bool
-framework/inc/uielement/uielement.hxx:102
- framework::UIElement m_bSoftClose _Bool
framework/source/layoutmanager/toolbarlayoutmanager.hxx:281
framework::ToolbarLayoutManager m_pGlobalSettings class framework::GlobalSettings *
framework/source/layoutmanager/toolbarlayoutmanager.hxx:285
framework::ToolbarLayoutManager m_bGlobalSettings _Bool
framework/source/services/frame.cxx:420
(anonymous namespace)::Frame m_pWindowCommandDispatch class framework::WindowCommandDispatch *
-framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx:184
- (anonymous namespace)::ModuleUIConfigurationManager::UIElementType bDefaultLayer _Bool
hwpfilter/source/drawdef.h:69
BAREHWPDOProperty line_pstyle int
hwpfilter/source/drawdef.h:70
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index f67557f16923..1613ac6616ec 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -93,7 +93,6 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
void FillContainer();
bool m_bContainerCreated;
- bool m_bInContainerCreation;
VclPtr<const Menu> m_pMenu;
const OUString* m_pMenuIdentifier;
};
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 6424c292d9ba..a01b63e261e9 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -68,9 +68,6 @@ struct IndicatorInfo
/** @short the last set text for this indicator */
OUString m_sText;
- /** @short the max range for this indicator. */
- sal_Int32 m_nRange;
-
/** @short the last set value for this indicator */
sal_Int32 m_nValue;
@@ -89,12 +86,10 @@ struct IndicatorInfo
the max range for this indicator.
*/
IndicatorInfo(const css::uno::Reference< css::task::XStatusIndicator >& xIndicator,
- const OUString& sText ,
- sal_Int32 nRange )
+ const OUString& sText )
{
m_xIndicator = xIndicator;
m_sText = sText;
- m_nRange = nRange;
m_nValue = 0;
}
diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx
index 0a55739cdcf6..777485ce1bc5 100644
--- a/framework/inc/uielement/uielement.hxx
+++ b/framework/inc/uielement/uielement.hxx
@@ -61,9 +61,7 @@ struct UIElement
m_bUserActive( false ),
m_bMasterHide( false ),
m_bContextSensitive( false ),
- m_bContextActive( true ),
m_bNoClose( false ),
- m_bSoftClose( false ),
m_bStateRead( false ),
m_nStyle( ButtonType::SYMBOLONLY )
{}
@@ -79,9 +77,7 @@ struct UIElement
m_bUserActive( false ),
m_bMasterHide( false ),
m_bContextSensitive( false ),
- m_bContextActive( true ),
m_bNoClose( false ),
- m_bSoftClose( false ),
m_bStateRead( false ),
m_nStyle( ButtonType::SYMBOLONLY ) {}
@@ -96,10 +92,8 @@ struct UIElement
m_bVisible,
m_bUserActive,
m_bMasterHide,
- m_bContextSensitive,
- m_bContextActive;
+ m_bContextSensitive;
bool m_bNoClose,
- m_bSoftClose,
m_bStateRead;
ButtonType m_nStyle;
DockedData m_aDockedData;
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 7ca7f72933f6..327f7bdece81 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -46,7 +46,6 @@ static Sequence< sal_Int8 > const & impl_getStaticIdentifier()
RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier ) :
PropertySetContainer()
, m_bContainerCreated( false )
- , m_bInContainerCreation( false )
, m_pMenu( pMenu )
, m_pMenuIdentifier( pMenuIdentifier )
{
@@ -244,12 +243,10 @@ Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId()
void RootActionTriggerContainer::FillContainer()
{
m_bContainerCreated = true;
- m_bInContainerCreation = true;
Reference<XIndexContainer> xXIndexContainer( static_cast<OWeakObject *>(this), UNO_QUERY );
ActionTriggerHelper::FillActionTriggerContainerFromMenu(
xXIndexContainer,
m_pMenu );
- m_bInContainerCreation = false;
}
OUString RootActionTriggerContainer::getName()
{
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 577cabf82ac3..2d5563d1213c 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -124,7 +124,7 @@ void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatus
IndicatorStack::iterator pItem = ::std::find(m_aStack.begin(), m_aStack.end(), xChild);
if (pItem != m_aStack.end())
m_aStack.erase(pItem);
- IndicatorInfo aInfo(xChild, sText, nRange);
+ IndicatorInfo aInfo(xChild, sText);
m_aStack.push_back (aInfo );
m_xActiveChild = xChild;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 6533828a060c..591afd80fb5d 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -561,16 +561,6 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bNoClose = bValue;
}
- else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_CONTEXTACTIVE )
- {
- if ( aWindowState[n].Value >>= bValue )
- rElementData.m_bContextActive = bValue;
- }
- else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_SOFTCLOSE )
- {
- if ( aWindowState[n].Value >>= bValue )
- rElementData.m_bSoftClose = bValue;
- }
}
}
diff --git a/framework/source/layoutmanager/uielement.cxx b/framework/source/layoutmanager/uielement.cxx
index 44d42cafb186..be210277c6c0 100644
--- a/framework/source/layoutmanager/uielement.cxx
+++ b/framework/source/layoutmanager/uielement.cxx
@@ -107,9 +107,7 @@ UIElement& UIElement::operator= ( const UIElement& rUIElement )
m_bUserActive = rUIElement.m_bUserActive;
m_bMasterHide = rUIElement.m_bMasterHide;
m_bContextSensitive = rUIElement.m_bContextSensitive;
- m_bContextActive = rUIElement.m_bContextActive;
m_bNoClose = rUIElement.m_bNoClose;
- m_bSoftClose = rUIElement.m_bSoftClose;
m_bStateRead = rUIElement.m_bStateRead;
m_nStyle = rUIElement.m_nStyle;
m_aDockedData = rUIElement.m_aDockedData;
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 1b791577e438..a4a853febd34 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -176,12 +176,10 @@ private:
{
UIElementType() : bModified( false ),
bLoaded( false ),
- bDefaultLayer( false ),
nElementType( css::ui::UIElementType::UNKNOWN ) {}
bool bModified;
bool bLoaded;
- bool bDefaultLayer;
sal_Int16 nElementType;
UIElementDataHashMap aElementsHashMap;
css::uno::Reference< css::embed::XStorage > xStorage;
@@ -812,7 +810,6 @@ void ModuleUIConfigurationManager::impl_Initialize()
m_aUIElements[LAYER_USERDEFINED][i].nElementType = i;
m_aUIElements[LAYER_USERDEFINED][i].bModified = false;
m_aUIElements[LAYER_USERDEFINED][i].xStorage = xElementTypeStorage;
- m_aUIElements[LAYER_USERDEFINED][i].bDefaultLayer = false;
}
}
@@ -838,7 +835,6 @@ void ModuleUIConfigurationManager::impl_Initialize()
m_aUIElements[LAYER_DEFAULT][i].nElementType = i;
m_aUIElements[LAYER_DEFAULT][i].bModified = false;
m_aUIElements[LAYER_DEFAULT][i].xStorage = xElementTypeStorage;
- m_aUIElements[LAYER_DEFAULT][i].bDefaultLayer = true;
}
}
}
More information about the Libreoffice-commits
mailing list