diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-02 09:12:41 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-02 12:29:23 +0200 |
commit | 776a1b9b6b9c574d28b3a321a0f3f8110f34ac90 (patch) | |
tree | 5daf8ccb90a0a6e2781d0795522299ef6ecdc8f7 /sdext | |
parent | d241107b21e5d2bef3cbc408b020a0c8567b9e15 (diff) |
clang-tidy:readability-redundant-member-init
Change-Id: I0a9b238c0ba551b330bee7b89eb6cd48fad1b265
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121488
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sdext')
34 files changed, 45 insertions, 299 deletions
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 7e6e72f4d707..dcda24fe2184 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -78,10 +78,7 @@ FileEmitContext::FileEmitContext( const OUString& rOr const pdfparse::PDFContainer* pTop ) : pdfparse::EmitContext( pTop ), m_aReadHandle(nullptr), - m_nReadLen(0), - m_xContextStream(), - m_xSeek(), - m_xOut() + m_nReadLen(0) { m_xContextStream.set( io::TempFile::create(xContext), uno::UNO_QUERY_THROW ); m_xOut = m_xContextStream->getOutputStream(); diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index af5476de9d92..aa993ae1fa6a 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -52,8 +52,7 @@ public: OdfEmitter::OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput ) : m_xOutput( xOutput ), - m_aLineFeed(1), - m_aBuf() + m_aLineFeed(1) { OSL_PRECOND(m_xOutput.is(), "OdfEmitter(): invalid output stream"); m_aLineFeed[0] = '\n'; diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 0291ac95d925..14060715c83c 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -45,8 +45,7 @@ namespace pdfi PDFIHybridAdaptor::PDFIHybridAdaptor( const uno::Reference< uno::XComponentContext >& xContext ) : PDFIHybridAdaptorBase( m_aMutex ), - m_xContext( xContext ), - m_xModel() + m_xContext( xContext ) { } @@ -208,9 +207,7 @@ css::uno::Sequence<OUString> PDFIHybridAdaptor::getSupportedServiceNames() PDFIRawAdaptor::PDFIRawAdaptor( OUString const & implementationName, const uno::Reference< uno::XComponentContext >& xContext ) : PDFIAdaptorBase( m_aMutex ), m_implementationName(implementationName), - m_xContext( xContext ), - m_xModel(), - m_pVisitorFactory() + m_xContext( xContext ) { } diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index bc379e5e2508..6fba80f7029e 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -1047,7 +1047,7 @@ struct PDFFileImplData } PDFFile::PDFFile() - : PDFContainer(), m_nMajor( 0 ), m_nMinor( 0 ) + : m_nMajor( 0 ), m_nMinor( 0 ) { } diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 3a032af5878c..bbdb51c5ae23 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -59,7 +59,7 @@ class StringEmitContext : public EmitContext { OStringBuffer m_aBuf; public: - StringEmitContext() : EmitContext(), m_aBuf(256) {} + StringEmitContext() : m_aBuf(256) {} virtual bool write( const void* pBuf, unsigned int nLen ) noexcept override { diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index 087849d6b5dc..bedbcd73b020 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -100,8 +100,7 @@ OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBufferLeng } // namespace -ImageContainer::ImageContainer() : - m_aImages() +ImageContainer::ImageContainer() {} ImageId ImageContainer::addImage( const uno::Sequence<beans::PropertyValue>& xBitmap ) diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index d63ab04e97fd..86f703c1ac7b 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -50,13 +50,7 @@ namespace pdfi m_pCurPage(nullptr), m_pCurElement(nullptr), m_nNextFontId( 1 ), - m_aIdToFont(), - m_aFontToId(), - m_aGCStack(), m_nNextGCId( 1 ), - m_aIdToGC(), - m_aGCToId(), - m_aImages(), m_nPages(0), m_nNextZOrder( 1 ), m_xStatusIndicator( xStat ) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 74740233d467..9cd2c55cee21 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -533,7 +533,6 @@ void PDFOutDev::printPath( GfxPath* pPath ) PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : m_pDoc( pDoc ), - m_aFontMap(), m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ), m_bSkipImages(false) { diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 677cdfdc4037..5c3a3efb20d6 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -472,16 +472,7 @@ PresenterAccessible::PresenterAccessible ( : PresenterAccessibleInterfaceBase(m_aMutex), mxComponentContext(rxContext), mpPresenterController(rpPresenterController), - mxMainPane(rxMainPane, UNO_QUERY), - mxMainWindow(), - mxPreviewContentWindow(), - mxPreviewBorderWindow(), - mxNotesContentWindow(), - mxNotesBorderWindow(), - mpAccessibleConsole(), - mpAccessiblePreview(), - mpAccessibleNotes(), - mxAccessibleParent() + mxMainPane(rxMainPane, UNO_QUERY) { if (mxMainPane.is()) mxMainPane->setAccessible(this); @@ -726,15 +717,10 @@ PresenterAccessible::AccessibleObject::AccessibleObject ( const OUString& rsName) : PresenterAccessibleObjectInterfaceBase(m_aMutex), msName(rsName), - mxContentWindow(), - mxBorderWindow(), maLocale(rLocale), mnRole(nRole), mnStateSet(0), - mbIsFocused(false), - mxParentAccessible(), - maChildren(), - maListeners() + mbIsFocused(false) { } @@ -1282,8 +1268,7 @@ css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates() //===== AccessibleRelationSet ================================================= AccessibleRelationSet::AccessibleRelationSet() - : AccessibleRelationSetInterfaceBase(m_aMutex), - maRelations() + : AccessibleRelationSetInterfaceBase(m_aMutex) { } @@ -1652,8 +1637,7 @@ bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 n AccessibleNotes::AccessibleNotes ( const css::lang::Locale& rLocale, const OUString& rsName) - : AccessibleObject(rLocale,AccessibleRole::PANEL,rsName), - mpTextView() + : AccessibleObject(rLocale,AccessibleRole::PANEL,rsName) { } diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index e094bae22ac0..17609da85251 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -39,7 +39,6 @@ PresenterBitmapContainer::PresenterBitmapContainer ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper) : mpParentContainer(rpParentContainer), - maIconContainer(), mxCanvas(rxCanvas), mxPresenterHelper(rxPresenterHelper) { @@ -64,7 +63,6 @@ PresenterBitmapContainer::PresenterBitmapContainer ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper) : mpParentContainer(rpParentContainer), - maIconContainer(), mxCanvas(rxCanvas), mxPresenterHelper(rxPresenterHelper) { @@ -288,12 +286,7 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor() mnYHotSpot(0), maReplacementColor(0x00000000), meHorizontalTexturingMode(Once), - meVerticalTexturingMode(Once), - mxNormalBitmap(), - mxMouseOverBitmap(), - mxButtonDownBitmap(), - mxDisabledBitmap(), - mxMaskBitmap() + meVerticalTexturingMode(Once) { } @@ -307,12 +300,7 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor ( mnYHotSpot(0), maReplacementColor(0x00000000), meHorizontalTexturingMode(Once), - meVerticalTexturingMode(Once), - mxNormalBitmap(), - mxMouseOverBitmap(), - mxButtonDownBitmap(), - mxDisabledBitmap(), - mxMaskBitmap() + meVerticalTexturingMode(Once) { if (rpDefault == nullptr) return; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 329ff8399064..61de170c0f96 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -92,18 +92,12 @@ PresenterButton::PresenterButton ( : PresenterButtonInterfaceBase(m_aMutex), mpPresenterController(rpPresenterController), mpTheme(rpTheme), - mxWindow(), - mxCanvas(), - mxPresenterHelper(), msText(rsText), mpFont(rpFont), mpMouseOverFont(rpMouseOverFont), msAction(rsAction), - maCenter(), maButtonSize(-1,-1), - meState(PresenterBitmapDescriptor::Normal), - mxNormalBitmap(), - mxMouseOverBitmap() + meState(PresenterBitmapDescriptor::Normal) { try { diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index c4a08812a631..e7bd4524a602 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -37,8 +37,6 @@ PresenterConfigurationAccess::PresenterConfigurationAccess ( const Reference<XComponentContext>& rxContext, const OUString& rsRootName, WriteMode eMode) - : mxRoot(), - maNode() { try { diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 9aa5af7b2201..b6331c6d1634 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -94,23 +94,13 @@ PresenterController::PresenterController ( mxScreen(rxScreen), mxComponentContext(rxContext), mxController(rxController), - mxConfigurationController(), mxSlideShowController(rxSlideShowController), mxMainPaneId(rxMainPaneId), mpPaneContainer(rpPaneContainer), mnCurrentSlideIndex(-1), - mxCurrentSlide(), - mxNextSlide(), mpWindowManager(new PresenterWindowManager(rxContext,mpPaneContainer,this)), - mpTheme(), - mxMainWindow(), - mpPaneBorderPainter(), mpCanvasHelper(std::make_shared<PresenterCanvasHelper>()), - mxPresenterHelper(), - mpPaintManager(), mnPendingSlideNumber(-1), - mxUrlTransformer(), - mpAccessibleObject(), mbIsAccessibilityActive(false) { OSL_ASSERT(mxController.is()); diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index e5bec81efc92..47bf1a371415 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -125,13 +125,7 @@ PresenterHelpView::PresenterHelpView ( : PresenterHelpViewInterfaceBase(m_aMutex), mxComponentContext(rxContext), mxViewId(rxViewId), - mxPane(), - mxWindow(), - mxCanvas(), mpPresenterController(rpPresenterController), - mpFont(), - mpTextContainer(), - mpCloseButton(), mnSeparatorY(0), mnMaximalWidth(0) { @@ -496,8 +490,7 @@ void PresenterHelpView::ThrowIfDisposed() namespace { LineDescriptor::LineDescriptor() - : msLine(), - maSize(0,0), + : maSize(0,0), mnVerticalOffset(0) { } diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 787f6624eb60..457be1f612b7 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -58,20 +58,9 @@ PresenterNotesView::PresenterNotesView ( : PresenterNotesViewInterfaceBase(m_aMutex), mxViewId(rxViewId), mpPresenterController(rpPresenterController), - mxCanvas(), - mxCurrentNotesPage(), - mpScrollBar(), - mxToolBarWindow(), - mxToolBarCanvas(), - mpToolBar(), - mpCloseButton(), maSeparatorColor(0xffffff), mnSeparatorYLocation(0), - maTextBoundingBox(), - mpBackground(), - mnTop(0), - mpFont(), - mpTextView() + mnTop(0) { try { diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 88628e72cd5e..ad35315438e8 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -33,8 +33,7 @@ namespace sdext::presenter { PresenterPane::PresenterPane ( const Reference<XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController) - : PresenterPaneBase(rxContext, rpPresenterController), - maBoundingBox() + : PresenterPaneBase(rxContext, rpPresenterController) { Reference<lang::XMultiComponentFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_SET_THROW); diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index 6ec411b99c1b..aac8d082a971 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -36,15 +36,6 @@ PresenterPaneBase::PresenterPaneBase ( const ::rtl::Reference<PresenterController>& rpPresenterController) : PresenterPaneBaseInterfaceBase(m_aMutex), mpPresenterController(rpPresenterController), - mxParentWindow(), - mxBorderWindow(), - mxBorderCanvas(), - mxContentWindow(), - mxContentCanvas(), - mxPaneId(), - mxBorderPainter(), - mxPresenterHelper(), - msTitle(), mxComponentContext(rxContext) { if (mpPresenterController) diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 53d60faa2315..8fcc2a61ba30 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -145,9 +145,7 @@ private: PresenterPaneBorderPainter::PresenterPaneBorderPainter ( const Reference<XComponentContext>& rxContext) : PresenterPaneBorderPainterInterfaceBase(m_aMutex), - mxContext(rxContext), - mpTheme(), - mpRenderer() + mxContext(rxContext) { } @@ -368,13 +366,8 @@ PresenterPaneBorderPainter::Renderer::Renderer ( const Reference<XComponentContext>& rxContext, const std::shared_ptr<PresenterTheme>& rpTheme) : mpTheme(rpTheme), - maRendererPaneStyles(), - mxCanvas(), - mxPresenterHelper(), maViewState(geometry::AffineMatrix2D(1,0,0, 0,1,0), nullptr), - mxViewStateClip(), - mbHasCallout(false), - maCalloutAnchor() + mbHasCallout(false) { Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager()); if (xFactory.is()) @@ -736,23 +729,10 @@ BorderSize::BorderSize() RendererPaneStyle::RendererPaneStyle ( const std::shared_ptr<PresenterTheme>& rpTheme, const OUString& rsStyleName) - : mpTopLeft(), - mpTop(), - mpTopRight(), - mpLeft(), - mpRight(), - mpBottomLeft(), - mpBottom(), - mpBottomRight(), - mpBottomCallout(), - mpEmpty(std::make_shared<PresenterBitmapDescriptor>()), - mpFont(), + : mpEmpty(std::make_shared<PresenterBitmapDescriptor>()), mnFontXOffset(0), mnFontYOffset(0), - meFontAnchor(Anchor::Center), - maInnerBorderSize(), - maOuterBorderSize(), - maTotalBorderSize() + meFontAnchor(Anchor::Center) { if (rpTheme == nullptr) return; diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index a7320fdb2c09..b28f36a399a7 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -28,9 +28,7 @@ namespace sdext::presenter { PresenterPaneContainer::PresenterPaneContainer ( const Reference<XComponentContext>& rxContext) - : PresenterPaneContainerInterfaceBase(m_aMutex), - maPanes(), - mxPresenterHelper() + : PresenterPaneContainerInterfaceBase(m_aMutex) { Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager()); if (xFactory.is()) diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index dd4eb2fa9b8e..258f956d00a1 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -51,9 +51,7 @@ PresenterPaneFactory::PresenterPaneFactory ( const ::rtl::Reference<PresenterController>& rpPresenterController) : PresenterPaneFactoryInterfaceBase(m_aMutex), mxComponentContextWeak(rxContext), - mxConfigurationControllerWeak(), - mpPresenterController(rpPresenterController), - mpResourceCache() + mpPresenterController(rpPresenterController) { } diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 0ee967ffe063..832790737295 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -352,7 +352,6 @@ PresenterProtocolHandler::Dispatch::Dispatch ( msURLPath(rsURLPath), mpCommand(CreateCommand(rsURLPath, rpPresenterController)), mpPresenterController(rpPresenterController), - maStatusListenerContainer(), mbIsListeningToWindowManager(false) { if (mpCommand != nullptr) diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 594e6ce17287..ab30f08ebe90 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -168,8 +168,7 @@ PresenterScreenListener::PresenterScreenListener ( const css::uno::Reference<css::frame::XModel2>& rxModel) : PresenterScreenListenerInterfaceBase(m_aMutex), mxModel(rxModel), - mxComponentContext(rxContext), - mpPresenterScreen() + mxComponentContext(rxContext) { } @@ -242,15 +241,7 @@ PresenterScreen::PresenterScreen ( const css::uno::Reference<css::frame::XModel2>& rxModel) : PresenterScreenInterfaceBase(m_aMutex), mxModel(rxModel), - mxController(), - mxConfigurationControllerWeak(), - mxContextWeak(rxContext), - mpPresenterController(), - mxSavedConfiguration(), - mpPaneContainer(), - mxPaneFactory(), - mxViewFactory(), - maViewDescriptors() + mxContextWeak(rxContext) { } diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index d811c92cfaa0..a4db80277324 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -72,9 +72,6 @@ PresenterScrollBar::PresenterScrollBar ( const ::std::function<void (double)>& rThumbMotionListener) : PresenterScrollBarInterfaceBase(m_aMutex), mxComponentContext(rxComponentContext), - mxWindow(), - mxCanvas(), - mxPresenterHelper(), mpPaintManager(rpPaintManager), mnThumbPosition(0), mnTotalSize(0), @@ -85,17 +82,7 @@ PresenterScrollBar::PresenterScrollBar ( meButtonDownArea(None), meMouseMoveArea(None), mbIsNotificationActive(false), - mpBitmaps(), - mpPrevButtonDescriptor(), - mpNextButtonDescriptor(), - mpPagerStartDescriptor(), - mpPagerCenterDescriptor(), - mpPagerEndDescriptor(), - mpThumbStartDescriptor(), - mpThumbCenterDescriptor(), - mpThumbEndDescriptor(), mpMousePressRepeater(std::make_shared<MousePressRepeater>(this)), - mpBackgroundBitmap(), mpCanvasHelper(new PresenterCanvasHelper()) { try diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index f95d9a050947..9de4c8820b8c 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -48,12 +48,7 @@ PresenterSlidePreview::PresenterSlidePreview ( : PresenterSlidePreviewInterfaceBase(m_aMutex), mpPresenterController(rpPresenterController), mxViewId(rxViewId), - mxPreviewRenderer(), - mxPreview(), - mxCurrentSlide(), - mnSlideAspectRatio(28.0 / 21.0), - mxWindow(), - mxCanvas() + mnSlideAspectRatio(28.0 / 21.0) { if ( ! rxContext.is() || ! rxViewId.is() diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index 26239c0b2642..b1ae31bad822 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -57,27 +57,12 @@ PresenterSlideShowView::PresenterSlideShowView ( mxViewId(rxViewId), mxController(rxController), mxSlideShowController(PresenterHelper::GetSlideShowController(rxController)), - mxSlideShow(), - mxCanvas(), - mxViewCanvas(), - mxPointer(), - mxWindow(), - mxViewWindow(), - mxTopPane(), - mxPresenterHelper(), - mxBackgroundPolygon1(), - mxBackgroundPolygon2(), mbIsViewAdded(false), mnPageAspectRatio(28.0/21.0), maBroadcaster(m_aMutex), - mpBackground(), mbIsForcedPaintPending(false), mbIsPaintPending(true), - msClickToExitPresentationText(), - msClickToExitPresentationTitle(), - msTitleTemplate(), - mbIsEndSlideVisible(false), - mxCurrentSlide() + mbIsEndSlideVisible(false) { if (mpPresenterController) { diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index dcb00b60bdda..f89061ef67fb 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -232,24 +232,13 @@ PresenterSlideSorter::PresenterSlideSorter ( : PresenterSlideSorterInterfaceBase(m_aMutex), mxComponentContext(rxContext), mxViewId(rxViewId), - mxPane(), - mxCanvas(), - mxWindow(), mpPresenterController(rpPresenterController), mxSlideShowController(mpPresenterController->GetSlideShowController()), - mxPreviewCache(), mbIsLayoutPending(true), - mpLayout(), - mpVerticalScrollBar(), - mpCloseButton(), - mpMouseOverManager(), mnSlideIndexMousePressed(-1), mnCurrentSlideIndex(-1), mnSeparatorY(0), - maSeparatorColor(0x00ffffff), - maCurrentSlideFrameBoundingBox(), - mpCurrentSlideFrameRenderer(), - mxPreviewFrame() + maSeparatorColor(0x00ffffff) { if ( ! rxContext.is() || ! rxViewId.is() @@ -1061,9 +1050,7 @@ void PresenterSlideSorter::ThrowIfDisposed() PresenterSlideSorter::Layout::Layout ( const ::rtl::Reference<PresenterScrollBar>& rpVerticalScrollBar) - : maBoundingBox(), - maPreviewSize(), - mnHorizontalOffset(0), + : mnHorizontalOffset(0), mnVerticalOffset(0), mnHorizontalGap(0), mnVerticalGap(0), @@ -1417,14 +1404,8 @@ PresenterSlideSorter::MouseOverManager::MouseOverManager ( const std::shared_ptr<PresenterTheme>& rpTheme, const Reference<awt::XWindow>& rxInvalidateTarget, const std::shared_ptr<PresenterPaintManager>& rpPaintManager) - : mxCanvas(), - mxSlides(rxSlides), - mpLeftLabelBitmap(), - mpCenterLabelBitmap(), - mpRightLabelBitmap(), - mpFont(), + : mxSlides(rxSlides), mnSlideIndex(-1), - maSlideBoundingBox(), mxInvalidateTarget(rxInvalidateTarget), mpPaintManager(rpPaintManager) { @@ -1703,15 +1684,7 @@ void PresenterSlideSorter::MouseOverManager::Invalidate() PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) - : mpTopLeft(), - mpTop(), - mpTopRight(), - mpLeft(), - mpRight(), - mpBottomLeft(), - mpBottom(), - mpBottomRight(), - mnTopFrameSize(0), + : mnTopFrameSize(0), mnLeftFrameSize(0), mnRightFrameSize(0), mnBottomFrameSize(0) diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx index d58eefd21412..0f7c8f829062 100644 --- a/sdext/source/presenter/PresenterSprite.cxx +++ b/sdext/source/presenter/PresenterSprite.cxx @@ -31,9 +31,7 @@ using ::com::sun::star::uno::UNO_QUERY; namespace sdext::presenter { PresenterSprite::PresenterSprite() - : mxSpriteFactory(), - mxSprite(), - maSize(0,0), + : maSize(0,0), maLocation(0,0), mbIsVisible(false) { diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index 8ce72a66a3f7..452e633a2ec9 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -31,7 +31,6 @@ namespace sdext::presenter { PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController) : PresenterPaneBase(rxContext, rpPresenterController), - mxParentCanvas(), mpSprite(std::make_shared<PresenterSprite>()) { Reference<lang::XMultiComponentFactory> xFactory ( diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 2acc432ee1fd..f77ef93bc6d8 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -67,12 +67,8 @@ PresenterTextView::PresenterTextView ( const Reference<rendering::XCanvas>& rxCanvas, const ::std::function<void (const css::awt::Rectangle&)>& rInvalidator) : mxCanvas(rxCanvas), - mxBreakIterator(), - mxScriptTypeDetector(), maLocation(0,0), maSize(0,0), - mpFont(), - maParagraphs(), mpCaret(std::make_shared<PresenterTextCaret>( rxContext, [this] (sal_Int32 const nParagraphIndex, sal_Int32 const nCharacterIndex) @@ -80,8 +76,7 @@ PresenterTextView::PresenterTextView ( rInvalidator)), mnLeftOffset(0), mnTopOffset(0), - mbIsFormatPending(false), - maTextChangeBroadcaster() + mbIsFormatPending(false) { Reference<lang::XMultiComponentFactory> xFactory = rxContext->getServiceManager(); @@ -438,12 +433,10 @@ PresenterTextParagraph::PresenterTextParagraph ( const Reference<i18n::XScriptTypeDetector>& rxScriptTypeDetector, const Reference<text::XTextRange>& rxTextRange, const SharedPresenterTextCaret& rpCaret) - : msParagraphText(), - mnParagraphIndex(nParagraphIndex), + : mnParagraphIndex(nParagraphIndex), mpCaret(rpCaret), mxBreakIterator(rxBreakIterator), mxScriptTypeDetector(rxScriptTypeDetector), - maLines(), mnVerticalOffset(0), mnXOrigin(0), mnYOrigin(0), @@ -452,8 +445,7 @@ PresenterTextParagraph::PresenterTextParagraph ( mnDescent(0), mnLineHeight(-1), mnWritingMode (text::WritingMode2::LR_TB), - mnCharacterOffset(0), - maCells() + mnCharacterOffset(0) { if (!rxTextRange.is()) return; @@ -1045,9 +1037,7 @@ PresenterTextCaret::PresenterTextCaret ( mnCaretBlinkTaskId(0), mbIsCaretVisible(false), maCharacterBoundsAccess(rCharacterBoundsAccess), - maInvalidator(rInvalidator), - maBroadcaster(), - maCaretBounds() + maInvalidator(rInvalidator) { } @@ -1161,9 +1151,7 @@ PresenterTextParagraph::Line::Line ( : mnLineStartCharacterIndex(nLineStartCharacterIndex), mnLineEndCharacterIndex(nLineEndCharacterIndex), mnLineStartCellIndex(-1), mnLineEndCellIndex(-1), - mxLayoutedLine(), - mnBaseLine(0), mnWidth(0), - maCellBoxes() + mnBaseLine(0), mnWidth(0) { } diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index bf911dd970c4..c29e8e0de8a2 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -244,7 +244,6 @@ PresenterTheme::PresenterTheme ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) : mxContext(rxContext), - mpTheme(), mxCanvas(rxCanvas) { mpTheme = ReadTheme(); @@ -465,9 +464,7 @@ PresenterTheme::SharedFontDescriptor PresenterTheme::GetFont ( PresenterTheme::FontDescriptor::FontDescriptor ( const std::shared_ptr<FontDescriptor>& rpDescriptor) - : msFamilyName(), - msStyleName(), - mnSize(12), + : mnSize(12), mnColor(0x00000000), msAnchor(OUString("Left")), mnXOffset(0), @@ -558,12 +555,10 @@ PresenterTheme::Theme::Theme ( const Reference<container::XHierarchicalNameAccess>& rxThemeRoot, const OUString& rsNodeName) : msConfigurationNodeName(rsNodeName), - mpParentTheme(), maPaneStyles(), maViewStyles(), maStyleAssociations(), - mxThemeRoot(rxThemeRoot), - mpIconContainer() + mxThemeRoot(rxThemeRoot) { } @@ -654,8 +649,7 @@ ReadContext::ReadContext ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const Reference<rendering::XCanvas>& rxCanvas) : mxComponentContext(rxContext), - mxCanvas(rxCanvas), - mxPresenterHelper() + mxCanvas(rxCanvas) { Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager()); if (xFactory.is()) @@ -883,12 +877,6 @@ SharedPaneStyle PaneStyleContainer::GetPaneStyle (const OUString& rsStyleName) c //===== PaneStyle ============================================================= PaneStyle::PaneStyle() - : msStyleName(), - mpParentStyle(), - mpFont(), - maInnerBorderSize(), - maOuterBorderSize(), - mpBitmaps() { } @@ -997,10 +985,6 @@ SharedViewStyle ViewStyleContainer::GetViewStyle (const OUString& rsStyleName) c //===== ViewStyle ============================================================= ViewStyle::ViewStyle() - : msStyleName(), - mpParentStyle(), - mpFont(), - mpBackground() { } diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 67281e368b18..b03df035cd38 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -197,10 +197,6 @@ std::shared_ptr<TimerScheduler> TimerScheduler::Instance( TimerScheduler::TimerScheduler( uno::Reference<uno::XComponentContext> const& xContext) - : maTaskContainerMutex(), - maScheduledTasks(), - maCurrentTaskMutex(), - mpCurrentTask() { uno::Reference<frame::XDesktop> const xDesktop( frame::Desktop::create(xContext)); @@ -439,12 +435,10 @@ TimerTask::TimerTask ( PresenterClockTimer::PresenterClockTimer (const Reference<XComponentContext>& rxContext) : PresenterClockTimerInterfaceBase(m_aMutex), - maListeners(), maDateTime(), mnTimerTaskId(PresenterTimer::NotAValidTaskId), mbIsCallbackPending(false), - mxRequestCallback() - , m_xContext(rxContext) + m_xContext(rxContext) { assert(m_xContext.is()); Reference<lang::XMultiComponentFactory> xFactory = diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 1a06c70db16c..cb638c601dbd 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -355,16 +355,11 @@ PresenterToolBar::PresenterToolBar ( const Anchor eAnchor) : PresenterToolBarInterfaceBase(m_aMutex), mxComponentContext(rxContext), - maElementContainer(), - mpCurrentContainerPart(), mxWindow(rxWindow), mxCanvas(rxCanvas), - mxSlideShowController(), - mxCurrentSlide(), mpPresenterController(rpPresenterController), mbIsLayoutPending(false), - meAnchor(eAnchor), - maMinimalSize() + meAnchor(eAnchor) { } @@ -1014,12 +1009,8 @@ PresenterToolBarView::PresenterToolBarView ( const Reference<frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController) : PresenterToolBarViewInterfaceBase(m_aMutex), - mxPane(), mxViewId(rxViewId), - mxWindow(), - mxCanvas(), - mpPresenterController(rpPresenterController), - mpToolBar() + mpPresenterController(rpPresenterController) { try { @@ -1138,14 +1129,6 @@ Element::Element ( const ::rtl::Reference<PresenterToolBar>& rpToolBar) : ElementInterfaceBase(m_aMutex), mpToolBar(rpToolBar), - maLocation(), - maSize(), - mpNormal(), - mpMouseOver(), - mpSelected(), - mpDisabled(), - mpMouseOverSelected(), - mpMode(), mbIsOver(false), mbIsPressed(false), mbIsSelected(false), @@ -1335,9 +1318,6 @@ void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEven namespace { ElementMode::ElementMode() - : mpIcon(), - msAction(), - maText() { } @@ -1619,8 +1599,6 @@ bool Label::SetState (const bool, const bool) namespace { Text::Text() - : msText(), - mpFont() { } @@ -1740,8 +1718,7 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime) //===== TimeLabel ============================================================= TimeLabel::TimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar) - : Label(rpToolBar), - mpListener() + : Label(rpToolBar) { } diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 87759f7fe9b3..7c7f8c98bae3 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -97,10 +97,8 @@ PresenterViewFactory::PresenterViewFactory ( const ::rtl::Reference<PresenterController>& rpPresenterController) : PresenterViewFactoryInterfaceBase(m_aMutex), mxComponentContext(rxContext), - mxConfigurationController(), mxControllerWeak(rxController), - mpPresenterController(rpPresenterController), - mpResourceCache() + mpPresenterController(rpPresenterController) { } diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index f6ff53852ea6..24115fa52523 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -53,22 +53,13 @@ PresenterWindowManager::PresenterWindowManager ( : PresenterWindowManagerInterfaceBase(m_aMutex), mxComponentContext(rxContext), mpPresenterController(rpPresenterController), - mxParentWindow(), - mxParentCanvas(), - mxPaneBorderManager(), - mpPaneBorderPainter(), mpPaneContainer(rpPaneContainer), mbIsLayoutPending(true), mbIsLayouting(false), - mpTheme(), - mpBackgroundBitmap(), - mxScaledBackgroundBitmap(), - mxClipPolygon(), meLayoutMode(LM_Generic), mbIsSlideSorterActive(false), mbIsHelpViewActive(false), mbisPaused(false), - maLayoutListeners(), mbIsMouseClickPending(false) { |