diff options
author | Noel Grandin <noel@peralex.com> | 2015-12-21 14:05:52 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-12-22 09:53:26 +0200 |
commit | 9570bdfcb9ffb59e0dd4a838295b0800b526fc8b (patch) | |
tree | 41f90096cf8b17205dc3317ab06167dc828c7e23 /sd | |
parent | 0b1da98da44bc9acb9e42a5cd1842adf9d82a415 (diff) |
loplugin:unusedfields in sd
Change-Id: I59a127dace4a1818dfb2ccd6a7b673d39a9c5c60
Diffstat (limited to 'sd')
38 files changed, 10 insertions, 89 deletions
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx index ebc3a2d30025..c1b1065553e5 100644 --- a/sd/source/core/annotations/Annotation.cxx +++ b/sd/source/core/annotations/Annotation.cxx @@ -98,7 +98,6 @@ private: virtual void SAL_CALL disposing() override; SdPage* mpPage; - Reference< XComponentContext > m_xContext; mutable ::osl::Mutex m_aMutex; RealPoint2D m_Position; RealSize2D m_Size; diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index b24d797dcfab..ea0a7fcec8cc 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -166,10 +166,6 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider OUString maBaseURI; css::uno::Reference< css::text::XSimpleText > mXText; // TextRef of the global text - css::uno::Reference< css::text::XTextCursor > mXCursor; - css::uno::Reference< css::text::XTextRange > mXCursorText; // TextRef of part of the cursor - css::uno::Reference< css::beans::XPropertySet > mXCursorPropSet; // properties of the part - css::uno::Reference< css::text::XTextField > mXTextField; sal_uInt32 mnTextStyle; bool mbFontIndependentLineSpacing; diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 4fac893d9568..db07494ff1bc 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -134,8 +134,6 @@ private: virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; - ::sax_fastparser::FSHelperPtr mPresentationFS; LayoutInfo mLayoutInfo[EPP_LAYOUT_SIZE]; diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 814230c5aad0..11cf574bd0f6 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -109,11 +109,9 @@ private: AccessibleSlideSorterView::AccessibleSlideSorterView( ::sd::slidesorter::SlideSorter& rSlideSorter, - const Reference<XAccessible>& rxParent, vcl::Window* pContentWindow) : AccessibleSlideSorterViewBase(MutexOwner::maMutex), mrSlideSorter(rSlideSorter), - mxParent(rxParent), mnClientId(0), mpContentWindow(pContentWindow) { diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index 672120df4206..ccdf464fba93 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -154,7 +154,6 @@ private: STLPropertySet* mpSet; STLPropertySet* mpResultSet; - CustomAnimationEffectPtr mpEffect; VclPtr<TabControl> mpTabControl; VclPtr<CustomAnimationDurationTabPage> mpDurationTabPage; diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index fb4d0f36265d..58f6153f2e7b 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -107,8 +107,6 @@ private: MainSequencePtr mpMainSequence; - Image maImgEmpty; - Image maImages[ IMG_CUSTOMANIMATION_MEDIA_STOP - IMG_CUSTOMANIMATION_ON_CLICK + 1]; css::uno::Reference< css::drawing::XShape > mxLastTargetShape; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index c50955fe97b9..d512283a475e 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -151,7 +151,6 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, mrBase( rBase ), mpCustomAnimationPresets(nullptr), mnPropertyType( nPropertyTypeNone ), - mxModel( rBase.GetDocShell()->GetDoc()->getUnoModel(), UNO_QUERY ), maLateInitTimer() { // load resources diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 86a6ec609a96..6574807322ae 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -158,7 +158,6 @@ private: css::uno::Reference< css::drawing::XDrawPage > mxCurrentPage; css::uno::Reference< css::drawing::XDrawView > mxView; - css::uno::Reference< css::frame::XModel > mxModel; /** The mpCustomAnimationPresets is initialized either on demand or after a short time after the construction of a new object of this diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index ba2008f62d23..da3b0bfe3a06 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -252,13 +252,11 @@ public: private: SdrPathObj* mpPathObj; - rtl::Reference< MotionPathTag > mxTag; }; SdPathHdl::SdPathHdl( const SmartTagReference& xTag, SdrPathObj* pPathObj ) : SmartHdl( xTag, pPathObj->GetCurrentBoundRect().TopLeft() ) , mpPathObj( pPathObj ) -, mxTag( dynamic_cast< MotionPathTag* >( xTag.get() ) ) { } diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index d5e3f4717d18..a603a0372766 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -64,7 +64,6 @@ protected: private: DisplayModeController& mrController; - Reference< XFrame > mxFrame; VclPtr<ValueSet> mpDisplayModeSet1; VclPtr<ValueSet> mpDisplayModeSet2; }; @@ -138,7 +137,6 @@ DisplayModeToolbarMenu::DisplayModeToolbarMenu( DisplayModeController& rControll const Reference< XFrame >& xFrame, vcl::Window* pParent ) : svtools::ToolbarMenu(xFrame, pParent, WB_CLIPCHILDREN ) , mrController( rController ) -, mxFrame(xFrame) , mpDisplayModeSet1( nullptr ) , mpDisplayModeSet2( nullptr ) { diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index a72a71f0ed45..18eeb10953d6 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -147,7 +147,7 @@ SdNavigatorWin::SdNavigatorWin( void SdNavigatorWin::SetUpdateRequestFunctor(const UpdateRequestFunctor& rUpdateRequest) { mpNavigatorCtrlItem = new SdNavigatorControllerItem( SID_NAVIGATOR_STATE, this, mpBindings, rUpdateRequest); - mpPageNameCtrlItem = new SdPageNameControllerItem( SID_NAVIGATOR_PAGENAME, this, mpBindings, rUpdateRequest); + mpPageNameCtrlItem = new SdPageNameControllerItem( SID_NAVIGATOR_PAGENAME, this, mpBindings); // InitTlb; is initiated over Slot if (rUpdateRequest) @@ -934,11 +934,9 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, SdPageNameControllerItem::SdPageNameControllerItem( sal_uInt16 _nId, SdNavigatorWin* pNavWin, - SfxBindings* _pBindings, - const SdNavigatorWin::UpdateRequestFunctor& rUpdateRequest) + SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), - pNavigatorWin( pNavWin ), - maUpdateRequest(rUpdateRequest) + pNavigatorWin( pNavWin ) { } diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 9ea1ddd30c94..74b2e571450a 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -51,13 +51,11 @@ void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest) namespace sd { namespace framework { ChangeRequestQueueProcessor::ChangeRequestQueueProcessor ( - const ::rtl::Reference<ConfigurationController>& rpConfigurationController, const std::shared_ptr<ConfigurationUpdater>& rpConfigurationUpdater) : maMutex(), maQueue(), mnUserEventId(nullptr), mxConfiguration(), - mpConfigurationController(rpConfigurationController), mpConfigurationUpdater(rpConfigurationUpdater) { } diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx index a232dc7b3033..214efb528d2a 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -55,7 +55,6 @@ public: be called when the queue becomes empty. */ ChangeRequestQueueProcessor ( - const ::rtl::Reference<ConfigurationController>& rxController, const std::shared_ptr<ConfigurationUpdater>& rpUpdater); ~ChangeRequestQueueProcessor(); @@ -107,8 +106,6 @@ private: css::uno::Reference<css::drawing::framework::XConfiguration> mxConfiguration; - ::rtl::Reference<ConfigurationController> mpConfigurationController; - std::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater; /** Initiate the processing of the entries in the queue. The actual diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 9bdb6bbfed6f..11166529e00d 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -553,7 +553,7 @@ ConfigurationController::Implementation::Implementation ( new ConfigurationControllerResourceManager(mpResourceFactoryContainer,mpBroadcaster)), mpConfigurationUpdater( new ConfigurationUpdater(mpBroadcaster, mpResourceManager,mxControllerManager)), - mpQueueProcessor(new ChangeRequestQueueProcessor(&rController,mpConfigurationUpdater)), + mpQueueProcessor(new ChangeRequestQueueProcessor(mpConfigurationUpdater)), mpConfigurationUpdaterLock(), mnLockCount(0) { diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index e90d184d3d9d..8c614556595b 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -90,7 +90,6 @@ public: throw (css::uno::RuntimeException, std::exception) override; private: - css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId; sal_uInt16 mnChildWindowId; ViewShellBase& mrViewShellBase; ::std::unique_ptr<SfxShell> mpShell; diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 617a293862e6..0630163be692 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -41,8 +41,7 @@ ToolPanelModule::ToolPanelModule ( const Reference<frame::XController>& rxController, const OUString& rsSidebarPaneURL) : ResourceManager(rxController, - FrameworkHelper::CreateResourceId(FrameworkHelper::msSidebarViewURL, rsSidebarPaneURL)), - mxControllerManager(rxController,UNO_QUERY) + FrameworkHelper::CreateResourceId(FrameworkHelper::msSidebarViewURL, rsSidebarPaneURL)) { if (mxConfigurationController.is()) { diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index 20234997116e..3ad688f3c32a 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -44,9 +44,6 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) throw (css::uno::RuntimeException, std::exception) override; - -private: - css::uno::Reference<css::drawing::framework::XControllerManager> mxControllerManager; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 1cedfc86f12b..99a7b84f2b1a 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -65,7 +65,6 @@ class AccessibleSlideSorterView public: AccessibleSlideSorterView( ::sd::slidesorter::SlideSorter& rSlideSorter, - const css::uno::Reference< css::accessibility::XAccessible> & rxParent, vcl::Window* pParentWindow); void Init(); @@ -280,8 +279,6 @@ private: ::sd::slidesorter::SlideSorter& mrSlideSorter; - css::uno::Reference<css::accessibility::XAccessible> mxParent; - sal_uInt32 mnClientId; VclPtr<vcl::Window> mpContentWindow; diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index faf1e7bb0082..d4840730607e 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -55,8 +55,6 @@ protected: static const int FRAME; - svtools::ColorConfig maColorConfig; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; void updateViewSettings(); diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 8aae80ae3e64..576538297f41 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -181,8 +181,7 @@ private: class SdPageNameControllerItem : public SfxControllerItem { public: - SdPageNameControllerItem( sal_uInt16, SdNavigatorWin*, SfxBindings*, - const SdNavigatorWin::UpdateRequestFunctor& rUpdateRequest); + SdPageNameControllerItem( sal_uInt16, SdNavigatorWin*, SfxBindings*); protected: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, @@ -190,7 +189,6 @@ protected: private: VclPtr<SdNavigatorWin> pNavigatorWin; - const SdNavigatorWin::UpdateRequestFunctor maUpdateRequest; }; #endif diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index ac026cf381a5..de847b3f1919 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -80,10 +80,6 @@ public: */ virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) override; -private: - std::unique_ptr< ToolPanelViewShell_Impl > mpImpl; - - std::shared_ptr<TaskPaneShellManager> mpSubShellManager; }; } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 6424185a446b..3080700e1aa6 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -94,7 +94,6 @@ public: throw (css::uno::RuntimeException, std::exception) override; private: - css::uno::Reference<css::uno::XComponentContext> mxComponentContext; class PresenterCacheContext; Size maPreviewSize; std::shared_ptr<PresenterCacheContext> mpCacheContext; diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index a0bffc50f3fe..a3567a6e0c59 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -60,8 +60,6 @@ protected: virtual void ExecuteCommand (const sal_Int32 nCommandId) override; private: - css::uno::Reference<css::lang::XComponent> mxListener; - CurrentMasterPagesSelector ( vcl::Window* pParent, SdDrawDocument& rDocument, diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx index fad9c8b02eca..1e84b815d251 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx @@ -68,7 +68,6 @@ public: private: SlideSorter* mpTargetSlideSorter; - model::SharedPageDescriptor mpHitDescriptor; sal_Int32 mnInsertionIndex; }; diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index d47c26f15c81..fc834e295e9c 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -55,7 +55,6 @@ PageSelector::PageSelector (SlideSorter& rSlideSorter) mbSelectionChangeBroadcastPending(false), mpMostRecentlySelectedPage(), mpSelectionAnchor(), - mpCurrentPage(), mnUpdateLockCount(0), mbIsUpdateCurrentPagePending(true) { diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index d6d18f05dd1e..e2d8292eec94 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -56,20 +56,12 @@ using namespace ::sd::slidesorter::controller; namespace sd { namespace slidesorter { namespace controller { -class SelectionManager::PageInsertionListener - : public SfxListener -{ -public: - -}; - SelectionManager::SelectionManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), mrController(rSlideSorter.GetController()), mbIsMakeSelectionVisiblePending(true), mnInsertionPosition(-1), mnAnimationId(Animator::NotAnAnimationId), - mpPageInsertionListener(), mpSelectionObserver(new SelectionObserver(rSlideSorter)) { } diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 1a1ec8a87fa9..5485fb1f440b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -185,7 +185,6 @@ private: model::SharedPageDescriptor mpMostRecentlySelectedPage; /// Anchor for a range selection. model::SharedPageDescriptor mpSelectionAnchor; - model::SharedPageDescriptor mpCurrentPage; sal_Int32 mnUpdateLockCount; bool mbIsUpdateCurrentPagePending; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx index 2c052df17720..47b892936a00 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx @@ -127,9 +127,6 @@ private: */ Animator::AnimationId mnAnimationId; - class PageInsertionListener; - std::unique_ptr<PageInsertionListener> mpPageInsertionListener; - std::shared_ptr<SelectionObserver> mpSelectionObserver; /** Delete the given list of normal pages. This method is a helper diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index a17f255be042..fc535c3b848f 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -224,7 +224,6 @@ private: Size maPreviewSize; bool mbPreciousFlagUpdatePending; Layouter::Orientation meOrientation; - std::shared_ptr<controller::Properties> mpProperties; model::SharedPageDescriptor mpPageUnderMouse; std::shared_ptr<PageObjectPainter> mpPageObjectPainter; std::shared_ptr<SelectionPainter> mpSelectionPainter; diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index 978bddf7ddeb..52c037468b12 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -71,19 +71,10 @@ public: private: const Layouter& mrLayouter; std::shared_ptr<cache::PageCache> mpCache; - std::shared_ptr<controller::Properties> mpProperties; std::shared_ptr<view::Theme> mpTheme; std::shared_ptr<vcl::Font> mpPageNumberFont; std::unique_ptr<FramePainter> mpShadowPainter; std::unique_ptr<FramePainter> mpFocusBorderPainter; - Bitmap maNormalBackground; - Bitmap maSelectionBackground; - Bitmap maFocusedSelectionBackground; - Bitmap maFocusedBackground; - Bitmap maMouseOverBackground; - Bitmap maMouseOverFocusedBackground; - Bitmap maMouseOverSelectedBackground; - Bitmap maMouseOverSelectedAndFocusedBackground; void PaintBackground ( PageObjectLayouter *pPageObjectLayouter, diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index c3ce8f6bc362..9f7e09c34c22 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -183,7 +183,6 @@ private: std::shared_ptr<SlideSorter> mpSlideSorter; css::uno::Reference<css::drawing::framework::XResourceId> mxViewId; css::uno::Reference<css::awt::XWindow> mxParentWindow; - std::unique_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper; void Resize(); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index a77a630b4951..cbb97f5a2ab4 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -259,7 +259,6 @@ css::uno::Reference<css::accessibility::XAccessible> ::accessibility::AccessibleSlideSorterView *pAccessibleView = new ::accessibility::AccessibleSlideSorterView( *mpSlideSorter.get(), - pWindow->GetAccessibleParentWindow()->GetAccessible(), pWindow); css::uno::Reference< css::accessibility::XAccessible> xRet(pAccessibleView); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 489370eff877..a44a3e5e854a 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -144,7 +144,6 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) maPreviewSize(0,0), mbPreciousFlagUpdatePending(true), meOrientation(Layouter::GRID), - mpProperties(rSlideSorter.GetProperties()), mpPageUnderMouse(), mpPageObjectPainter(), mpSelectionPainter(), diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index b2278dc815bf..515aaa896dd7 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -46,7 +46,6 @@ PageObjectPainter::PageObjectPainter ( const SlideSorter& rSlideSorter) : mrLayouter(rSlideSorter.GetView().GetLayouter()), mpCache(rSlideSorter.GetView().GetPreviewCache()), - mpProperties(rSlideSorter.GetProperties()), mpTheme(rSlideSorter.GetTheme()), mpPageNumberFont(Theme::GetFont(Theme::Font_PageNumber, *rSlideSorter.GetContentWindow())), mpShadowPainter(new FramePainter(mpTheme->GetIcon(Theme::Icon_RawShadow))), diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index e37b416b20f6..886848bcf471 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -98,7 +98,6 @@ private: css::uno::Reference< css::beans::XPropertySet > mxSelectedTable; css::uno::Reference< css::drawing::XDrawView > mxView; css::uno::Reference< css::container::XIndexAccess > mxTableFamily; - css::uno::Reference< css::ui::XUIElement > mxToolbar; bool mbModal; bool mbStyleSelected; diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index c4a0a0eb7c0b..05b52b0c48b3 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -129,13 +129,12 @@ uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( ) thr extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_DrawingModule_get_implementation(css::uno::XComponentContext* context, +com_sun_star_comp_Draw_DrawingModule_get_implementation(css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; - uno::Reference< lang::XMultiServiceFactory> xSM(context->getServiceManager(), uno::UNO_QUERY_THROW); - return cppu::acquire(new SdUnoModule(xSM)); + return cppu::acquire(new SdUnoModule); } diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx index 63df6068cdf2..113e0a6b3bb6 100644 --- a/sd/source/ui/unoidl/unomodule.hxx +++ b/sd/source/ui/unoidl/unomodule.hxx @@ -50,12 +50,8 @@ namespace com class SdUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo > { - css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory; - public: - explicit SdUnoModule( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ) - : m_xFactory( xFactory ) - {} + SdUnoModule() {} // XnotifyingDispatch virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 43d96f3901e4..508555afdd13 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1113,7 +1113,6 @@ private: const OUString maStrScript; SdXShape* mpShape; - uno::Reference< document::XEventsSupplier > mxShape; public: SdUnoEventsAccess( SdXShape* pShape ) throw(); @@ -1158,7 +1157,7 @@ SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw() maStrSpeed( "Speed" ), maStrStarBasic( "StarBasic" ), maStrScript( "Script" ), - mpShape( pShape ), mxShape( pShape ) + mpShape( pShape ) { } |