sdext/source/minimizer/informationdialog.cxx | 1 sdext/source/minimizer/informationdialog.hxx | 3 - sdext/source/minimizer/unodialog.cxx | 1 sdext/source/minimizer/unodialog.hxx | 1 sdext/source/pdfimport/tree/drawtreevisiting.hxx | 3 - sdext/source/pdfimport/tree/pdfiprocessor.cxx | 1 sdext/source/pdfimport/tree/pdfiprocessor.hxx | 2 - sdext/source/presenter/PresenterAccessibility.cxx | 1 sdext/source/presenter/PresenterAccessibility.hxx | 1 sdext/source/presenter/PresenterController.hxx | 1 sdext/source/presenter/PresenterScreen.cxx | 1 sdext/source/presenter/PresenterScreen.hxx | 1 sdext/source/presenter/PresenterScrollBar.cxx | 1 sdext/source/presenter/PresenterScrollBar.hxx | 1 sdext/source/presenter/PresenterSlidePreview.cxx | 1 sdext/source/presenter/PresenterSlidePreview.hxx | 1 sdext/source/presenter/PresenterTheme.cxx | 2 - sdext/source/presenter/PresenterTheme.hxx | 1 sfx2/source/appl/newhelp.hxx | 2 - sfx2/source/dialog/backingwindow.cxx | 1 sfx2/source/dialog/backingwindow.hxx | 1 sfx2/source/dialog/styfitem.cxx | 8 ---- sfx2/source/doc/iframe.cxx | 2 - sfx2/source/doc/sfxbasemodel.cxx | 1 sfx2/source/view/viewimp.hxx | 1 slideshow/source/engine/transitions/doublediamondwipe.hxx | 4 -- starmath/source/unofilter.cxx | 10 ++--- stoc/source/corereflection/base.hxx | 1 stoc/source/corereflection/crefl.cxx | 1 stoc/source/servicemanager/servicemanager.cxx | 1 stoc/source/uriproc/ExternalUriReferenceTranslator.cxx | 10 +---- store/source/storbios.hxx | 19 ---------- svtools/source/brwbox/brwbox1.cxx | 6 +-- svtools/source/brwbox/datwin.cxx | 3 - svtools/source/brwbox/datwin.hxx | 3 - svtools/source/dialogs/addresstemplate.cxx | 13 ++---- svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 4 -- svx/source/dialog/imapimp.hxx | 1 svx/source/gallery2/galbrws1.hxx | 1 svx/source/inc/fmpgeimp.hxx | 1 svx/source/sdr/contact/viewcontactofunocontrol.cxx | 18 --------- svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 1 svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 1 svx/source/sidebar/insert/InsertPropertyPanel.cxx | 3 - svx/source/sidebar/insert/InsertPropertyPanel.hxx | 1 svx/source/sidebar/line/LinePropertyPanel.hxx | 1 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 2 - svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 2 - svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 1 svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 1 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 1 svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 2 - svx/source/tbxctrls/tbunocontroller.cxx | 14 +------ svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 5 +- svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx | 11 +---- svx/source/unodraw/recoveryui.cxx | 4 -- 56 files changed, 26 insertions(+), 160 deletions(-)
New commits: commit 42e14a48135914db39df7636efde9b55c1323cf0 Author: Noel Grandin <[email protected]> Date: Mon Dec 21 13:51:11 2015 +0200 loplugin:unusedfields sdext Change-Id: I1719d684b0afd348c16a2ba942899e8ccded81c3 diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 5deb2bd..fcb2e5c 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -315,7 +315,6 @@ void InformationDialog::InitDialog() InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) : UnoDialog( rxContext, rxFrame ), ConfigurationAccess( rxContext, nullptr ), - mxFrame( rxFrame ), mxActionListener( new OKActionListener( *this ) ), mnSourceSize( rSourceSize ), mnDestSize( rDestSize ), diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index d754bc5..ba60bb8 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -56,9 +56,6 @@ public: private: - css::uno::Reference< css::frame::XFrame > mxFrame; - css::uno::Reference< css::io::XStream > mxTempFile; - css::uno::Reference< css::awt::XActionListener > mxActionListener; void InitDialog(); diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index 0c0f999..10f3068 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -49,7 +49,6 @@ UnoDialog::UnoDialog( const Reference< XComponentContext > &rxContext, Reference mxDialogModel( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.awt.UnoControlDialogModel", mxContext ), UNO_QUERY_THROW ), mxDialogModelMultiPropertySet( mxDialogModel, UNO_QUERY_THROW ), - mxDialogModelPropertySet( mxDialogModel, UNO_QUERY_THROW ), mxDialogModelMSF( mxDialogModel, UNO_QUERY_THROW ), mxDialogModelNameContainer( mxDialogModel, UNO_QUERY_THROW ), mxDialogModelNameAccess( mxDialogModel, UNO_QUERY_THROW ), diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index a86547e..46581e0 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.hxx @@ -110,7 +110,6 @@ public: css::uno::Reference< css::uno::XInterface > mxDialogModel; css::uno::Reference< css::beans::XMultiPropertySet > mxDialogModelMultiPropertySet; - css::uno::Reference< css::beans::XPropertySet > mxDialogModelPropertySet; css::uno::Reference< css::lang::XMultiServiceFactory > mxDialogModelMSF; css::uno::Reference< css::container::XNameContainer > mxDialogModelNameContainer; css::uno::Reference< css::container::XNameAccess > mxDialogModelNameAccess; diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx index 73aac5a..02235c4 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx @@ -80,9 +80,6 @@ namespace pdfi class DrawXmlEmitter : public ElementTreeVisitor { private: - css::uno::Reference< css::lang::XMultiServiceFactory > xFactory; - css::uno::Reference< css::uno::XComponentContext > xCtx; - css::uno::Reference< css::i18n::XBreakIterator > mxBreakIter; css::uno::Reference< css::i18n::XCharacterClassification > mxCharClass; EmitContext& m_rEmitContext ; diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 59b48ea..7b1cd74 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -57,7 +57,6 @@ namespace pdfi m_xContext(xContext), prevCharWidth(0), - m_pElFactory( new ElementFactory() ), m_pDocument( ElementFactory::createDocumentElement() ), m_pCurPage(nullptr), m_pCurElement(nullptr), diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index dc7da62..126143b 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -178,7 +178,6 @@ namespace pdfi std::vector<CharGlyph> m_GlyphsList; - std::shared_ptr<ElementFactory> m_pElFactory; std::shared_ptr<DocumentElement> m_pDocument; PageElement* m_pCurPage; Element* m_pCurElement; @@ -187,7 +186,6 @@ namespace pdfi FontToIdMap m_aFontToId; GraphicsContextStack m_aGCStack; - GraphicsContext m_prev_aGC; sal_Int32 m_nNextGCId; IdToGCMap m_aIdToGC; GCToIdMap m_aGCToId; diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 3ecbbf4..f1b4c5a 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -532,7 +532,6 @@ PresenterAccessible::PresenterAccessible ( : PresenterAccessibleInterfaceBase(m_aMutex), mxComponentContext(rxContext), mpPresenterController(rpPresenterController), - mxMainPaneId(rxMainPane.is() ? rxMainPane->getResourceId() : Reference<XResourceId>()), mxMainPane(rxMainPane, UNO_QUERY), mxMainWindow(), mxPreviewContentWindow(), diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index fb7d4d6..cf32043 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -102,7 +102,6 @@ public: private: const css::uno::Reference<css::uno::XComponentContext> mxComponentContext; ::rtl::Reference<PresenterController> mpPresenterController; - css::uno::Reference<css::drawing::framework::XResourceId> mxMainPaneId; css::uno::Reference<css::drawing::framework::XPane2> mxMainPane; css::uno::Reference<css::awt::XWindow> mxMainWindow; css::uno::Reference<css::awt::XWindow> mxPreviewContentWindow; diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index 44ada20..0b910f4 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -215,7 +215,6 @@ private: css::uno::Reference<css::drawing::XDrawPage> mxCurrentSlide; css::uno::Reference<css::drawing::XDrawPage> mxNextSlide; ::rtl::Reference<PresenterWindowManager> mpWindowManager; - std::shared_ptr<PresenterPaneAnimator> mpCurrentPaneAnimation; std::shared_ptr<PresenterTheme> mpTheme; css::uno::Reference<css::awt::XWindow> mxMainWindow; ::rtl::Reference<PresenterPaneBorderPainter> mpPaneBorderPainter; diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 12839dc..86dcec1 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -274,7 +274,6 @@ PresenterScreen::PresenterScreen ( mxContextWeak(rxContext), mxSlideShowControllerWeak(), mpPresenterController(), - mxSlideShowViewId(), mxSavedConfiguration(), mpPaneContainer(), mnComponentIndex(0), diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index bb3f256..d707b4e 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -134,7 +134,6 @@ private: css::uno::WeakReference<css::uno::XComponentContext> mxContextWeak; css::uno::WeakReference<css::presentation::XSlideShowController> mxSlideShowControllerWeak; ::rtl::Reference<PresenterController> mpPresenterController; - css::uno::Reference<css::drawing::framework::XResourceId> mxSlideShowViewId; css::uno::Reference<css::drawing::framework::XConfiguration> mxSavedConfiguration; ::rtl::Reference<PresenterPaneContainer> mpPaneContainer; sal_Int32 mnComponentIndex; diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 774b674..0c7eb2b 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -75,7 +75,6 @@ PresenterScrollBar::PresenterScrollBar ( const ::std::function<void (double)>& rThumbMotionListener) : PresenterScrollBarInterfaceBase(m_aMutex), mxComponentContext(rxComponentContext), - mxParentWindow(rxParentWindow), mxWindow(), mxCanvas(), mxPresenterHelper(), diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index cc73815..b2c37ca 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -162,7 +162,6 @@ public: protected: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; - css::uno::Reference<css::awt::XWindow> mxParentWindow; css::uno::Reference<css::awt::XWindow> mxWindow; css::uno::Reference<css::rendering::XCanvas> mxCanvas; css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index dfe8da1..21e1da8 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -53,7 +53,6 @@ PresenterSlidePreview::PresenterSlidePreview ( const ::rtl::Reference<PresenterController>& rpPresenterController) : PresenterSlidePreviewInterfaceBase(m_aMutex), mpPresenterController(rpPresenterController), - mxPane(rxAnchorPane), mxViewId(rxViewId), mxPreviewRenderer(), mxPreview(), diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index a9d8fac..ff4208a 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -113,7 +113,6 @@ protected: ::rtl::Reference<PresenterController> mpPresenterController; private: - css::uno::Reference<css::drawing::framework::XPane> mxPane; css::uno::Reference<css::drawing::framework::XResourceId> mxViewId; css::uno::Reference<css::drawing::XSlideRenderer> mxPreviewRenderer; diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index aa85c87..5931942 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -177,7 +177,6 @@ public: OUString msStyleName; std::shared_ptr<ViewStyle> mpParentStyle; PresenterTheme::SharedFontDescriptor mpFont; - std::shared_ptr<PresenterBitmapContainer> mpBitmaps; SharedBitmapDescriptor mpBackground; }; @@ -272,7 +271,6 @@ PresenterTheme::PresenterTheme ( : mxContext(rxContext), msThemeName(rsThemeName), mpTheme(), - mpBitmapContainer(), mxCanvas(rxCanvas) { mpTheme = ReadTheme(); diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 4a34110..e74c92f 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -127,7 +127,6 @@ private: css::uno::Reference<css::uno::XComponentContext> mxContext; const OUString msThemeName; std::shared_ptr<Theme> mpTheme; - std::shared_ptr<PresenterBitmapContainer> mpBitmapContainer; css::uno::Reference<css::rendering::XCanvas> mxCanvas; std::shared_ptr<Theme> ReadTheme(); commit f4e703aa39e9c294441b6dd86189d8aff32db8bf Author: Noel Grandin <[email protected]> Date: Mon Dec 21 13:44:24 2015 +0200 loplugin:unusedfields in sfx2,slideshow,starmath,stoc Change-Id: If3622b23c45dd3a2a4e9869452142d1f6b47919e diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index a6dcb73..464e2b3 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -493,8 +493,6 @@ friend class SfxHelpIndexWindow_Impl; css::uno::Reference < css::awt::XWindow > xWindow; - css::uno::Reference < css::frame::XDispatchResultListener > - xOpenListener; css::uno::Reference < css::frame::XFrame2 > xFrame; diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 32e8851..69b11e7 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -90,7 +90,6 @@ static bool cmpSelectionItems (const ThumbnailViewItem *pItem1, const ThumbnailV BackingWindow::BackingWindow( vcl::Window* i_pParent ) : Window( i_pParent ), - mxDesktop( Desktop::create(comphelper::getProcessComponentContext()) ), mbLocalViewInitialized(false), maButtonsTextColor(officecfg::Office::Common::Help::StartCenter::StartCenterTextColor::get()), mbIsSaveMode( false ), diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 90b385b..4d36dc3 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -55,7 +55,6 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer css::uno::Reference<css::uno::XComponentContext> mxContext; css::uno::Reference<css::frame::XDispatchProvider> mxDesktopDispatchProvider; css::uno::Reference<css::frame::XFrame> mxFrame; - css::uno::Reference<css::frame::XDesktop2> mxDesktop; /** helper for drag&drop. */ css::uno::Reference<css::datatransfer::dnd::XDropTargetListener> mxDropTargetListener; diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx index d98a474..0a8b748 100644 --- a/sfx2/source/dialog/styfitem.cxx +++ b/sfx2/source/dialog/styfitem.cxx @@ -23,14 +23,6 @@ -class SfxStyleFamilyItem_Impl -{ - Bitmap aBitmap; - Image aImage; -}; - - - // Implementierung des Resource-Konstruktors SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index c42b978..45bd622 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -106,8 +106,6 @@ public: class IFrameWindow_Impl : public vcl::Window { - uno::Reference < frame::XFrame2 > mxFrame; - public: IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder, diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 56ae242..e78f955 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -207,7 +207,6 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument bool m_bExternalTitle ; bool m_bModifiedSinceLastSave ; Reference< view::XPrintable> m_xPrintable ; - Reference< script::provider::XScriptProvider > m_xScriptProvider ; Reference< ui::XUIConfigurationManager2 > m_xUIConfigurationManager; ::rtl::Reference< ::sfx2::DocumentStorageModifyListener > m_pStorageModifyListen ; OUString m_sModuleIdentifier ; diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx index 74e70b1..5780232 100644 --- a/sfx2/source/view/viewimp.hxx +++ b/sfx2/source/view/viewimp.hxx @@ -45,7 +45,6 @@ struct SfxViewShell_Impl ::cppu::OInterfaceContainerHelper aInterceptorContainer; bool m_bControllerSet; SfxShellArr_Impl aArr; - SvBorder aBorder; Size aMargin; sal_uInt16 m_nPrinterLocks; bool m_bCanPrint; diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx index 684a981..5415f61 100644 --- a/slideshow/source/engine/transitions/doublediamondwipe.hxx +++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx @@ -33,10 +33,8 @@ namespace internal { class DoubleDiamondWipe : public ParametricPolyPolygon { public: - DoubleDiamondWipe() : m_unitRect( createUnitRect() ) {} + DoubleDiamondWipe() {} virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; -private: - const ::basegfx::B2DPolyPolygon m_unitRect; }; } diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx index 903e9af..0051355 100644 --- a/starmath/source/unofilter.cxx +++ b/starmath/source/unofilter.cxx @@ -26,11 +26,10 @@ class MathTypeFilter : public cppu::WeakImplHelper lang::XServiceInfo > { - uno::Reference<uno::XComponentContext> m_xContext; uno::Reference<lang::XComponent> m_xDstDoc; public: - explicit MathTypeFilter(const uno::Reference<uno::XComponentContext>& xContext); + MathTypeFilter(); virtual ~MathTypeFilter(); // XFilter @@ -46,8 +45,7 @@ public: virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override; }; -MathTypeFilter::MathTypeFilter(const uno::Reference< uno::XComponentContext >& rxContext) - : m_xContext(rxContext) +MathTypeFilter::MathTypeFilter() { } @@ -124,9 +122,9 @@ uno::Sequence<OUString> MathTypeFilter::getSupportedServiceNames() throw(uno::Ru return aRet; } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Math_MathTypeFilter_get_implementation(uno::XComponentContext* pComponent, uno::Sequence<uno::Any> const&) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Math_MathTypeFilter_get_implementation(uno::XComponentContext* , uno::Sequence<uno::Any> const&) { - return cppu::acquire(new MathTypeFilter(pComponent)); + return cppu::acquire(new MathTypeFilter); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index fc081a6..f28a600 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -82,7 +82,6 @@ class IdlReflectionServiceImpl , public css::lang::XServiceInfo { ::osl::Mutex _aComponentMutex; - css::uno::Reference< css::lang::XMultiServiceFactory > _xMgr; css::uno::Reference< css::container::XHierarchicalNameAccess > _xTDMgr; // caching diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 09461f4..3304233 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -60,7 +60,6 @@ static OUString core_getImplementationName() IdlReflectionServiceImpl::IdlReflectionServiceImpl( const Reference< XComponentContext > & xContext ) : OComponentHelper( _aComponentMutex ) - , _xMgr( xContext->getServiceManager(), UNO_QUERY ) , _aElements( CACHE_SIZE ) { xContext->getValueByName( diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 1fdf14f..b453c95 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -262,7 +262,6 @@ private: Mutex aMutex; HashSet_Ref aImplementationMap; HashSet_Ref::iterator aIt; - Reference<XInterface > xNext; }; ImplementationEnumeration_Impl::~ImplementationEnumeration_Impl() {} diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx index 3dde5b3..7c81651 100644 --- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx +++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx @@ -46,9 +46,7 @@ class Translator: private boost::noncopyable { public: - explicit Translator( - css::uno::Reference< css::uno::XComponentContext > const & context): - m_context(context) {} + Translator() {} virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -69,8 +67,6 @@ public: private: virtual ~Translator() {} - - css::uno::Reference< css::uno::XComponentContext > m_context; }; OUString Translator::getImplementationName() @@ -190,10 +186,10 @@ OUString Translator::translateToExternal( } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL -com_sun_star_comp_uri_ExternalUriReferenceTranslator_get_implementation(css::uno::XComponentContext* rxContext, +com_sun_star_comp_uri_ExternalUriReferenceTranslator_get_implementation(css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const &) { - return ::cppu::acquire(new Translator(rxContext)); + return ::cppu::acquire(new Translator); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 3785f82e26c33c385494229be3bcfbe2daffe872 Author: Noel Grandin <[email protected]> Date: Mon Dec 21 13:18:20 2015 +0200 loplugin:unusedfields in store,svtools,svx Change-Id: I9577c64e33950899c2e3467c7b481504e021d470 diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx index 1278a38..36b2b65 100644 --- a/store/source/storbios.hxx +++ b/store/source/storbios.hxx @@ -124,20 +124,6 @@ public: */ storeError flush(); - /** ScanContext. - */ - struct ScanContext - { - /** Representation. - */ - OStorePageDescriptor m_aDescr; - - /** Construction. - */ - inline ScanContext(); - - }; - protected: /** Destruction (OReference). */ @@ -213,11 +199,6 @@ inline bool OStorePageBIOS::isValid() const return m_xLockBytes.is(); } -inline OStorePageBIOS::ScanContext::ScanContext() - : m_aDescr (0, 0, 0) -{ -} - /*======================================================================== * * The End. diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index a69c17d..77b4453 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -249,7 +249,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth ) } #endif - pCols->insert( pCols->begin(), new BrowserColumn( 0, Image(), OUString(), nWidth, GetZoom() ) ); + pCols->insert( pCols->begin(), new BrowserColumn( 0, OUString(), nWidth, GetZoom() ) ); FreezeColumn( 0 ); // adjust headerbar @@ -285,11 +285,11 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText, { BrowserColumns::iterator it = pCols->begin(); ::std::advance( it, nPos ); - pCols->insert( it, new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom() ) ); + pCols->insert( it, new BrowserColumn( nItemId, rText, nWidth, GetZoom() ) ); } else { - pCols->push_back( new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom() ) ); + pCols->push_back( new BrowserColumn( nItemId, rText, nWidth, GetZoom() ) ); } if ( nCurColId == 0 ) nCurColId = nItemId; diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index aec67c3..9a7e3cf 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -101,11 +101,10 @@ void ButtonFrame::Draw( OutputDevice& rDev ) rDev.SetFillColor( aOldFillColor ); } -BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const class Image &rImage, +BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const OUString& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom ) : _nId( nItemId ), _nWidth( nWidthPixel ), - _aImage( rImage ), _aTitle( rTitle ), _bFrozen( false ) { diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index c3aa74b..ed88253 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -70,12 +70,11 @@ class BrowserColumn sal_uInt16 _nId; sal_uLong _nOriginalWidth; sal_uLong _nWidth; - Image _aImage; OUString _aTitle; bool _bFrozen; public: - BrowserColumn( sal_uInt16 nItemId, const Image &rImage, + BrowserColumn( sal_uInt16 nItemId, const OUString& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom ); virtual ~BrowserColumn(); diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index bf66e5e..8c5386a 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -125,14 +125,12 @@ namespace svt class AssigmentTransientData : public IAssigmentData { protected: - Reference< XDataSource > m_xDataSource; OUString m_sDSName; OUString m_sTableName; - MapString2String m_aAliases; + MapString2String m_aAliases; -public: + public: AssigmentTransientData( - const Reference< XDataSource >& _rxDataSource, const OUString& _rDataSourceName, const OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields @@ -151,11 +149,10 @@ public: }; - AssigmentTransientData::AssigmentTransientData( const Reference< XDataSource >& _rxDataSource, + AssigmentTransientData::AssigmentTransientData( const OUString& _rDataSourceName, const OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ) - :m_xDataSource( _rxDataSource ) - ,m_sDSName( _rDataSourceName ) + :m_sDSName( _rDataSourceName ) ,m_sTableName( _rTableName ) { // fill our aliases structure @@ -485,7 +482,7 @@ void AssignmentPersistentData::ImplCommit() ,nLastVisibleListIndex(0) ,bOddFieldNumber(false) ,bWorkingPersistent( false ) - ,pConfigData( new AssigmentTransientData( m_xTransientDataSource, _rDataSourceName, _rTableName, _rFields ) ) + ,pConfigData( new AssigmentTransientData( _rDataSourceName, _rTableName, _rFields ) ) { memset(pFieldLabels, 0, sizeof(pFieldLabels)); memset(pFields, 0, sizeof(pFields)); diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx index b43fa02..316234c 100644 --- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx @@ -43,12 +43,8 @@ namespace sdr { namespace contact { //= ViewContactOfUnoControl - class ViewContactOfUnoControl_Impl; class SVX_DLLPRIVATE ViewContactOfUnoControl : public ViewContactOfSdrObj { - private: - ::std::unique_ptr< ViewContactOfUnoControl_Impl > m_pImpl; - public: // access to SdrObject const SdrUnoObj& GetSdrUnoObj() const diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx index 4d5a1d7..9bae158 100644 --- a/svx/source/dialog/imapimp.hxx +++ b/svx/source/dialog/imapimp.hxx @@ -30,7 +30,6 @@ class IMapOwnData public: Idle aIdle; - Timer aTbxTimer; Graphic aUpdateGraphic; ImageMap aUpdateImageMap; TargetList aUpdateTargetList; diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 595b2e7..f5f77f3 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -89,7 +89,6 @@ private: Image aImgNormal; Image aImgDefault; Image aImgReadOnly; - Image aImgImported; ::std::function<sal_Bool (const KeyEvent&,Window*)> maKeyInputHandler; ::std::function<void ()> maThemeSlectionHandler; diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 3b9263d..ae743c0 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -48,7 +48,6 @@ class SdrObject; class SVX_DLLPRIVATE FmFormPageImpl { - ::std::map< css::uno::Reference< css::form::XFormComponent >,SdrObject* > m_aComponentMap; css::uno::Reference< css::form::XForm > xCurrentForm; css::uno::Reference< css::form::XForms > m_xForms; css::uno::WeakReference< css::container::XMap > m_aControlShapeMap; diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index c0caf0e..e90c58c 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -53,26 +53,8 @@ namespace sdr { namespace contact { //= ViewContactOfUnoControl - class ViewContactOfUnoControl_Impl: private boost::noncopyable - { - public: - ViewContactOfUnoControl_Impl(); - ~ViewContactOfUnoControl_Impl(); - }; - - - ViewContactOfUnoControl_Impl::ViewContactOfUnoControl_Impl() - { - } - - - ViewContactOfUnoControl_Impl::~ViewContactOfUnoControl_Impl() - { - } - ViewContactOfUnoControl::ViewContactOfUnoControl( SdrUnoObj& _rUnoObject ) :ViewContactOfSdrObj( _rUnoObject ) - ,m_pImpl( new ViewContactOfUnoControl_Impl ) { } diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index b43fd3f..09ab4ef 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -52,7 +52,6 @@ GraphicPropertyPanel::GraphicPropertyPanel( maBlueControl(SID_ATTR_GRAF_BLUE, *pBindings, *this), maGammaControl(SID_ATTR_GRAF_GAMMA, *pBindings, *this), maModeControl(SID_ATTR_GRAF_MODE, *pBindings, *this), - mxFrame(rxFrame), mpBindings(pBindings) { get(mpMtrBrightness, "setbrightness"); diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 8a86d4f..4555b7d 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -83,7 +83,6 @@ private: ::sfx2::sidebar::ControllerItem maGammaControl; ::sfx2::sidebar::ControllerItem maModeControl; - css::uno::Reference<css::frame::XFrame> mxFrame; SfxBindings* mpBindings; DECL_LINK_TYPED( ModifyBrightnessHdl, Edit&, void ); diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index cdd4f6a..f2486c3 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -45,8 +45,7 @@ namespace svx { namespace sidebar { InsertPropertyPanel::InsertPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame) - : PanelLayout(pParent, "InsertPropertyPanel", "svx/ui/sidebarinsert.ui", rxFrame), - mxFrame(rxFrame) + : PanelLayout(pParent, "InsertPropertyPanel", "svx/ui/sidebarinsert.ui", rxFrame) { get(mpStandardShapesToolBox, "standardshapes"); get(mpCustomShapesToolBox, "customshapes"); diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx index eec58ac..ee5c6ff 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx @@ -47,7 +47,6 @@ public: private: VclPtr<ToolBox> mpStandardShapesToolBox; VclPtr<ToolBox> mpCustomShapesToolBox; - const css::uno::Reference<css::frame::XFrame> mxFrame; DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void); }; diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index e99f75f..7c0c3a1 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -108,7 +108,6 @@ private: sfx2::sidebar::ControllerItem maEdgeStyle; sfx2::sidebar::ControllerItem maCapStyle; - css::uno::Reference<css::frame::XFrame> mxFrame; SfxBindings* mpBindings; void Initialize(); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index aca25bf..6dad280 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -573,7 +573,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) : PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui", rxFrame), - maSpace3 (SVX_RES(IMG_SPACE3)), maIndHang (SVX_RES(IMG_INDENT_HANG)), maTxtLeft (0), maUpper (0), @@ -587,7 +586,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, maDecIndentControl(SID_DEC_INDENT, *pBindings,*this, OUString("DecrementIndent"), rxFrame), maIncIndentControl(SID_INC_INDENT, *pBindings,*this, OUString("IncrementIndent"), rxFrame), m_aMetricCtl (SID_ATTR_METRIC, *pBindings,*this), - mxFrame(rxFrame), maContext(), mpBindings(pBindings), mxSidebar(rxSidebar) diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 70a2c20..50fde91 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -89,7 +89,6 @@ private: VclPtr<SvxRelativeField> mpFLineIndent; // Resources - Image maSpace3; Image maIndHang; // Data Member @@ -108,7 +107,6 @@ private: ::sfx2::sidebar::ControllerItem maIncIndentControl; ::sfx2::sidebar::ControllerItem m_aMetricCtl; - css::uno::Reference<css::frame::XFrame> mxFrame; ::sfx2::sidebar::EnumContext maContext; SfxBindings* mpBindings; css::uno::Reference<css::ui::XSidebar> mxSidebar; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 89effbb..53d72b6 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -81,7 +81,6 @@ PosSizePropertyPanel::PosSizePropertyPanel( maAutoWidthControl(SID_ATTR_TRANSFORM_AUTOWIDTH, *pBindings, *this), maAutoHeightControl(SID_ATTR_TRANSFORM_AUTOHEIGHT, *pBindings, *this), m_aMetricCtl(SID_ATTR_METRIC, *pBindings, *this), - mxFrame(rxFrame), maContext(), mpBindings(pBindings), mbMtrPosXMirror(false), diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 34a646d..81e01f9 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -136,7 +136,6 @@ private: ::sfx2::sidebar::ControllerItem maAutoHeightControl; ::sfx2::sidebar::ControllerItem m_aMetricCtl; - css::uno::Reference< css::frame::XFrame > mxFrame; ::sfx2::sidebar::EnumContext maContext; SfxBindings* mpBindings; diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index abaac42..37be379 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -78,7 +78,6 @@ ShadowPropertyPanel::ShadowPropertyPanel( maShadowColorController(SID_ATTR_SHADOW_COLOR, *pBindings, *this), maShadowXDistanceController(SID_ATTR_SHADOW_XDISTANCE, *pBindings, *this), maShadowYDistanceController(SID_ATTR_SHADOW_YDISTANCE, *pBindings, *this), - mxFrame(rxFrame), mpBindings(pBindings), nX(0), nY(0), diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx index 6b28a25..139c267 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx @@ -78,8 +78,6 @@ private: ::sfx2::sidebar::ControllerItem maShadowXDistanceController; ::sfx2::sidebar::ControllerItem maShadowYDistanceController; - css::uno::Reference<css::frame::XFrame> mxFrame; - SfxBindings* mpBindings; long nX,nY,nXY; diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 0ccfbd6..306b89f 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -86,7 +86,6 @@ class SvxFontSizeBox_Impl : public FontSizeBox { public: SvxFontSizeBox_Impl( vcl::Window* pParent, - const uno::Reference< frame::XDispatchProvider >& rDispatchProvider, const uno::Reference< frame::XFrame >& _xFrame, FontHeightToolBoxControl& rCtrl ); @@ -105,16 +104,13 @@ private: OUString m_aCurText; Size m_aLogicalSize; bool m_bRelease; - uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; uno::Reference< frame::XFrame > m_xFrame; - uno::Reference< awt::XWindow > m_xOldFocusWindow; void ReleaseFocus_Impl(); }; SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( - vcl::Window* _pParent, - const uno::Reference< frame::XDispatchProvider >& _rDispatchProvider, + vcl::Window* _pParent, const uno::Reference< frame::XFrame >& _xFrame, FontHeightToolBoxControl& _rCtrl ) : @@ -123,7 +119,6 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( m_pCtrl ( &_rCtrl ), m_aLogicalSize ( 0,100 ), m_bRelease ( true ), - m_xDispatchProvider ( _rDispatchProvider ), m_xFrame ( _xFrame ) { SetValue( 0 ); @@ -399,12 +394,7 @@ uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createItemWind if ( pParent ) { SolarMutexGuard aSolarMutexGuard; - m_pBox = VclPtr<SvxFontSizeBox_Impl>::Create( - - pParent, - uno::Reference< frame::XDispatchProvider >( m_xFrame, uno::UNO_QUERY ), - m_xFrame, - *this ); + m_pBox = VclPtr<SvxFontSizeBox_Impl>::Create( pParent, m_xFrame, *this ); //Get the box to fill itself with all its sizes m_pBox->UpdateFont(m_aCurrentFont); //Make it size itself to its optimal size re above sizes diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index 050a385..1ec7821 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -35,9 +35,8 @@ namespace textconversiondlgs { using namespace ::com::sun::star; -ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference< uno::XComponentContext >& xContext ) - : m_xCC( xContext ) - , m_xParentWindow( nullptr ) +ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog() + : m_xParentWindow( nullptr ) , m_pDialog( nullptr ) , m_bDisposed(false) , m_bInDispose(false) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index a639496..9f64e1a 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -68,8 +68,7 @@ class ChineseTranslation_UnoDialog : public ::cppu::WeakImplHelper < > { public: - explicit ChineseTranslation_UnoDialog( const css::uno::Reference< - css::uno::XComponentContext >& xContext ); + ChineseTranslation_UnoDialog(); virtual ~ChineseTranslation_UnoDialog(); // lang::XServiceInfo @@ -81,9 +80,9 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL - create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) + create( css::uno::Reference< css::uno::XComponentContext > const & ) throw(css::uno::Exception) { - return static_cast<cppu::OWeakObject *>(new ChineseTranslation_UnoDialog( xContext )); + return static_cast<cppu::OWeakObject *>( new ChineseTranslation_UnoDialog ); } // lang::XInitialization @@ -108,15 +107,11 @@ public: virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) throw (css::uno::RuntimeException, std::exception) override; private: - //no default constructor - ChineseTranslation_UnoDialog(); void impl_DeleteDialog(); private: css::uno::Reference< - css::uno::XComponentContext> m_xCC; - css::uno::Reference< css::awt::XWindow > m_xParentWindow; VclPtr<ChineseTranslationDialog> m_pDialog; diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 1609a3d..b28773d 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -71,10 +71,6 @@ class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo /** @short TODO */ RecoveryUI::EJob m_eJob; - /** @short TODO */ - css::uno::Reference< css::task::XStatusIndicatorFactory > m_xProgressFactory; - - // interface public: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
