summaryrefslogtreecommitdiff
path: root/svx/source/mnuctrls
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/mnuctrls')
-rw-r--r--svx/source/mnuctrls/SmartTagCtl.cxx4
-rw-r--r--svx/source/mnuctrls/clipboardctl.cxx8
-rw-r--r--svx/source/mnuctrls/fntctl.cxx2
-rw-r--r--svx/source/mnuctrls/fntszctl.cxx8
4 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 4dd8125ae9b7..0a47bf94046e 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -43,7 +43,7 @@ SvxSmartTagsControl::SvxSmartTagsControl
) :
mpMenu ( new PopupMenu ),
mrParent ( rMenu ),
- mpSmartTagItem( 0 )
+ mpSmartTagItem( nullptr )
{
rMenu.SetPopupMenu( _nId, mpMenu );
}
@@ -143,7 +143,7 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const S
if ( SfxItemState::DEFAULT == eState )
{
const SvxSmartTagItem* pSmartTagItem = dynamic_cast<const SvxSmartTagItem*>( pState );
- if ( 0 != pSmartTagItem )
+ if ( nullptr != pSmartTagItem )
{
delete mpSmartTagItem;
mpSmartTagItem = new SvxSmartTagItem( *pSmartTagItem );
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index 44f35b17cec0..f514f8061dcf 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -43,8 +43,8 @@ SvxClipBoardControl::SvxClipBoardControl(
sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
- pClipboardFmtItem( 0 ),
- pPopup( 0 ),
+ pClipboardFmtItem( nullptr ),
+ pPopup( nullptr ),
bDisabled( false )
{
addStatusListener( ".uno:ClipboardFormatItems");
@@ -104,7 +104,7 @@ VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow()
GetToolBox().EndSelection();
DelPopup();
- return 0;
+ return nullptr;
}
@@ -136,7 +136,7 @@ void SvxClipBoardControl::DelPopup()
if(pPopup)
{
delete pPopup;
- pPopup = 0;
+ pPopup = nullptr;
}
}
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index 7f6060bfe3ed..38b1b763e5ca 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -70,7 +70,7 @@ void SvxFontMenuControl::FillMenu()
{
const SvxFontListItem* pFonts =
static_cast<const SvxFontListItem*>(pDoc->GetItem( SID_ATTR_CHAR_FONTLIST ));
- const FontList* pList = pFonts ? pFonts->GetFontList(): 0;
+ const FontList* pList = pFonts ? pFonts->GetFontList(): nullptr;
DBG_ASSERT( pList, "Kein Fonts gefunden" );
pMenu->Fill( pList );
}
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 215cd44c30ae..984391e91c40 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -51,7 +51,7 @@ SFX_IMPL_MENU_CONTROL(SvxFontSizeMenuControl, SvxFontHeightItem);
IMPL_LINK_TYPED( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen, void )
{
SfxViewFrame* pFrm = SfxViewFrame::Current();
- SfxShell* pSh = pFrm ? pFrm->GetDispatcher()->GetShell( 0 ) : NULL;
+ SfxShell* pSh = pFrm ? pFrm->GetDispatcher()->GetShell( 0 ) : nullptr;
if ( !pSh )
return;
@@ -93,7 +93,7 @@ void SvxFontSizeMenuControl::StateChanged(
{
SfxViewFrame* pFrm = SfxViewFrame::Current();
SfxShell* pSh = pFrm ? pFrm->GetDispatcher()->GetShell( 0 )
- : NULL;
+ : nullptr;
if ( !pSh )
return;
@@ -118,7 +118,7 @@ void SvxFontSizeMenuControl::StateChanged(
{
const SvxFontListItem* pFonts = static_cast<const SvxFontListItem*>(
pDoc->GetItem( SID_ATTR_CHAR_FONTLIST ));
- const FontList* pList = pFonts ? pFonts->GetFontList(): 0;
+ const FontList* pList = pFonts ? pFonts->GetFontList(): nullptr;
if ( pList )
{
@@ -141,7 +141,7 @@ void SvxFontSizeMenuControl::StateChanged(
// daf"ur von der Shell eine Fontliste besorgen
const SvxFontListItem* pFonts =
static_cast<const SvxFontListItem*>(pSh->GetItem( SID_ATTR_CHAR_FONTLIST ));
- const FontList* pList = pFonts ? pFonts->GetFontList(): NULL;
+ const FontList* pList = pFonts ? pFonts->GetFontList(): nullptr;
if ( pList )
pMenu->Fill( pList->GetFontName(0), pList );
}