diff options
Diffstat (limited to 'svx/source/sidebar')
25 files changed, 110 insertions, 110 deletions
diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index 58eb5e49049a..3a70fa51b94c 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -57,7 +57,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( SfxViewShell* pViewShell, const ::sfx2::sidebar::EnumContext::Context eContext) { - if (pViewShell != NULL) + if (pViewShell != nullptr) NotifyContextChange(pViewShell->GetController(), eContext); } diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 49f3b96747ce..8cc30e697b0a 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -126,18 +126,18 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( aArguments.getOrDefault("ContextName", OUString())); vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); - if ( ! xParentWindow.is() || pParentWindow==NULL) + if ( ! xParentWindow.is() || pParentWindow==nullptr) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow", - NULL); + nullptr); if ( ! xFrame.is()) throw RuntimeException( "PanelFactory::createUIElement called without Frame", - NULL); - if (pBindings == NULL) + nullptr); + if (pBindings == nullptr) throw RuntimeException( "PanelFactory::createUIElement called without SfxBindings", - NULL); + nullptr); VclPtr<vcl::Window> pControl; ui::LayoutSize aLayoutSize (-1,-1,-1); diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 2ce453032e3d..7a6c97df812c 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -91,12 +91,12 @@ VclPtr<vcl::Window> AreaPropertyPanel::Create ( const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to AreaPropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to AreaPropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to AreaPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to AreaPropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to AreaPropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to AreaPropertyPanel::Create", nullptr, 2); return VclPtr<AreaPropertyPanel>::Create( pParent, diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 2a3777f22d33..e1a97b380d6f 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -443,7 +443,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void) const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectEntry(), aGradient); // #i122676# Change FillStyle and Gradinet in one call - setFillStyleAndGradient(bFillStyleChange ? &aXFillStyleItem : NULL, aXFillGradientItem); + setFillStyleAndGradient(bFillStyleChange ? &aXFillStyleItem : nullptr, aXFillGradientItem); } break; @@ -467,7 +467,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void) const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectEntry(), aHatch); // #i122676# Change FillStyle and Hatch in one call - setFillStyleAndHatch(bFillStyleChange ? &aXFillStyleItem : NULL, aXFillHatchItem); + setFillStyleAndHatch(bFillStyleChange ? &aXFillStyleItem : nullptr, aXFillHatchItem); } } @@ -496,7 +496,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void) const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); // #i122676# Change FillStyle and Bitmap in one call - setFillStyleAndBitmap(bFillStyleChange ? &aXFillStyleItem : NULL, aXFillBitmapItem); + setFillStyleAndBitmap(bFillStyleChange ? &aXFillStyleItem : nullptr, aXFillBitmapItem); } } @@ -560,7 +560,7 @@ void AreaPropertyPanelBase::ImpUpdateTransparencies() { const XGradient& rGradient = mpFloatTransparenceItem->GetGradientValue(); sal_Int32 nEntryPos(0); - Image* pImage = 0; + Image* pImage = nullptr; mpLBTransType->Enable(); mpTrspTextFT->Enable(); @@ -750,7 +750,7 @@ void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefault, co { if(bDefault) { - mpFillGradientItem.reset(pItem ? static_cast<XFillGradientItem*>(pItem->Clone()) : 0); + mpFillGradientItem.reset(pItem ? static_cast<XFillGradientItem*>(pItem->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_GRADIENT == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -787,7 +787,7 @@ void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefault, const { if(bDefault) { - mpHatchItem.reset(pItem ? static_cast<XFillHatchItem*>(pItem->Clone()) : 0); + mpHatchItem.reset(pItem ? static_cast<XFillHatchItem*>(pItem->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_HATCH == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -816,7 +816,7 @@ void AreaPropertyPanelBase::updateFillColor(bool bDefault, const XFillColorItem* { if(bDefault) { - mpColorItem.reset(pItem ? static_cast<XFillColorItem*>(pItem->Clone()) : 0); + mpColorItem.reset(pItem ? static_cast<XFillColorItem*>(pItem->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_SOLID == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -832,7 +832,7 @@ void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefault, cons { if(bDefault) { - mpBitmapItem.reset(pItem ? static_cast<XFillBitmapItem*>(pItem->Clone()) : 0); + mpBitmapItem.reset(pItem ? static_cast<XFillBitmapItem*>(pItem->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_BITMAP == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -1244,7 +1244,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, v break; } - SfxItemPool* pPool = 0; + SfxItemPool* pPool = nullptr; const XFillFloatTransparenceItem aGradientItem(pPool, aTmpGradient, bGradient); setFillFloatTransparence(aGradientItem); } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index 0a5aa89ed37d..d6e64d49e98e 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -284,7 +284,7 @@ void AreaTransparencyGradientControl::ExecuteValueModify( sal_uInt8 nStartCol, s mrAreaPropertyPanel.SetGradient(aTmpGradient); - SfxItemPool* pPool = NULL; + SfxItemPool* pPool = nullptr; bool bEnable = true; XFillFloatTransparenceItem aGradientItem(pPool,aTmpGradient, bEnable ); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index 98ddc10f589a..04db2e750878 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -40,7 +40,7 @@ void AreaTransparencyGradientPopup::Rearrange (XFillFloatTransparenceItem* pItem ProvideContainerAndControl(); AreaTransparencyGradientControl* pControl = dynamic_cast<AreaTransparencyGradientControl*>(mxControl.get()); - if (pControl != NULL) + if (pControl != nullptr) pControl->Rearrange(pItem); } diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 1f0513ab25ad..b43fd3f04d5f 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -226,12 +226,12 @@ VclPtr<vcl::Window> GraphicPropertyPanel::Create ( const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to GraphicPropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to GraphicPropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to GraphicPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to GraphicPropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to GraphicPropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to GraphicPropertyPanel::Create", nullptr, 2); return VclPtr<GraphicPropertyPanel>::Create( pParent, diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index ff120dcae83d..c0e4649aa067 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -66,7 +66,7 @@ InsertPropertyPanel::InsertPropertyPanel ( // In other words, we should find the underlying problem, and remove the // WindowEventListener for good. vcl::Window* pTopWindow = pParent; - while (pTopWindow->GetParent() != NULL) + while (pTopWindow->GetParent() != nullptr) pTopWindow = pTopWindow->GetParent(); pTopWindow->AddChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener)); } @@ -80,7 +80,7 @@ void InsertPropertyPanel::dispose() { // Remove window child listener. vcl::Window* pTopWindow = this; - while (pTopWindow->GetParent() != NULL) + while (pTopWindow->GetParent() != nullptr) pTopWindow = pTopWindow->GetParent(); pTopWindow->RemoveChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener)); mpStandardShapesToolBox.clear(); @@ -101,7 +101,7 @@ IMPL_LINK_TYPED(InsertPropertyPanel, WindowEventListener, VclWindowEvent&, rEven vcl::Window* pWindow = rEvent.GetWindow(); ToolBox* pToolBox = dynamic_cast<ToolBox*>(pWindow); - if (pToolBox == NULL) + if (pToolBox == nullptr) return; // Extract name of (sub)toolbar from help id. @@ -118,13 +118,13 @@ IMPL_LINK_TYPED(InsertPropertyPanel, WindowEventListener, VclWindowEvent&, rEven return; SidebarToolBox* pSidebarToolBox = dynamic_cast<SidebarToolBox*>(mpStandardShapesToolBox.get()); - if (pSidebarToolBox == NULL) + if (pSidebarToolBox == nullptr) return; sal_uInt16 nItemId (pSidebarToolBox->GetItemIdForSubToolbarName(aURL.Path)); if (nItemId == 0) { pSidebarToolBox = dynamic_cast<SidebarToolBox*>(mpCustomShapesToolBox.get()); - if (pSidebarToolBox == NULL) + if (pSidebarToolBox == nullptr) return; nItemId = pSidebarToolBox->GetItemIdForSubToolbarName(aURL.Path); if (nItemId == 0) diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 2a5e134954de..77f67e9602d4 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -108,12 +108,12 @@ VclPtr<vcl::Window> LinePropertyPanel::Create ( const uno::Reference<frame::XFrame>& rxFrame, SfxBindings* pBindings) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to LinePropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to LinePropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to LinePropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to LinePropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to LinePropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to LinePropertyPanel::Create", nullptr, 2); return VclPtr<LinePropertyPanel>::Create(pParent, rxFrame, pBindings); } diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index a2831c4aa888..2c6958e84aa2 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -298,7 +298,7 @@ void LinePropertyPanelBase::updateLineStyle(bool bDisabled, bool bSetOrDefault, } else { - mpStyleItem.reset(0); + mpStyleItem.reset(nullptr); } SelectLineStyle(); @@ -410,7 +410,7 @@ void LinePropertyPanelBase::updateLineStart(bool bDisabled, bool bSetOrDefault, } } - mpStartItem.reset(0); + mpStartItem.reset(nullptr); SelectEndStyle(true); } @@ -437,7 +437,7 @@ void LinePropertyPanelBase::updateLineEnd(bool bDisabled, bool bSetOrDefault, } } - mpEndItem.reset(0); + mpEndItem.reset(nullptr); SelectEndStyle(false); } diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 685ed7abe726..c938102c401f 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -44,7 +44,7 @@ LineWidthControl::LineWidthControl ( maFTWidth( VclPtr<FixedText>::Create(this, SVX_RES(FT_LINE_WIDTH))), maMFWidth( VclPtr<MetricField>::Create(this, SVX_RES(MF_WIDTH))), meMapUnit(SFX_MAPUNIT_TWIP), - rStr(NULL), + rStr(nullptr), mstrPT(SVX_RESSTR(STR_PT)), mnCustomWidth(0), mbCustom(false), diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 2dfb136211f6..8fc0bc33abe9 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -47,14 +47,14 @@ void LineWidthPopup::SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMa ProvideContainerAndControl(); LineWidthControl* pControl = dynamic_cast<LineWidthControl*>(mxControl.get()); - if (pControl != NULL) + if (pControl != nullptr) pControl->SetWidthSelect(lValue, bValuable, eMapUnit); } void LineWidthPopup::PopupModeEndCallback() { LineWidthControl* pControl = dynamic_cast<LineWidthControl*>(mxControl.get()); - if (pControl != NULL) + if (pControl != nullptr) { if (pControl->IsCloseByEdit()) { diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index b8354fc6dca9..2d41152032c0 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -26,7 +26,7 @@ namespace svx { namespace sidebar { LineWidthValueSet::LineWidthValueSet ( vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ), - pVDev(NULL), + pVDev(nullptr), nSelItem(0), bCusEnable(false) { diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index cd3b0d36f6bd..78d4a7c65609 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -240,7 +240,7 @@ void NBOTypeMgrBase::StoreMapUnit_impl() { } } // Character Bullet Type lib -BulletsSettings_Impl* BulletsTypeMgr::pActualBullets[] ={0,0,0,0,0,0,0,0}; +BulletsSettings_Impl* BulletsTypeMgr::pActualBullets[] ={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}; sal_Unicode BulletsTypeMgr::aDynamicBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '}; sal_Unicode BulletsTypeMgr::aDynamicRTLBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '}; @@ -590,7 +590,7 @@ sal_uInt16 GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uI SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); const SvxBrushItem* pBrsh = aFmt.GetBrush(); - const Graphic* pGrf = 0; + const Graphic* pGrf = nullptr; if ( pBrsh ) pGrf = pBrsh->GetGraphic(); @@ -632,7 +632,7 @@ bool GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); const SvxBrushItem* pBrsh = aFmt.GetBrush(); - const Graphic* pGrf = 0; + const Graphic* pGrf = nullptr; if ( pBrsh ) pGrf = pBrsh->GetGraphic(); else @@ -759,8 +759,8 @@ OUString GraphyicBulletsTypeMgr::GetGrfName(sal_uInt16 nIndex) return sRet; } // Mix Bullets Type lib -MixBulletsSettings_Impl* MixBulletsTypeMgr::pActualBullets[] ={0,0,0,0,0,0,0,0}; -MixBulletsSettings_Impl* MixBulletsTypeMgr::pDefaultActualBullets[] ={0,0,0,0,0,0,0,0}; +MixBulletsSettings_Impl* MixBulletsTypeMgr::pActualBullets[] ={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}; +MixBulletsSettings_Impl* MixBulletsTypeMgr::pDefaultActualBullets[] ={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}; MixBulletsTypeMgr::MixBulletsTypeMgr() : NBOTypeMgrBase(eNBOType::MIXBULLETS) @@ -809,7 +809,7 @@ MixBulletsTypeMgr::MixBulletsTypeMgr(const MixBulletsTypeMgr& aTypeMgr): static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->sDescription = static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->sDescription; static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->bIsCustomized = static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized; static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->eType = static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->eType; - if ( static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized && static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->pGrfObj != NULL) + if ( static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized && static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->pGrfObj != nullptr) { static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->pGrfObj = static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->pGrfObj; } @@ -953,7 +953,7 @@ sal_uInt16 MixBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 }else if ( (eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) { const SvxBrushItem* pBrsh = aFmt.GetBrush(); - const Graphic* pGrf = 0; + const Graphic* pGrf = nullptr; if ( pBrsh ) pGrf = pBrsh->GetGraphic(); @@ -1020,7 +1020,7 @@ bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u }else if ( (eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP && pActualBullets[nIndex]->eType == eNBType::GRAPHICBULLETS ) { const SvxBrushItem* pBrsh = aFmt.GetBrush(); - const Graphic* pGrf = 0; + const Graphic* pGrf = nullptr; if ( pBrsh ) pGrf = pBrsh->GetGraphic(); else @@ -1055,7 +1055,7 @@ bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u }else { delete pActualBullets[nIndex]->pBullets; - pActualBullets[nIndex]->pBullets = 0; + pActualBullets[nIndex]->pBullets = nullptr; if ( eNumType == SVX_NUM_CHAR_SPECIAL ) { sal_Unicode cChar = aFmt.GetBulletChar(); @@ -1075,7 +1075,7 @@ bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u }else if ( (eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) { const SvxBrushItem* pBrsh = aFmt.GetBrush(); - const Graphic* pGrf = 0; + const Graphic* pGrf = nullptr; if ( pBrsh ) pGrf = pBrsh->GetGraphic(); else @@ -1268,7 +1268,7 @@ NumberingTypeMgr::NumberingTypeMgr() NumberingTypeMgr::NumberingTypeMgr(const NumberingTypeMgr& rTypeMgr) : NBOTypeMgrBase(rTypeMgr) , pNumberSettingsArr (new NumberSettingsArr_Impl) - , pDefaultNumberSettingsArr(NULL) + , pDefaultNumberSettingsArr(nullptr) { ImplLoad("standard.syb"); } @@ -1656,7 +1656,7 @@ bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI }else if ((eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) { if (_pSet->pBrushItem) { delete (_pSet->pBrushItem); - _pSet->pBrushItem=NULL; + _pSet->pBrushItem=nullptr; } if (aFmt.GetBrush()) _pSet->pBrushItem = new SvxBrushItem(*aFmt.GetBrush()); @@ -1698,7 +1698,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 if(DEFAULT_NUM_VALUSET_COUNT <= nIndex) return false; - const FontList* pList = 0; + const FontList* pList = nullptr; OutlineSettings_Impl* pItemArr = pOutlineSettingsArrs[nIndex]; if (isDefault) pItemArr=pDefaultOutlineSettingsArrs[nIndex]; @@ -1706,7 +1706,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 //Font& rActBulletFont = lcl_GetDefaultBulletFont(); NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr; - NumSettings_Impl* pLevelSettings = 0; + NumSettings_Impl* pLevelSettings = nullptr; OUString sBulletCharFormatName = GetBulCharFmtName(); for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) { @@ -1732,7 +1732,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 { SfxObjectShell* pCurDocShell = SfxObjectShell::Current(); const SvxFontListItem* pFontListItem = static_cast<const SvxFontListItem*>( pCurDocShell->GetItem( SID_ATTR_CHAR_FONTLIST ) ); - pList = pFontListItem ? pFontListItem->GetFontList() : 0; + pList = pFontListItem ? pFontListItem->GetFontList() : nullptr; } if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) ) { diff --git a/svx/source/sidebar/nbdtmgfact.cxx b/svx/source/sidebar/nbdtmgfact.cxx index fa04343a8220..06a699551942 100644 --- a/svx/source/sidebar/nbdtmgfact.cxx +++ b/svx/source/sidebar/nbdtmgfact.cxx @@ -44,7 +44,7 @@ NBOTypeMgrBase* CreateInstance(const NBOType aType) { return &OutlineTypeMgr::GetInstance(); } - return NULL; + return nullptr; } }}} diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 12128d72f463..4183ec06e507 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -81,7 +81,7 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId) mpLineDistAtMetricBox->SetModifyHdl( aLink2 ); FieldUnit eUnit = FUNIT_INCH; - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; if (SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_METRIC, pItem) >= SfxItemState::DEFAULT) eUnit = static_cast<FieldUnit>(static_cast<const SfxUInt16Item*>(pItem)->GetValue()); else diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index aed071486bcd..aca25bfe144f 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -57,12 +57,12 @@ VclPtr<vcl::Window> ParaPropertyPanel::Create ( SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to ParaPropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to ParaPropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to ParaPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to ParaPropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to ParaPropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to ParaPropertyPanel::Create", nullptr, 2); return VclPtr<ParaPropertyPanel>::Create( pParent, @@ -545,7 +545,7 @@ FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolI else { SfxViewFrame* pFrame = SfxViewFrame::Current(); - SfxObjectShell* pSh = NULL; + SfxObjectShell* pSh = nullptr; if ( pFrame ) pSh = pFrame->GetObjectShell(); if ( pSh ) //the object shell is not always available during reload diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 63bb7b3f820b..7ce660157ce4 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -59,7 +59,7 @@ PosSizePropertyPanel::PosSizePropertyPanel( const css::uno::Reference<css::ui::XSidebar>& rxSidebar) : PanelLayout(pParent, "PosSizePropertyPanel", "svx/ui/sidebarpossize.ui", rxFrame), maRect(), - mpView(0), + mpView(nullptr), mlOldWidth(1), mlOldHeight(1), meRP(RP_LT), @@ -220,9 +220,9 @@ void PosSizePropertyPanel::Initialize() if ( pCurSh ) mpView = pCurSh->GetDrawView(); else - mpView = NULL; + mpView = nullptr; - if ( mpView != NULL ) + if ( mpView != nullptr ) { maUIScale = mpView->GetModel()->GetUIScale(); mbAdjustEnabled = hasText(*mpView); @@ -237,12 +237,12 @@ VclPtr<vcl::Window> PosSizePropertyPanel::Create ( SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to PosSizePropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to PosSizePropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to PosSizePropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to PosSizePropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to PosSizePropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to PosSizePropertyPanel::Create", nullptr, 2); return VclPtr<PosSizePropertyPanel>::Create( pParent, @@ -586,9 +586,9 @@ void PosSizePropertyPanel::NotifyItemUpdate( if ( pCurSh ) mpView = pCurSh->GetDrawView(); else - mpView = NULL; + mpView = nullptr; - if ( mpView == NULL ) + if ( mpView == nullptr ) return; mbAdjustEnabled = hasText(*mpView); @@ -1042,7 +1042,7 @@ FieldUnit PosSizePropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPo else { SfxViewFrame* pFrame = SfxViewFrame::Current(); - SfxObjectShell* pSh = NULL; + SfxObjectShell* pSh = nullptr; if ( pFrame ) pSh = pFrame->GetObjectShell(); if ( pSh ) diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index cbb62ade9e93..812229bf2acf 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -361,12 +361,12 @@ VclPtr<vcl::Window> ShadowPropertyPanel::Create ( const uno::Reference<frame::XFrame>& rxFrame, SfxBindings* pBindings) { - if(pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to ShadowPropertyPanel::Create", NULL, 0); + if(pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to ShadowPropertyPanel::Create", nullptr, 0); if( !rxFrame.is() ) - throw lang::IllegalArgumentException("no XFrame given to ShadowPropertyPanel::Create", NULL, 1); - if(pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to ShadowPropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to ShadowPropertyPanel::Create", nullptr, 1); + if(pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to ShadowPropertyPanel::Create", nullptr, 2); return VclPtr<ShadowPropertyPanel>::Create(pParent, rxFrame, pBindings); } diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.cxx b/svx/source/sidebar/styles/StylesPropertyPanel.cxx index 9e310a9ad1c5..8d29d24ec5a3 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.cxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.cxx @@ -10,10 +10,10 @@ VclPtr<vcl::Window> StylesPropertyPanel::Create ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to StylesPropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to StylesPropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to StylesPropertyPanel::Create", NULL, 1); + throw lang::IllegalArgumentException("no XFrame given to StylesPropertyPanel::Create", nullptr, 1); return VclPtr<StylesPropertyPanel>::Create(pParent,rxFrame); } diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 087824e6938b..b52b194622a4 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -44,10 +44,10 @@ TextCharacterSpacingControl::TextCharacterSpacingControl ( , maFTBy (VclPtr<FixedText>::Create(this, SVX_RES(FT_BY))) , maEditKerning (VclPtr<MetricField>::Create(this, SVX_RES(ED_KERNING))) -, mpImg (NULL) -, mpImgSel (NULL) -, mpStr (NULL) -, mpStrTip (NULL) +, mpImg (nullptr) +, mpImgSel (nullptr) +, mpStr (nullptr) +, mpStrTip (nullptr) , maImgCus (SVX_RES(IMG_CUSTOM)) , maImgCusGrey (SVX_RES(IMG_CUSTOM_GRAY)) @@ -141,7 +141,7 @@ void TextCharacterSpacingControl::initial() for (int i=0;i<5;i++) maVSSpacing->AddItem(mpImg[i], &mpImgSel[i],mpStr[i],&mpStrTip[i]); - maVSSpacing->AddItem( maImgCus, 0, maStrCus, 0 ); + maVSSpacing->AddItem( maImgCus, nullptr, maStrCus, nullptr ); maVSSpacing->SetNoSelection(); maVSSpacing->SetSelectHdl(LINK(this, TextCharacterSpacingControl,VSSelHdl )); @@ -174,12 +174,12 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l if( !mnLastCus ) { - maVSSpacing->ReplaceItemImages(6, maImgCusGrey,0); + maVSSpacing->ReplaceItemImages(6, maImgCusGrey,nullptr); } else { //set custom tips - maVSSpacing->ReplaceItemImages(6, maImgCus,0); + maVSSpacing->ReplaceItemImages(6, maImgCus,nullptr); if(mnCustomKern > 0) { OUString aStrTip( maStrCusE); //LAST CUSTOM no tip defect //add diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index c32de3082ccd..16bbba66ef28 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -43,7 +43,7 @@ void TextCharacterSpacingPopup::Rearrange (bool bLBAvailable,bool bAvailable, lo ProvideContainerAndControl(); TextCharacterSpacingControl* pControl = dynamic_cast<TextCharacterSpacingControl*>(mxControl.get()); - if (pControl != NULL) + if (pControl != nullptr) pControl->Rearrange(bLBAvailable,bAvailable,nKerning); } @@ -51,7 +51,7 @@ void TextCharacterSpacingPopup::PopupModeEndCallback() { ProvideContainerAndControl(); TextCharacterSpacingControl* pControl = dynamic_cast<TextCharacterSpacingControl*>(mxControl.get()); - if (pControl == NULL) + if (pControl == nullptr) return; if( pControl->GetLastCustomState() == SPACING_CLOSE_BY_CUS_EDIT) diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 4d7cee447047..38484e7c3988 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -68,12 +68,12 @@ VclPtr<vcl::Window> TextPropertyPanel::Create ( SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to TextPropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to TextPropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to TextPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to TextPropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to TextPropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to TextPropertyPanel::Create", nullptr, 2); return VclPtr<TextPropertyPanel>::Create( pParent, @@ -106,7 +106,7 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref InitToolBoxSpacing(); //init state - mpHeightItem = NULL; + mpHeightItem = nullptr; meUnderline = UNDERLINE_NONE; meUnderlineColor = COL_AUTO; mbKernAvailable = true; @@ -264,7 +264,7 @@ void TextPropertyPanel::NotifyItemUpdate ( if ( eState >= SfxItemState::DEFAULT && dynamic_cast<const SvxFontHeightItem*>( pState) != nullptr ) mpHeightItem = const_cast<SvxFontHeightItem*>(static_cast<const SvxFontHeightItem*>(pState)); else - mpHeightItem = NULL; + mpHeightItem = nullptr; } break; case SID_ATTR_CHAR_UNDERLINE: diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index a7c175465406..f4c342ee9cd9 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -40,7 +40,7 @@ void TextUnderlinePopup::Rearrange (FontUnderline eLine) ProvideContainerAndControl(); TextUnderlineControl* pControl = dynamic_cast<TextUnderlineControl*>(mxControl.get()); - if (pControl != NULL) + if (pControl != nullptr) pControl->Rearrange(eLine); } diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index f0bc51373f62..d2c9943113e5 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -54,7 +54,7 @@ void ValueSetWithTextControl::AddItem( ValueSetWithTextItem aItem; aItem.maItemImage = rItemImage; - aItem.maSelectedItemImage = (pSelectedItemImage != 0) + aItem.maSelectedItemImage = (pSelectedItemImage != nullptr) ? *pSelectedItemImage : rItemImage; @@ -64,7 +64,7 @@ void ValueSetWithTextControl::AddItem( b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor()); aItem.maItemImage = Image(b); - if ( pSelectedItemImage != 0 ) + if ( pSelectedItemImage != nullptr ) { b = aItem.maSelectedItemImage.GetBitmapEx(); b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor()); @@ -78,7 +78,7 @@ void ValueSetWithTextControl::AddItem( InsertItem( maItems.size() ); SetItemText( maItems.size(), - (pItemHelpText != 0) ? *pItemHelpText : rItemText ); + (pItemHelpText != nullptr) ? *pItemHelpText : rItemText ); } @@ -100,7 +100,7 @@ void ValueSetWithTextControl::AddItem( InsertItem( maItems.size() ); SetItemText( maItems.size(), - (pItemHelpText != 0) ? *pItemHelpText : rItemText ); + (pItemHelpText != nullptr) ? *pItemHelpText : rItemText ); } @@ -121,7 +121,7 @@ void ValueSetWithTextControl::ReplaceItemImages( } maItems[nItemId-1].maItemImage = rItemImage; - maItems[nItemId-1].maSelectedItemImage = (pSelectedItemImage != 0) + maItems[nItemId-1].maSelectedItemImage = (pSelectedItemImage != nullptr) ? *pSelectedItemImage : rItemImage; @@ -132,7 +132,7 @@ void ValueSetWithTextControl::ReplaceItemImages( b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor()); maItems[nItemId-1].maItemImage = Image(b); - if ( pSelectedItemImage != 0 ) + if ( pSelectedItemImage != nullptr ) { b = maItems[nItemId-1].maSelectedItemImage.GetBitmapEx(); b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor()); @@ -177,7 +177,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt ) } //draw image + text resp. text + text - Image* pImage = 0; + Image* pImage = nullptr; if ( GetSelectItemId() == nItemId ) { aFont.SetColor( sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Color_HighlightText ) ); |