diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-11 12:36:29 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-11 18:17:58 +0200 |
commit | 83a962578f616ae4ff215fa782763f2045a20bcc (patch) | |
tree | 4286476b26081960248ea63752822d9589db6d0f /svx | |
parent | 591db0f97b6084723c138a01d5f336b1f1a3a639 (diff) |
loplugin:simplifyconstruct in svtools..svx
Change-Id: Ia20fac7cec01ac658a903f8b001807b2e72dbf3e
Reviewed-on: https://gerrit.libreoffice.org/60316
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
54 files changed, 29 insertions, 131 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 6ae402c069f1..3ffcc8e227d6 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -104,11 +104,9 @@ AccessibleShape::AccessibleShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo) : AccessibleContextBase (rShapeInfo.mxParent,AccessibleRole::SHAPE), - mpChildrenManager(nullptr), mxShape (rShapeInfo.mxShape), maShapeTreeInfo (rShapeTreeInfo), m_nIndexInParent(-1), - mpText (nullptr), mpParent (rShapeInfo.mpChildrenManager) { m_pShape = GetSdrObjectFromXShape(mxShape); diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 29f670dc8d8f..821c921d6336 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -236,7 +236,6 @@ namespace accessibility }; AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() : - mxFrontEnd( nullptr ), maLastSelection( EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND,EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND ), mnFirstVisibleChild( -1 ), mnLastVisibleChild( -2 ), diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 0ddbd77670a2..a62587ddfc47 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -1009,7 +1009,6 @@ void ChildrenManagerImpl::UnregisterAsDisposeListener ( // AccessibleChildDescriptor ChildDescriptor::ChildDescriptor (const Reference<drawing::XShape>& xShape) : mxShape (xShape), - mxAccessibleShape (nullptr), mbCreateEventPending (true) { // Empty. @@ -1017,8 +1016,7 @@ ChildDescriptor::ChildDescriptor (const Reference<drawing::XShape>& xShape) ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShape) - : mxShape (nullptr), - mxAccessibleShape (rxAccessibleShape), + : mxAccessibleShape (rxAccessibleShape), mbCreateEventPending (true) { // Make sure that the accessible object has the <const>VISIBLE</const> diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index bee68428313a..48bbb91e81f5 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -959,7 +959,7 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( return pRet; } -Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::mxBreakIterator = nullptr; +Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::mxBreakIterator; Reference < i18n::XBreakIterator > const & EnhancedCustomShapeFontWork::GetBreakIterator() { diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index d46f31beacf7..d6bbf653f569 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -38,7 +38,6 @@ SvxXConnectionPreview::SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle) , pEdgeObj(nullptr) - , pSdrPage(nullptr) , pView(nullptr) { SetMapMode(MapMode(MapUnit::Map100thMM)); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index c6cea65bd278..7671d5119abe 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -101,7 +101,6 @@ SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits) , aDaTiLast( DateTime::EMPTY ) , aDaTiFilterFirst( DateTime::EMPTY ) , aDaTiFilterLast( DateTime::EMPTY ) - , pCommentSearcher(nullptr) { SetNodeDefaultImages(); } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index ff8845ae2d4b..48e6cdb78f01 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -44,9 +44,7 @@ using namespace com::sun::star; Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle), - mpModel(nullptr), mpFmPage(nullptr), - mp3DView(nullptr), mpScene(nullptr), mp3DObj(nullptr), mnObjectType(SvxPreviewObjectType::SPHERE) diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index de20f8e1d05b..ebc6f4b9cc79 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -74,7 +74,6 @@ SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RectPoint eRpt, , nBorderWidth(nBorder) , nRadius(nCircle) , eDefRP(eRpt) - , pBitmap(nullptr) , m_nState(CTL_STATE::NONE) , mbUpdateForeground(true) , mbUpdateBackground(true) @@ -626,7 +625,6 @@ RectCtl::RectCtl(SvxTabPage* pPage, RectPoint eRpt, sal_uInt16 nBorder) , nBorderWidth(Application::GetDefaultDevice()->LogicToPixel(Size(nBorder, 0), MapMode(MapUnit::Map100thMM)).Width()) , eRP(eRpt) , eDefRP(eRpt) - , pBitmap(nullptr) , m_nState(CTL_STATE::NONE) , mbCompleteDisable(false) { diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 17d416d3ad94..22a4443e1cea 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -61,9 +61,7 @@ GraphCtrl::GraphCtrl( vcl::Window* pParent, WinBits nStyle ) : nPolyEdit ( 0 ), bEditMode ( false ), mbSdrMode ( false ), - mbInIdleUpdate ( false ), - pModel ( nullptr ), - pView ( nullptr ) + mbInIdleUpdate ( false ) { pUserCall.reset(new GraphCtrlUserCall( *this )); aUpdateIdle.SetPriority( TaskPriority::LOWEST ); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 9e03e1d51c9d..557cb182f6d3 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -129,7 +129,6 @@ SvxFooterPage::SvxFooterPage(TabPageParent pParent, const SfxItemSet& rAttr) SvxHFPage::SvxHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 nSetId) : SfxTabPage(pParent, "svx/ui/headfootformatpage.ui", "HFFormatPage", &rSet) , nId(nSetId) - , pBBSet(nullptr) , mbDisableQueryBox(false) , mbEnableDrawingLayerFillStyles(false) , m_xCntSharedBox(m_xBuilder->weld_check_button("checkSameLR")) diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index fe93fbc3d349..d3619fbd73e9 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -139,8 +139,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageComboBox(VclPtr<vcl::Window> } SvxLanguageBoxBase::SvxLanguageBoxBase() - : m_pSpellUsedLang(nullptr) - , m_bHasLangNone(false) + : m_bHasLangNone(false) , m_bLangNoneIsLangAll(false) , m_bWithCheckmark(false) { diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index f413ed1de17a..bb0f185ad310 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -266,12 +266,7 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi , bSet(false) , bConstruct(true) , nModifyFlag(ModifyFlags::NONE) - , pSearchList(nullptr) , pReplaceList(new SearchAttrItemList) - , pSearchItem(nullptr) - , pSearchController(nullptr) - , pOptionsController(nullptr) - , pFamilyController(nullptr) , nTransliterationFlags(TransliterationFlags::NONE) { get(m_pSearchFrame, "searchframe"); diff --git a/svx/source/engine3d/e3dsceneupdater.cxx b/svx/source/engine3d/e3dsceneupdater.cxx index 189889b2af79..07df1af059b9 100644 --- a/svx/source/engine3d/e3dsceneupdater.cxx +++ b/svx/source/engine3d/e3dsceneupdater.cxx @@ -25,8 +25,7 @@ E3DModifySceneSnapRectUpdater::E3DModifySceneSnapRectUpdater(const SdrObject* pObject) -: mpScene(nullptr), - mpViewInformation3D(nullptr) +: mpScene(nullptr) { // Secure old 3D transformation stack before modification if(const E3dObject* pE3dObject = dynamic_cast< const E3dObject* >(pObject)) diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index c228f0ddd907..6df52ce4d8da 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -92,15 +92,10 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p , aImgLightOff(BitmapEx(RID_SVXBMP_LAMP_OFF)) , bUpdate(false) , eViewType(ViewType3D::Geo) - , pModel(nullptr) , pVDev(nullptr) , pBindings(pInBindings) - , pControllerItem(nullptr) - , pConvertTo3DItem(nullptr) - , pConvertTo3DLatheItem(nullptr) , mpImpl(new Svx3DWinImpl) , ePoolUnit(MapUnit::MapMM) - , mpRemember2DAttributes(nullptr) { get(m_pBtnGeo, "geometry"); get(m_pBtnRepresentation, "representation"); diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 32f413ab3567..3a4a98e76853 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -175,7 +175,6 @@ E3dScene::E3dScene(SdrModel& rSdrModel) : E3dObject(rSdrModel), SdrObjList(), aCamera(basegfx::B3DPoint(0.0, 0.0, 4.0), basegfx::B3DPoint()), - mp3DDepthRemapper(nullptr), bDrawOnlySelected(false), mbSkipSettingDirty(false) { diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 9dbba769b08f..09f76a800c74 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1038,8 +1038,6 @@ FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext) ,m_aMode( getDataModeIdentifier() ) ,m_nCursorListening(0) ,m_bInterceptingDispatch(false) - ,m_pStateCache(nullptr) - ,m_pDispatchers(nullptr) ,m_xContext(_rxContext) { // Create must be called after this constructor diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index b4d5695ec178..9b2a774ae918 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1053,8 +1053,6 @@ void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) DbTextField::DbTextField(DbGridColumn& _rColumn) :DbLimitedLengthField(_rColumn) - ,m_pEdit( nullptr ) - ,m_pPainterImplementation( nullptr ) ,m_bIsSimpleEdit( true ) { } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index fdc7f6d704d7..d82820a7d36e 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -946,10 +946,7 @@ DbGridControl::DbGridControl( ,m_nAsynAdjustEvent(nullptr) ,m_pDataSourcePropListener(nullptr) ,m_pFieldListeners(nullptr) - ,m_pCursorDisposeListener(nullptr) ,m_pGridListener(nullptr) - ,m_pDataCursor(nullptr) - ,m_pSeekCursor(nullptr) ,m_nSeekPos(-1) ,m_nTotalCount(-1) ,m_aNullDate(::dbtools::DBTypeConversion::getStandardDate()) diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index b447531ebd77..c5b88d79d4d0 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1071,7 +1071,6 @@ void FmFilterString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderCo FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HASBUTTONSATROOT ) - ,m_pModel( nullptr ) ,m_pEditingCurrently( nullptr ) ,m_aControlExchange( this ) ,m_aTimerCounter( 0 ) diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index decabb6cb5e6..3587b4afbfbb 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -55,7 +55,6 @@ FmFormModel::FmFormModel( : SdrModel( pPool, pPers) - , m_pImpl(nullptr) , m_pObjShell(nullptr) , m_bOpenInDesignMode(false) , m_bAutoControlFocus(false) diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 36cb7274940f..2a6ed612c658 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -890,8 +890,7 @@ namespace svxform } FormScriptingEnvironment::FormScriptingEnvironment( FmFormModel& _rModel ) - :m_pScriptListener( nullptr ) - ,m_rFormModel( _rModel ) + :m_rFormModel( _rModel ) ,m_bDisposed( false ) { m_pScriptListener = ListenerImplementation( new FormScriptListener( this ) ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index a4a59c701c1a..34e86a1fcc5e 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -115,7 +115,6 @@ namespace svxform NavigatorTree::NavigatorTree( vcl::Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL ) // #100258# OJ WB_HSCROLL added ,m_aControlExchange(this) - ,m_pNavModel( nullptr ) ,m_pRootEntry(nullptr) ,m_pEditEntry(nullptr) ,nEditEvent(nullptr) diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index bce9abbdbb0b..be279c7d4b9a 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -111,7 +111,6 @@ GalleryBrowser1::GalleryBrowser1( mpThemes ( VclPtr<GalleryThemeListBox>::Create( this, WB_TABSTOP | WB_3DLOOK | WB_BORDER | WB_HSCROLL | WB_VSCROLL | WB_AUTOHSCROLL | WB_SORT ) ), mpGallery ( pGallery ), mpExchangeData ( new ExchangeData ), - mpThemePropsDlgItemSet( nullptr ), aImgNormal ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_NORMAL ) ), aImgDefault ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_DEFAULT ) ), aImgReadOnly ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_READONLY ) ), diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 0fbeebe1e869..ce1bde8461f9 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -377,9 +377,7 @@ void GalleryProgress::Update( sal_Int32 nVal, sal_Int32 nMaxVal ) GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uInt32 nObjectPos, bool bLazy ) : mpTheme( pTheme ), meObjectKind( mpTheme->GetObjectKind( nObjectPos ) ), - mnObjectPos( nObjectPos ), - mpGraphicObject( nullptr ), - mpURL( nullptr ) + mnObjectPos( nObjectPos ) { InitData( bLazy ); diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index c7b7f2860476..f5e5f420a5c7 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -98,8 +98,7 @@ private: // used by locked columns public: DbGridColumn(sal_uInt16 _nId, DbGridControl& rParent) - :m_pCell(nullptr) - ,m_rParent(rParent) + :m_rParent(rParent) ,m_nLastVisibleWidth(-1) ,m_nFormatKey(0) ,m_nFieldType(0) diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index e3a850c25d75..6f2d1bf55e15 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -268,8 +268,7 @@ SfxPoolItem* SvxPatternListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxPatternListItem, PatternList ) -SvxDashListItem::SvxDashListItem() : - pDashList( nullptr ) +SvxDashListItem::SvxDashListItem() { } diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index 43d022db4073..b35aa1a8e8c2 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -159,7 +159,6 @@ ViewObjectContact::ViewObjectContact(ObjectContact& rObjectContact, ViewContact& mrViewContact(rViewContact), maObjectRange(), mxPrimitive2DSequence(), - mpPrimitiveAnimation(nullptr), mbLazyInvalidate(false) { // make the ViewContact remember me diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index ec1df67520cb..42e7a6a22675 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -35,8 +35,7 @@ namespace sdr { namespace contact { ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& rObjectContact, ViewContact& rViewContact, const ::avmedia::MediaItem& rMediaItem ) : - ViewObjectContactOfSdrObj( rObjectContact, rViewContact ), - mpMediaWindow( nullptr ) + ViewObjectContactOfSdrObj( rObjectContact, rViewContact ) { #if HAVE_FEATURE_AVMEDIA vcl::Window* pWindow = getWindow(); diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 200de3ee5c1d..c39a827b02fd 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -45,8 +45,7 @@ namespace sdr } DefaultProperties::DefaultProperties(SdrObject& rObj) - : BaseProperties(rObj), - mpItemSet(nullptr) + : BaseProperties(rObj) { } diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index 9cde4ca1e2d6..3193ec882364 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -41,8 +41,7 @@ namespace sdr } EmptyProperties::EmptyProperties(SdrObject& rObj) - : BaseProperties(rObj), - mpEmptyItemSet(nullptr) + : BaseProperties(rObj) { } diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx index 89f042c087e0..d79054f5775c 100644 --- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx +++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx @@ -30,8 +30,7 @@ namespace sdr { MasterPageDescriptor::MasterPageDescriptor(SdrPage& aOwnerPage, SdrPage& aUsedPage) : maOwnerPage(aOwnerPage), - maUsedPage(aUsedPage), - mpViewContact(nullptr) + maUsedPage(aUsedPage) { // all layers visible maVisibleLayers.SetAll(); diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index e357dd089bb7..65dbfc8f156d 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -245,7 +245,6 @@ SdrPaintWindow::SdrPaintWindow(SdrPaintView& rNewPaintView, OutputDevice& rOut, : mpOutputDevice(&rOut), mpWindow(pWindow), mrPaintView(rNewPaintView), - mpPreRenderDevice(nullptr), mbTemporaryTarget(false) // #i72889# { } diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 453cadd612b2..72347de60639 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -83,9 +83,6 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport( mpVD(VclPtr<VirtualDevice>::Create()), maScaleRect(rRect), mnMapScalingOfs(0), - mpLineAttr(nullptr), - mpFillAttr(nullptr), - mpTextAttr(nullptr), mpModel(&rModel), mnLayer(nLay), maOldLineColor(), diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 40aab0eb572c..cfafb5a7785e 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -166,7 +166,6 @@ SdrObjUserData::SdrObjUserData(const SdrObjUserData& rData) : SdrObjUserData::~SdrObjUserData() {} SdrObjGeoData::SdrObjGeoData(): - pGPL(nullptr), bMovProt(false), bSizProt(false), bNoPrint(false), @@ -352,15 +351,11 @@ SdrObject::SdrObject(SdrModel& rSdrModel) : mpFillGeometryDefiningShape(nullptr) ,mrSdrModelFromSdrObject(rSdrModel) ,pUserCall(nullptr) - ,pPlusData(nullptr) ,mpImpl(new Impl) ,mpParentOfSdrObject(nullptr) ,nOrdNum(0) - ,pGrabBagItem(nullptr) ,mnNavigationPosition(SAL_MAX_UINT32) ,mnLayerID(0) - ,mpProperties(nullptr) - ,mpViewContact(nullptr) ,mpSvxShape( nullptr ) ,maWeakUnoShape() ,mbDoNotInsertIntoPageAutomatically(false) diff --git a/svx/source/svdraw/svdobjplusdata.cxx b/svx/source/svdraw/svdobjplusdata.cxx index 3057b38a57e5..07eafc707d8f 100644 --- a/svx/source/svdraw/svdobjplusdata.cxx +++ b/svx/source/svdraw/svdobjplusdata.cxx @@ -14,10 +14,7 @@ #include <svl/SfxBroadcaster.hxx> #include <vcl/outdev.hxx> -SdrObjPlusData::SdrObjPlusData(): - pBroadcast(nullptr), - pUserDataList(nullptr), - pGluePoints(nullptr) +SdrObjPlusData::SdrObjPlusData() { } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 22b0c72bcc13..007cbba7d8d8 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -535,7 +535,6 @@ ImpPathForDragAndCreate::ImpPathForDragAndCreate(SdrPathObj& rSdrPathObject) : mrSdrPathObject(rSdrPathObject), aPathPolygon(rSdrPathObject.GetPathPoly()), meObjectKind(mrSdrPathObject.meKind), - mpSdrPathDragData(nullptr), mbCreating(false) { } diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index e1169699b017..c961d04dc080 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -64,8 +64,7 @@ std::unique_ptr<sdr::contact::ViewContact> SdrRectObj::CreateObjectSpecificViewC SdrRectObj::SdrRectObj(SdrModel& rSdrModel) -: SdrTextObj(rSdrModel), - mpXPoly(nullptr) +: SdrTextObj(rSdrModel) { bClosedObj=true; } @@ -73,8 +72,7 @@ SdrRectObj::SdrRectObj(SdrModel& rSdrModel) SdrRectObj::SdrRectObj( SdrModel& rSdrModel, const tools::Rectangle& rRect) -: SdrTextObj(rSdrModel, rRect), - mpXPoly(nullptr) +: SdrTextObj(rSdrModel, rRect) { bClosedObj=true; } @@ -82,8 +80,7 @@ SdrRectObj::SdrRectObj( SdrRectObj::SdrRectObj( SdrModel& rSdrModel, SdrObjKind eNewTextKind) -: SdrTextObj(rSdrModel, eNewTextKind), - mpXPoly(nullptr) +: SdrTextObj(rSdrModel, eNewTextKind) { DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, @@ -95,8 +92,7 @@ SdrRectObj::SdrRectObj( SdrModel& rSdrModel, SdrObjKind eNewTextKind, const tools::Rectangle& rRect) -: SdrTextObj(rSdrModel, eNewTextKind, rRect), - mpXPoly(nullptr) +: SdrTextObj(rSdrModel, eNewTextKind, rRect) { DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 91a5a23040bf..50202370ccd7 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -79,7 +79,6 @@ std::unique_ptr<sdr::contact::ViewContact> SdrTextObj::CreateObjectSpecificViewC SdrTextObj::SdrTextObj(SdrModel& rSdrModel) : SdrAttrObj(rSdrModel), - mpText(nullptr), pEdtOutl(nullptr), eTextKind(OBJ_TEXT) { @@ -102,7 +101,6 @@ SdrTextObj::SdrTextObj( const tools::Rectangle& rNewRect) : SdrAttrObj(rSdrModel), maRect(rNewRect), - mpText(nullptr), pEdtOutl(nullptr), eTextKind(OBJ_TEXT) { @@ -125,7 +123,6 @@ SdrTextObj::SdrTextObj( SdrModel& rSdrModel, SdrObjKind eNewTextKind) : SdrAttrObj(rSdrModel), - mpText(nullptr), pEdtOutl(nullptr), eTextKind(eNewTextKind) { @@ -149,7 +146,6 @@ SdrTextObj::SdrTextObj( const tools::Rectangle& rNewRect) : SdrAttrObj(rSdrModel), maRect(rNewRect), - mpText(nullptr), pEdtOutl(nullptr), eTextKind(eNewTextKind) { diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 3145fa4b5cb3..ea1d3e56dffb 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -99,7 +99,6 @@ void ImpSdrObjTextLink::Closed() ImpSdrObjTextLinkUserData::ImpSdrObjTextLinkUserData(): SdrObjUserData(SdrInventor::Default,SDRUSERDATA_OBJTEXTLINK), aFileDate0( DateTime::EMPTY ), - pLink(nullptr), eCharSet(RTL_TEXTENCODING_DONTKNOW) { } diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 369c66c315ff..636d735efd64 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1134,7 +1134,6 @@ SdrPage::SdrPage(SdrModel& rModel, bool bMasterPage) : tools::WeakBase(), SdrObjList(), maPageUsers(), - mpViewContact(nullptr), mrSdrModelFromSdrPage(rModel), mnWidth(10), mnHeight(10), @@ -1143,9 +1142,7 @@ SdrPage::SdrPage(SdrModel& rModel, bool bMasterPage) mnBorderRight(0), mnBorderLower(0), mpLayerAdmin(new SdrLayerAdmin(&rModel.GetLayerAdmin())), - mpSdrPageProperties(nullptr), mxUnoPage(), - mpMasterPageDescriptor(nullptr), nPageNum(0), mbMaster(bMasterPage), mbInserted(false), diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index e0a394d61a2c..d80932c92076 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -121,9 +121,6 @@ ImpSdrPdfImport::ImpSdrPdfImport(SdrModel& rModel, SdrLayerID nLay, const tools: , maScaleRect(rRect) , mpPdfData(pPdfData) , mnMapScalingOfs(0) - , mpLineAttr(nullptr) - , mpFillAttr(nullptr) - , mpTextAttr(nullptr) , mpModel(&rModel) , mnLayer(nLay) , maOldLineColor() diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index dfbcc0daab7a..4e7f20021975 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -29,8 +29,7 @@ #include <memory> SdrText::SdrText( SdrTextObj& rObject ) -: mpOutlinerParaObject( nullptr ) -, mrObject( rObject ) +: mrObject( rObject ) , mbPortionInfoChecked( false ) { OSL_ENSURE(&mrObject, "SdrText created without SdrTextObj (!)"); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index cb5e6d3e2bbe..b9cd69098072 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1018,8 +1018,6 @@ OUString SdrUndoObjOrdNum::GetComment() const SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText) : SdrUndoObj(rNewObj) - , pOldText(nullptr) - , pNewText(nullptr) , bNewTextAvailable(false) , bEmptyPresObj(false) , mnText(nText) @@ -1415,7 +1413,6 @@ SdrUndoPageList::~SdrUndoPageList() SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg) : SdrUndoPageList(rNewPg) - , pUndoGroup(nullptr) , mbHasFillBitmap(false) { bItsMine = true; diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index cde45dcc4ffc..26fd096a886f 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -52,7 +52,6 @@ AccessibleCell::AccessibleCell( const css::uno::Reference< css::accessibility::X : AccessibleCellBase( rxParent, AccessibleRole::TABLE_CELL ) , maShapeTreeInfo( rShapeTreeInfo ) , mnIndexInParent( nIndex ) -, mpText( nullptr ) , mxCell( rCell ) { //Init the pAccTable var diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index e638c5e7345e..53eaffa65d7e 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -257,7 +257,6 @@ std::vector<sal_Int32> SdrTableObjImpl::lastColWidths; SdrTableObjImpl::SdrTableObjImpl() : mpTableObj( nullptr ) -, mpLayouter( nullptr ) , mbSkipChangeLayout(false) { } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index c5992a7b197b..4abad96afbf4 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -175,7 +175,6 @@ SvxTableController::SvxTableController( : mbCellSelectionMode(false) ,mbHasJustMerged(false) ,mbLeftButtonDown(false) - ,mpSelectionOverlay(nullptr) ,mrView(rView) ,mxTableObj(const_cast< SdrTableObj* >(&rObj)) ,mnUpdateEvent( nullptr ) diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 732e417ab06d..98a366dad788 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -70,7 +70,7 @@ struct RTFCellInfo sal_Int32 mnRowSpan; std::shared_ptr< RTFCellInfo > mxVMergeCell; - explicit RTFCellInfo( SfxItemPool& rPool ) : maItemSet( rPool ), mnStartPara(0), mnParaCount(0), mnCellX(0), mnRowSpan(1), mxVMergeCell(nullptr) {} + explicit RTFCellInfo( SfxItemPool& rPool ) : maItemSet( rPool ), mnStartPara(0), mnParaCount(0), mnCellX(0), mnRowSpan(1) {} }; typedef std::shared_ptr< RTFCellInfo > RTFCellInfoPtr; @@ -144,7 +144,6 @@ SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj ) , mpActDefault( nullptr ) , mpDefMerge( nullptr ) , mxTable( rTableObj.getTable() ) -, mxLastRow( nullptr ) { mpOutliner->SetUpdateMode(true); mpOutliner->SetStyleSheet( 0, mrTableObj.GetStyleSheet() ); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index f26249b451dc..8d1190cdc263 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -58,8 +58,6 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), - pStyleItem ( nullptr ), - pDashItem ( nullptr ), bUpdate ( false ) { addStatusListener( ".uno:LineDash"); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 0be78a576402..f862d3852edc 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star::uno; DictionaryList::DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits) : SvSimpleTable(rParent, nBits) - , m_xDictionary(nullptr) , m_pED_Term(nullptr) , m_pED_Mapping(nullptr) , m_pLB_Property(nullptr) @@ -431,7 +430,6 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ChineseDictionaryDialog", "svx/ui/chinesedictionary.ui") , m_nTextConversionOptions(i18n::TextConversionOption::NONE) - , m_xContext(nullptr) { get(m_pRB_To_Simplified, "tradtosimple"); get(m_pRB_To_Traditional, "simpletotrad"); @@ -463,8 +461,8 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent ) m_pLB_Property->SetDropDownLineCount( m_pLB_Property->GetEntryCount() ); m_pLB_Property->SelectEntryPos(0); - Reference< linguistic2::XConversionDictionary > xDictionary_To_Simplified(nullptr); - Reference< linguistic2::XConversionDictionary > xDictionary_To_Traditional(nullptr); + Reference< linguistic2::XConversionDictionary > xDictionary_To_Simplified; + Reference< linguistic2::XConversionDictionary > xDictionary_To_Traditional; //get dictionaries { if(!m_xContext.is()) @@ -589,7 +587,7 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl, Button*, void) void ChineseDictionaryDialog::updateAfterDirectionChange() { - Reference< linguistic2::XConversionDictionary > xDictionary(nullptr); + Reference< linguistic2::XConversionDictionary > xDictionary; if( m_pRB_To_Simplified->IsChecked() ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index 8a05397d74cf..048b840b9a1f 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -32,8 +32,7 @@ namespace textconversiondlgs using namespace ::com::sun::star; ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog() - : m_xParentWindow( nullptr ) - , m_pDialog( nullptr ) + : m_pDialog( nullptr ) , m_bDisposed(false) , m_bInDispose(false) , m_aContainerMutex() diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 52414fb67957..f7c26ff87270 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -158,9 +158,6 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText mpView ( nullptr ), mpWindow ( nullptr ), mpModel ( pObject ? &pObject->getSdrModelFromSdrObject() : nullptr ), // TTTT should be reference - mpOutliner ( nullptr ), - mpTextForwarder ( nullptr ), - mpViewForwarder ( nullptr ), mbDataValid ( false ), mbIsLocked ( false ), mbNeedsUpdate ( false ), @@ -194,9 +191,6 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText mpView ( &rView ), mpWindow ( &rWindow ), mpModel ( &rObject.getSdrModelFromSdrObject() ), // TTTT should be reference - mpOutliner ( nullptr ), - mpTextForwarder ( nullptr ), - mpViewForwarder ( nullptr ), mbDataValid ( false ), mbIsLocked ( false ), mbNeedsUpdate ( false ), diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 03cb04a7b17b..11aa5cd57212 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -126,16 +126,14 @@ static const OUStringLiteral gaReplacementGraphicsContainerStorageName60( XML_CO SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ), mpDocPersist( nullptr ), - meCreateMode( SvXMLEmbeddedObjectHelperMode::Read ), - mpStreamMap( nullptr ) + meCreateMode( SvXMLEmbeddedObjectHelperMode::Read ) { } SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ) : WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ), mpDocPersist( nullptr ), - meCreateMode( SvXMLEmbeddedObjectHelperMode::Read ), - mpStreamMap( nullptr ) + meCreateMode( SvXMLEmbeddedObjectHelperMode::Read ) { Init( nullptr, rDocPersist, eCreateMode ); } diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index 63d53d8585b9..286d8c9ea834 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -39,9 +39,7 @@ ImpXPolygon::ImpXPolygon(sal_uInt16 nInitSize, sal_uInt16 _nResize) - : pPointAry(nullptr) - , pFlagAry(nullptr) - , pOldPointAry(nullptr) + : pOldPointAry(nullptr) , bDeleteOldPoints(false) , nSize(0) , nResize(_nResize) @@ -51,9 +49,7 @@ ImpXPolygon::ImpXPolygon(sal_uInt16 nInitSize, sal_uInt16 _nResize) } ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly ) - : pPointAry(nullptr) - , pFlagAry(nullptr) - , pOldPointAry(nullptr) + : pOldPointAry(nullptr) , bDeleteOldPoints(false) , nSize(0) , nResize(rImpXPoly.nResize) diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 7b8d75c3009a..e21a584273ca 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -168,8 +168,7 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster) // copy ctor, clones all static defaults XOutdevItemPool::XOutdevItemPool(const XOutdevItemPool& rPool) : SfxItemPool(rPool, true), - mpLocalPoolDefaults(nullptr), - mpLocalItemInfos(nullptr) + mpLocalPoolDefaults(nullptr) { } |