diff options
Diffstat (limited to 'svx/source/sidebar/paragraph')
| -rw-r--r-- | svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
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 |