diff options
30 files changed, 5 insertions, 111 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index c8b7f55c476d..0b2bb82bf75f 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -749,7 +749,7 @@ void OGridControlModel::impl_replacedElement( const ContainerEvent& _rEvent, ::o ElementDescription* OGridControlModel::createElementMetaData( ) { - return new ColumnDescription; + return new ElementDescription; } void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxObject, ElementDescription* _pElement ) @@ -758,9 +758,6 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO if ( !pCol ) throw IllegalArgumentException(); OInterfaceContainer::approveNewElement( _rxObject, _pElement ); - // if we're here, the object passed all tests - if ( _pElement ) - static_cast< ColumnDescription* >( _pElement )->pColumn = pCol; } // XPersistObject diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index 63811a77812e..716aab920ab2 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -40,13 +40,6 @@ namespace frm class OGridColumn; - struct ColumnDescription : public ElementDescription - { - public: - OGridColumn* pColumn; // not owned by this instance! only to prevent duplicate XUnoTunnel usage - }; - - // OGridControlModel typedef ::cppu::ImplHelper7 < css::awt::XControlModel diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 3590d2e3c747..fb8d5b783808 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -450,7 +450,6 @@ namespace frm ,m_xGraphicObject() ,m_pMedium(nullptr) ,m_bDispatchUrlInternal(false) - ,m_bDownloading(false) ,m_bProdStarted(false) { implConstruct(); @@ -464,7 +463,6 @@ namespace frm ,m_xGraphicObject( _pOriginal->m_xGraphicObject ) ,m_pMedium( nullptr ) ,m_bDispatchUrlInternal(false) - ,m_bDownloading( false ) ,m_bProdStarted( false ) { implConstruct(); @@ -676,7 +674,6 @@ namespace frm else // caution: the medium may be NULL if somebody gave us an invalid URL to work with pImgProd->SetImage(OUString()); - m_bDownloading = false; return; } if (m_pMedium->GetErrorCode()==ERRCODE_NONE) @@ -692,7 +689,6 @@ namespace frm pImgProd->SetImage(OUString()); delete m_pMedium; m_pMedium = nullptr; - m_bDownloading = false; } } @@ -781,9 +777,6 @@ namespace frm } #endif - // Set downloading flag to true. They will be Data Available Links, - // if get to the pending staus. - m_bDownloading = true; m_bProdStarted = false; // Kick off download (caution: can be synchronous). @@ -810,7 +803,6 @@ namespace frm void OClickableImageBaseModel::DownloadDone() { DataAvailable(); - m_bDownloading = false; } diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index bb1ac3dfa553..665f2d6ecbeb 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -69,7 +69,6 @@ namespace frm SfxMedium* m_pMedium; // Download medium rtl::Reference<ImageProducer> m_xProducer; bool m_bDispatchUrlInternal; // property: is not allowed to set : 1 - bool m_bDownloading : 1; // Is a download in progress? bool m_bProdStarted : 1; // XSubmission stuff diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx index c11664308295..d65b5b0e73ca 100644 --- a/forms/source/xforms/xformsevent.cxx +++ b/forms/source/xforms/xformsevent.cxx @@ -70,8 +70,6 @@ css::util::Time SAL_CALL XFormsEventConcrete::getTimeStamp() void SAL_CALL XFormsEventConcrete::stopPropagation() { - if(m_cancelable) - m_canceled = true; } void SAL_CALL XFormsEventConcrete::preventDefault() { diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx index 3bdfb857cbe3..db163295dc88 100644 --- a/forms/source/xforms/xformsevent.hxx +++ b/forms/source/xforms/xformsevent.hxx @@ -35,8 +35,7 @@ class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > { public: XFormsEventConcrete() - : m_canceled(false) - , m_bubbles(false) + : m_bubbles(false) , m_cancelable(false) { } @@ -61,10 +60,6 @@ class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > { sal_Bool canBubbleArg, sal_Bool cancelableArg) override; - private: - - bool m_canceled; - protected: OUString m_eventType; diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index c03d420ff00c..1607d3f4aea1 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -177,7 +177,6 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits ) , m_nWidth( 0 ) , m_nHeight( 0 ) , m_pCurrentAsyncAction( nullptr ) - , m_pFileNotifier( nullptr ) , m_pSplitter( nullptr ) , m_pFileView( nullptr ) , m_pContainer( nullptr ) @@ -1311,9 +1310,8 @@ void RemoteFilesDialog::FilterSelect() { } -void RemoteFilesDialog::SetFileCallback( ::svt::IFilePickerListener *pNotifier ) +void RemoteFilesDialog::SetFileCallback( ::svt::IFilePickerListener * ) { - m_pFileNotifier = pNotifier; } void RemoteFilesDialog::onAsyncOperationStarted() diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 08907f95ce29..36dbe624ccb1 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -146,7 +146,6 @@ private: ::rtl::Reference< ::svt::AsyncPickerAction > m_pCurrentAsyncAction; css::uno::Sequence< OUString > m_aBlackList; - ::svt::IFilePickerListener* m_pFileNotifier; VclPtr< PushButton > m_pOk_btn; VclPtr< CancelButton > m_pCancel_btn; diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 21195cda7b8f..8f69f135baca 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1923,8 +1923,6 @@ short SvtFileDialog::PrepareExecute() pImpl->SelectFilterListEntry( aAll ); } - pImpl->_pDefaultFilter = pImpl->GetCurFilter(); - // if applicable isolate filter OUString aFilter; diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 6dd1d396e7ab..e45764e7782e 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -232,7 +232,6 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl() : _nStyle ( PickerFlags::NONE ), _bDoubleClick ( false ), m_bNeedDelayedFilterExecute ( false ), - _pDefaultFilter ( nullptr ), _bMultiSelection ( false ) { } diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index e948c8885c15..521871d2473f 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -165,10 +165,6 @@ public: bool _bDoubleClick; bool m_bNeedDelayedFilterExecute; - // list of the 5 most recently used filters - // Defaultfilter for <All> or <All ...> - const SvtFileDialogFilter_Impl* _pDefaultFilter; - // MultiSelection? bool _bMultiSelection; diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 0f32f39f04e7..f67557f16923 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_bContainerChanged; bool m_bInContainerCreation; VclPtr<const Menu> m_pMenu; const OUString* m_pMenuIdentifier; diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index e5abb700de58..d5fb6425adfa 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -252,16 +252,12 @@ namespace framework css::uno::Reference< css::awt::XWindow > m_xContainerWindow; css::uno::Reference< css::awt::XTopWindow2 > m_xContainerTopWindow; sal_Int32 m_nLockCount; - bool m_bActive; bool m_bInplaceMenuSet; bool m_bMenuVisible; - bool m_bComponentAttached; - bool m_bDoLayout; bool m_bVisible; bool m_bParentWindowVisible; bool m_bMustDoLayout; bool m_bAutomaticToolbars; - bool m_bStoreWindowState; bool m_bHideCurrentUI; bool m_bGlobalSettings; bool m_bPreserveContentSize; diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx index 8f5ba552bd93..759bf5ef6cac 100644 --- a/framework/inc/uielement/statusbaritem.hxx +++ b/framework/inc/uielement/statusbaritem.hxx @@ -39,7 +39,6 @@ class StatusbarItem : protected cppu::BaseMutex, public: explicit StatusbarItem( StatusBar *pStatusBar, - AddonStatusbarItemData *pItemData, sal_uInt16 nId, const rtl::OUString& aCommand ); virtual ~StatusbarItem() override; @@ -69,7 +68,6 @@ public: private: VclPtr<StatusBar> m_pStatusBar; - AddonStatusbarItemData *m_pItemData; sal_uInt16 m_nId; sal_uInt16 m_nStyle; rtl::OUString m_aCommand; diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx index ab5f532193f8..7e593734cbcd 100644 --- a/framework/inc/uielement/statusbarmerger.hxx +++ b/framework/inc/uielement/statusbarmerger.hxx @@ -29,7 +29,6 @@ namespace framework struct AddonStatusbarItemData { rtl::OUString aLabel; - StatusBarItemBits nItemBits; }; struct AddonStatusbarItem diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 2058a215e2d1..fe134597bc90 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -98,7 +98,6 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax: bool m_bImageContainerStartFound; bool m_bImageContainerEndFound; bool m_bImagesStartFound; - bool m_bImageStartFound; bool m_bExternalImagesStartFound; bool m_bExternalImageStartFound; sal_Int32 m_nHashMaskModeBitmap; diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index a6e64294c97c..36da36b9294c 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -102,7 +102,6 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : css::uno::Reference< css::xml::sax::XLocator > m_xLocator; sal_Int32 m_nHashCode_Style_Radio; - sal_Int32 m_nHashCode_Style_Auto; sal_Int32 m_nHashCode_Style_Left; sal_Int32 m_nHashCode_Style_AutoSize; sal_Int32 m_nHashCode_Style_DropDown; diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index ef495b486cef..7ca7f72933f6 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_bContainerChanged( false ) , m_bInContainerCreation( false ) , m_pMenu( pMenu ) , m_pMenuIdentifier( pMenuIdentifier ) @@ -123,8 +122,6 @@ void SAL_CALL RootActionTriggerContainer::insertByIndex( sal_Int32 Index, const if ( !m_bContainerCreated ) FillContainer(); - if ( !m_bInContainerCreation ) - m_bContainerChanged = true; PropertySetContainer::insertByIndex( Index, Element ); } @@ -135,8 +132,6 @@ void SAL_CALL RootActionTriggerContainer::removeByIndex( sal_Int32 Index ) if ( !m_bContainerCreated ) FillContainer(); - if ( !m_bInContainerCreation ) - m_bContainerChanged = true; PropertySetContainer::removeByIndex( Index ); } @@ -148,8 +143,6 @@ void SAL_CALL RootActionTriggerContainer::replaceByIndex( sal_Int32 Index, const if ( !m_bContainerCreated ) FillContainer(); - if ( !m_bInContainerCreation ) - m_bContainerChanged = true; PropertySetContainer::replaceByIndex( Index, Element ); } diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 86c707e3deb1..6ed845d579df 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -192,7 +192,6 @@ namespace framework private: ::osl::Mutex m_aMutex; ::osl::Mutex m_aQueueMutex; - bool m_disposed; bool m_bAPIActionRunning; bool m_bProcessingEvents; sal_Int32 m_nLockCount; @@ -213,7 +212,6 @@ namespace framework explicit UndoManagerHelper_Impl( IUndoManagerImplementation& i_undoManagerImpl ) :m_aMutex() ,m_aQueueMutex() - ,m_disposed( false ) ,m_bAPIActionRunning( false ) ,m_bProcessingEvents( false ) ,m_nLockCount( 0 ) @@ -318,8 +316,6 @@ namespace framework ::osl::MutexGuard aGuard( m_aMutex ); getUndoManager().RemoveUndoListener( *this ); - - m_disposed = true; } UndoManagerEvent UndoManagerHelper_Impl::buildEvent( OUString const& i_title ) const diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index d73445dd847f..4076a489d0a0 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -152,7 +152,6 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde // pre-calculate a hash code for all style strings to speed up xml read process m_nHashCode_Style_Radio = OUString( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode(); - m_nHashCode_Style_Auto = OUString( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode(); m_nHashCode_Style_Left = OUString( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode(); m_nHashCode_Style_AutoSize = OUString( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode(); m_nHashCode_Style_DropDown = OUString( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode(); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 14364f7c6c2b..10704e784b79 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -106,11 +106,8 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : , m_xContext( xContext ) , m_xURLTransformer( URLTransformer::create(xContext) ) , m_nLockCount( 0 ) - , m_bActive( false ) , m_bInplaceMenuSet( false ) , m_bMenuVisible( true ) - , m_bComponentAttached( false ) - , m_bDoLayout( false ) , m_bVisible( true ) , m_bParentWindowVisible( false ) , m_bMustDoLayout( true ) @@ -119,7 +116,6 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : #else , m_bAutomaticToolbars( false ) #endif - , m_bStoreWindowState( false ) , m_bHideCurrentUI( false ) , m_bGlobalSettings( false ) , m_bPreserveContentSize( false ) @@ -380,7 +376,6 @@ void LayoutManager::implts_reset( bool bAttached ) SolarMutexClearableGuard aWriteLock; m_xModel = xModel; m_aDockingArea = awt::Rectangle(); - m_bComponentAttached = bAttached; m_aModuleIdentifier = aModuleIdentifier; m_xModuleCfgMgr = xModCfgMgr; m_xDocCfgMgr = xDokCfgMgr; @@ -623,8 +618,6 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI SolarMutexResettableGuard aWriteLock; Reference< XNameAccess > xPersistentWindowState( m_xPersistentWindowState ); - // set flag to determine that we triggered the notification - m_bStoreWindowState = true; aWriteLock.clear(); bool bPersistent( false ); @@ -691,7 +684,6 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI // Reset flag aWriteLock.reset(); - m_bStoreWindowState = false; aWriteLock.clear(); } @@ -2295,7 +2287,6 @@ bool LayoutManager::implts_doLayout( bool bForceRequestBorderSpace, bool bOuterR bLayouted = true; SolarMutexResettableGuard aWriteGuard; - m_bDoLayout = true; aWriteGuard.clear(); awt::Rectangle aDockSpace( implts_calcDockingAreaSizes() ); @@ -2378,7 +2369,6 @@ bool LayoutManager::implts_doLayout( bool bForceRequestBorderSpace, bool bOuterR xDockingAreaAcceptor->setDockingAreaSpace( aBorderSpace ); aWriteGuard.reset(); - m_bDoLayout = false; aWriteGuard.clear(); } } @@ -2723,7 +2713,6 @@ void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent ) SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::frameAction (COMPONENT_ATTACHED|REATTACHED)" ); SolarMutexClearableGuard aWriteLock; - m_bComponentAttached = true; m_bMustDoLayout = true; aWriteLock.clear(); @@ -2735,20 +2724,12 @@ void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent ) { SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::frameAction (FRAME_UI_ACTIVATED|DEACTIVATING)" ); - SolarMutexClearableGuard aWriteLock; - m_bActive = ( aEvent.Action == FrameAction_FRAME_UI_ACTIVATED ); - aWriteLock.clear(); - implts_toggleFloatingUIElementsVisibility( aEvent.Action == FrameAction_FRAME_UI_ACTIVATED ); } else if ( aEvent.Action == FrameAction_COMPONENT_DETACHING ) { SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::frameAction (COMPONENT_DETACHING)" ); - SolarMutexClearableGuard aWriteLock; - m_bComponentAttached = false; - aWriteLock.clear(); - implts_reset( false ); } } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 1018583495ea..37c86960a9b5 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -63,7 +63,6 @@ ToolbarLayoutManager::ToolbarLayoutManager( m_pGlobalSettings( nullptr ), m_bComponentAttached( false ), m_bLayoutDirty( false ), - m_bStoreWindowState( false ), m_bGlobalSettings( false ), m_bDockingInProgress( false ), m_bLayoutInProgress( false ), @@ -1563,7 +1562,6 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen { SolarMutexResettableGuard aWriteLock; uno::Reference< container::XNameAccess > xPersistentWindowState( m_xPersistentWindowState ); - m_bStoreWindowState = true; // set flag to determine that we triggered the notification aWriteLock.clear(); bool bPersistent( false ); @@ -1633,7 +1631,6 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen // Reset flag aWriteLock.reset(); - m_bStoreWindowState = false; aWriteLock.clear(); } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 4e646c2701fc..4f92f6be5029 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -282,7 +282,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW bool m_bComponentAttached; bool m_bLayoutDirty; - bool m_bStoreWindowState; bool m_bGlobalSettings; bool m_bDockingInProgress; bool m_bLayoutInProgress; diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 33204d94e994..0067e8cd9c3e 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -172,8 +172,6 @@ private: ::cppu::OPropertyArrayHelper* m_pPropHelp; - bool m_bIgnoreEvents; - public: /** initialize a new instance of this class. @@ -448,7 +446,6 @@ PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentConte , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) , m_xContext (xContext) , m_pPropHelp(nullptr ) - , m_bIgnoreEvents(false) { } @@ -644,8 +641,6 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) { - m_bIgnoreEvents = true; - css::uno::Reference< css::container::XNameAccess > xCfgNew = fa_getCfgNew(); css::uno::Reference< css::container::XNameAccess > xCfgOld = fa_getCfgOld(); @@ -683,8 +678,6 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) xProps->setPropertyValue(aResubstPath.sPathName, css::uno::Any()); ::comphelper::ConfigurationHelper::flush(xCfgOld); } - - m_bIgnoreEvents = false; } void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index 2c47706d0a6e..a4b02738fe9a 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -63,12 +63,10 @@ sal_uInt16 impl_convertItemBitsToItemStyle( StatusBarItemBits nItemBits ) StatusbarItem::StatusbarItem( StatusBar *pStatusBar, - AddonStatusbarItemData *pItemData, sal_uInt16 nId, const rtl::OUString& aCommand ) : StatusbarItem_Base( m_aMutex ) , m_pStatusBar( pStatusBar ) - , m_pItemData( pItemData ) , m_nId( nId ) , m_nStyle( 0 ) , m_aCommand( aCommand ) @@ -85,7 +83,6 @@ StatusbarItem::~StatusbarItem() void SAL_CALL StatusbarItem::disposing() { osl::MutexGuard aGuard( m_aMutex ); - m_pItemData = nullptr; m_pStatusBar = nullptr; } diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index ffc08e97bb89..4b7c4319d573 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -297,7 +297,7 @@ void StatusBarManager::CreateControllers() uno::Reference< frame::XStatusbarController > xController; AddonStatusbarItemData *pItemData = static_cast< AddonStatusbarItemData *>( m_pStatusBar->GetItemData( nId ) ); uno::Reference< ui::XStatusbarItem > xStatusbarItem( - static_cast< cppu::OWeakObject *>( new StatusbarItem( m_pStatusBar, pItemData, nId, aCommandURL ) ), + static_cast< cppu::OWeakObject *>( new StatusbarItem( m_pStatusBar, nId, aCommandURL ) ), uno::UNO_QUERY ); beans::PropertyValue aPropValue; diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx index e4b6a9faca3d..d48c843961ea 100644 --- a/framework/source/uielement/statusbarmerger.cxx +++ b/framework/source/uielement/statusbarmerger.cxx @@ -95,7 +95,6 @@ void lcl_CreateStatusbarItem( StatusBar* pStatusbar, // add-on specific data AddonStatusbarItemData *pUserData = new AddonStatusbarItemData; pUserData->aLabel = rAddonItem.aLabel; - pUserData->nItemBits = rAddonItem.nItemBits; pStatusbar->SetItemData( nItemId, pUserData ); } diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 45315b773952..2aac402fc2f4 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -130,7 +130,6 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aI m_bImageContainerStartFound = false; m_bImageContainerEndFound = false; m_bImagesStartFound = false; - m_bImageStartFound = false; m_bExternalImagesStartFound = false; m_bExternalImageStartFound = false; } @@ -301,8 +300,6 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( if ( !m_pImages->pImageItemList ) m_pImages->pImageItemList.reset( new ImageItemListDescriptor ); - m_bImageStartFound = true; - // Create new image item descriptor std::unique_ptr<ImageItemDescriptor> pItem(new ImageItemDescriptor); pItem->nIndex = -1; @@ -509,12 +506,6 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) } break; - case IMG_ELEMENT_ENTRY: - { - m_bImageStartFound = false; - } - break; - case IMG_ELEMENT_EXTERNALIMAGES: { if ( m_pExternalImages && !m_aImageList.pExternalImageList ) @@ -534,8 +525,7 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) } break; - default: - break; + default: break; } } } diff --git a/idlc/inc/astexpression.hxx b/idlc/inc/astexpression.hxx index 788d7a2afc6c..955ffa49a233 100644 --- a/idlc/inc/astexpression.hxx +++ b/idlc/inc/astexpression.hxx @@ -124,8 +124,6 @@ private: std::unique_ptr<AstExprValue> eval_un_op(); AstExprValue* eval_symbol(); - AstScope* m_pScope; // scope defined in - sal_Int32 m_lineNo; // line number defined in OString m_fileName; // fileName defined in ExprComb m_combOperator; diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index 5d5e6133d96c..8615c7962f7e 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -784,8 +784,6 @@ bool AstExpression::compareLong(AstExpression *pExpr) void AstExpression::fillDefinitionDetails() { - m_pScope = idlc()->scopes()->depth() > 0 ? idlc()->scopes()->top() : nullptr; - m_lineNo = idlc()->getLineNumber(); m_fileName = idlc()->getFileName(); } |