diff options
Diffstat (limited to 'svx/source/sidebar/text')
4 files changed, 17 insertions, 17 deletions
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); } |