Kaydet (Commit) 2b24fba0 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in framework

Change-Id: Ibb602e037bcee518c31dfe9734a5c5773cff23ab
Reviewed-on: https://gerrit.libreoffice.org/39492Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst dd74a659
...@@ -722,28 +722,18 @@ formula/source/ui/dlg/formula.cxx:150 ...@@ -722,28 +722,18 @@ formula/source/ui/dlg/formula.cxx:150
formula::FormulaDlg_Impl m_pBinaryOpCodesEnd const sheet::FormulaOpCodeMapEntry * formula::FormulaDlg_Impl m_pBinaryOpCodesEnd const sheet::FormulaOpCodeMapEntry *
formula/source/ui/dlg/parawin.hxx:85 formula/source/ui/dlg/parawin.hxx:85
formula::ParaWin bRefMode _Bool formula::ParaWin bRefMode _Bool
framework/inc/classes/rootactiontriggercontainer.hxx:96
framework::RootActionTriggerContainer m_bInContainerCreation _Bool
framework/inc/dispatch/oxt_handler.hxx:92 framework/inc/dispatch/oxt_handler.hxx:92
framework::Oxt_Handler m_xSelfHold css::uno::Reference<css::uno::XInterface> 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/inc/services/layoutmanager.hxx:262
framework::LayoutManager m_bGlobalSettings _Bool framework::LayoutManager m_bGlobalSettings _Bool
framework/inc/services/layoutmanager.hxx:276 framework/inc/services/layoutmanager.hxx:276
framework::LayoutManager m_pGlobalSettings class framework::GlobalSettings * 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/source/layoutmanager/toolbarlayoutmanager.hxx:281
framework::ToolbarLayoutManager m_pGlobalSettings class framework::GlobalSettings * framework::ToolbarLayoutManager m_pGlobalSettings class framework::GlobalSettings *
framework/source/layoutmanager/toolbarlayoutmanager.hxx:285 framework/source/layoutmanager/toolbarlayoutmanager.hxx:285
framework::ToolbarLayoutManager m_bGlobalSettings _Bool framework::ToolbarLayoutManager m_bGlobalSettings _Bool
framework/source/services/frame.cxx:420 framework/source/services/frame.cxx:420
(anonymous namespace)::Frame m_pWindowCommandDispatch class framework::WindowCommandDispatch * (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 hwpfilter/source/drawdef.h:69
BAREHWPDOProperty line_pstyle int BAREHWPDOProperty line_pstyle int
hwpfilter/source/drawdef.h:70 hwpfilter/source/drawdef.h:70
......
...@@ -93,7 +93,6 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, ...@@ -93,7 +93,6 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
void FillContainer(); void FillContainer();
bool m_bContainerCreated; bool m_bContainerCreated;
bool m_bInContainerCreation;
VclPtr<const Menu> m_pMenu; VclPtr<const Menu> m_pMenu;
const OUString* m_pMenuIdentifier; const OUString* m_pMenuIdentifier;
}; };
......
...@@ -68,9 +68,6 @@ struct IndicatorInfo ...@@ -68,9 +68,6 @@ struct IndicatorInfo
/** @short the last set text for this indicator */ /** @short the last set text for this indicator */
OUString m_sText; OUString m_sText;
/** @short the max range for this indicator. */
sal_Int32 m_nRange;
/** @short the last set value for this indicator */ /** @short the last set value for this indicator */
sal_Int32 m_nValue; sal_Int32 m_nValue;
...@@ -89,12 +86,10 @@ struct IndicatorInfo ...@@ -89,12 +86,10 @@ struct IndicatorInfo
the max range for this indicator. the max range for this indicator.
*/ */
IndicatorInfo(const css::uno::Reference< css::task::XStatusIndicator >& xIndicator, IndicatorInfo(const css::uno::Reference< css::task::XStatusIndicator >& xIndicator,
const OUString& sText , const OUString& sText )
sal_Int32 nRange )
{ {
m_xIndicator = xIndicator; m_xIndicator = xIndicator;
m_sText = sText; m_sText = sText;
m_nRange = nRange;
m_nValue = 0; m_nValue = 0;
} }
......
...@@ -61,9 +61,7 @@ struct UIElement ...@@ -61,9 +61,7 @@ struct UIElement
m_bUserActive( false ), m_bUserActive( false ),
m_bMasterHide( false ), m_bMasterHide( false ),
m_bContextSensitive( false ), m_bContextSensitive( false ),
m_bContextActive( true ),
m_bNoClose( false ), m_bNoClose( false ),
m_bSoftClose( false ),
m_bStateRead( false ), m_bStateRead( false ),
m_nStyle( ButtonType::SYMBOLONLY ) m_nStyle( ButtonType::SYMBOLONLY )
{} {}
...@@ -79,9 +77,7 @@ struct UIElement ...@@ -79,9 +77,7 @@ struct UIElement
m_bUserActive( false ), m_bUserActive( false ),
m_bMasterHide( false ), m_bMasterHide( false ),
m_bContextSensitive( false ), m_bContextSensitive( false ),
m_bContextActive( true ),
m_bNoClose( false ), m_bNoClose( false ),
m_bSoftClose( false ),
m_bStateRead( false ), m_bStateRead( false ),
m_nStyle( ButtonType::SYMBOLONLY ) {} m_nStyle( ButtonType::SYMBOLONLY ) {}
...@@ -96,10 +92,8 @@ struct UIElement ...@@ -96,10 +92,8 @@ struct UIElement
m_bVisible, m_bVisible,
m_bUserActive, m_bUserActive,
m_bMasterHide, m_bMasterHide,
m_bContextSensitive, m_bContextSensitive;
m_bContextActive;
bool m_bNoClose, bool m_bNoClose,
m_bSoftClose,
m_bStateRead; m_bStateRead;
ButtonType m_nStyle; ButtonType m_nStyle;
DockedData m_aDockedData; DockedData m_aDockedData;
......
...@@ -46,7 +46,6 @@ static Sequence< sal_Int8 > const & impl_getStaticIdentifier() ...@@ -46,7 +46,6 @@ static Sequence< sal_Int8 > const & impl_getStaticIdentifier()
RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier ) : RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier ) :
PropertySetContainer() PropertySetContainer()
, m_bContainerCreated( false ) , m_bContainerCreated( false )
, m_bInContainerCreation( false )
, m_pMenu( pMenu ) , m_pMenu( pMenu )
, m_pMenuIdentifier( pMenuIdentifier ) , m_pMenuIdentifier( pMenuIdentifier )
{ {
...@@ -244,12 +243,10 @@ Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId() ...@@ -244,12 +243,10 @@ Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId()
void RootActionTriggerContainer::FillContainer() void RootActionTriggerContainer::FillContainer()
{ {
m_bContainerCreated = true; m_bContainerCreated = true;
m_bInContainerCreation = true;
Reference<XIndexContainer> xXIndexContainer( static_cast<OWeakObject *>(this), UNO_QUERY ); Reference<XIndexContainer> xXIndexContainer( static_cast<OWeakObject *>(this), UNO_QUERY );
ActionTriggerHelper::FillActionTriggerContainerFromMenu( ActionTriggerHelper::FillActionTriggerContainerFromMenu(
xXIndexContainer, xXIndexContainer,
m_pMenu ); m_pMenu );
m_bInContainerCreation = false;
} }
OUString RootActionTriggerContainer::getName() OUString RootActionTriggerContainer::getName()
{ {
......
...@@ -124,7 +124,7 @@ void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatus ...@@ -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); IndicatorStack::iterator pItem = ::std::find(m_aStack.begin(), m_aStack.end(), xChild);
if (pItem != m_aStack.end()) if (pItem != m_aStack.end())
m_aStack.erase(pItem); m_aStack.erase(pItem);
IndicatorInfo aInfo(xChild, sText, nRange); IndicatorInfo aInfo(xChild, sText);
m_aStack.push_back (aInfo ); m_aStack.push_back (aInfo );
m_xActiveChild = xChild; m_xActiveChild = xChild;
......
...@@ -561,16 +561,6 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem ...@@ -561,16 +561,6 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem
if ( aWindowState[n].Value >>= bValue ) if ( aWindowState[n].Value >>= bValue )
rElementData.m_bNoClose = 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;
}
} }
} }
......
...@@ -107,9 +107,7 @@ UIElement& UIElement::operator= ( const UIElement& rUIElement ) ...@@ -107,9 +107,7 @@ UIElement& UIElement::operator= ( const UIElement& rUIElement )
m_bUserActive = rUIElement.m_bUserActive; m_bUserActive = rUIElement.m_bUserActive;
m_bMasterHide = rUIElement.m_bMasterHide; m_bMasterHide = rUIElement.m_bMasterHide;
m_bContextSensitive = rUIElement.m_bContextSensitive; m_bContextSensitive = rUIElement.m_bContextSensitive;
m_bContextActive = rUIElement.m_bContextActive;
m_bNoClose = rUIElement.m_bNoClose; m_bNoClose = rUIElement.m_bNoClose;
m_bSoftClose = rUIElement.m_bSoftClose;
m_bStateRead = rUIElement.m_bStateRead; m_bStateRead = rUIElement.m_bStateRead;
m_nStyle = rUIElement.m_nStyle; m_nStyle = rUIElement.m_nStyle;
m_aDockedData = rUIElement.m_aDockedData; m_aDockedData = rUIElement.m_aDockedData;
......
...@@ -176,12 +176,10 @@ private: ...@@ -176,12 +176,10 @@ private:
{ {
UIElementType() : bModified( false ), UIElementType() : bModified( false ),
bLoaded( false ), bLoaded( false ),
bDefaultLayer( false ),
nElementType( css::ui::UIElementType::UNKNOWN ) {} nElementType( css::ui::UIElementType::UNKNOWN ) {}
bool bModified; bool bModified;
bool bLoaded; bool bLoaded;
bool bDefaultLayer;
sal_Int16 nElementType; sal_Int16 nElementType;
UIElementDataHashMap aElementsHashMap; UIElementDataHashMap aElementsHashMap;
css::uno::Reference< css::embed::XStorage > xStorage; css::uno::Reference< css::embed::XStorage > xStorage;
...@@ -812,7 +810,6 @@ void ModuleUIConfigurationManager::impl_Initialize() ...@@ -812,7 +810,6 @@ void ModuleUIConfigurationManager::impl_Initialize()
m_aUIElements[LAYER_USERDEFINED][i].nElementType = i; m_aUIElements[LAYER_USERDEFINED][i].nElementType = i;
m_aUIElements[LAYER_USERDEFINED][i].bModified = false; m_aUIElements[LAYER_USERDEFINED][i].bModified = false;
m_aUIElements[LAYER_USERDEFINED][i].xStorage = xElementTypeStorage; m_aUIElements[LAYER_USERDEFINED][i].xStorage = xElementTypeStorage;
m_aUIElements[LAYER_USERDEFINED][i].bDefaultLayer = false;
} }
} }
...@@ -838,7 +835,6 @@ void ModuleUIConfigurationManager::impl_Initialize() ...@@ -838,7 +835,6 @@ void ModuleUIConfigurationManager::impl_Initialize()
m_aUIElements[LAYER_DEFAULT][i].nElementType = i; m_aUIElements[LAYER_DEFAULT][i].nElementType = i;
m_aUIElements[LAYER_DEFAULT][i].bModified = false; m_aUIElements[LAYER_DEFAULT][i].bModified = false;
m_aUIElements[LAYER_DEFAULT][i].xStorage = xElementTypeStorage; m_aUIElements[LAYER_DEFAULT][i].xStorage = xElementTypeStorage;
m_aUIElements[LAYER_DEFAULT][i].bDefaultLayer = true;
} }
} }
} }
......
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