diff options
Diffstat (limited to 'cui/source/tabpages')
32 files changed, 346 insertions, 346 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index c297ce3b5cc4..ac55f13a2337 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -256,7 +256,7 @@ AlignmentTabPage::~AlignmentTabPage() void AlignmentTabPage::dispose() { delete m_pOrientHlp; - m_pOrientHlp = NULL; + m_pOrientHlp = nullptr; m_pLbHorAlign.clear(); m_pFtIndent.clear(); m_pEdIndent.clear(); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index e43868e20fc8..cf7af4a9cc8e 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -81,10 +81,10 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet ) bOpenSmartTagOptions = true; } - AddTabPage("options", OfaAutocorrOptionsPage::Create, 0); - AddTabPage("apply", OfaSwAutoFmtOptionsPage::Create, 0); - AddTabPage("wordcompletion", OfaAutoCompleteTabPage::Create, 0); - AddTabPage("smarttags", OfaSmartTagOptionsTabPage::Create, 0); + AddTabPage("options", OfaAutocorrOptionsPage::Create, nullptr); + AddTabPage("apply", OfaSwAutoFmtOptionsPage::Create, nullptr); + AddTabPage("wordcompletion", OfaAutoCompleteTabPage::Create, nullptr); + AddTabPage("smarttags", OfaSmartTagOptionsTabPage::Create, nullptr); if (!bShowSWOptions) { @@ -103,9 +103,9 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet ) RemoveTabPage("options"); } - m_nReplacePageId = AddTabPage("replace", OfaAutocorrReplacePage::Create, 0); - m_nExceptionsPageId = AddTabPage("exceptions", OfaAutocorrExceptPage::Create, 0); - AddTabPage("localized", OfaQuoteTabPage::Create, 0); + m_nReplacePageId = AddTabPage("replace", OfaAutocorrReplacePage::Create, nullptr); + m_nExceptionsPageId = AddTabPage("exceptions", OfaAutocorrExceptPage::Create, nullptr); + AddTabPage("localized", OfaQuoteTabPage::Create, nullptr); // initialize languages //! LANGUAGE_NONE is displayed as '[All]' and the LanguageType @@ -430,7 +430,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent, , sDelSpaceAtSttEnd(CUI_RESSTR(RID_SVXSTR_DEL_SPACES_AT_STT_END)) , sDelSpaceBetweenLines(CUI_RESSTR(RID_SVXSTR_DEL_SPACES_BETWEEN_LINES)) , nPercent(50) - , pCheckButtonData(NULL) + , pCheckButtonData(nullptr) { get(m_pEditPB, "edit"); @@ -502,7 +502,7 @@ void OfaSwAutoFmtOptionsPage::dispose() delete static_cast<ImpUserData*>(m_pCheckLB->GetUserData( APPLY_NUMBERING )); delete static_cast<ImpUserData*>(m_pCheckLB->GetUserData( MERGE_SINGLE_LINE_PARA )); delete pCheckButtonData; - pCheckButtonData = NULL; + pCheckButtonData = nullptr; } m_pCheckLB.disposeAndClear(); m_pEditPB.clear(); @@ -697,7 +697,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* ) nPercent = pOpt->nRightMargin; sMargin = " " + unicode::formatPercent(nPercent, Application::GetSettings().GetUILanguageTag()); - pUserData = new ImpUserData(&sMargin, 0); + pUserData = new ImpUserData(&sMargin, nullptr); m_pCheckLB->SetUserData( MERGE_SINGLE_LINE_PARA, pUserData ); m_pCheckLB->CheckEntryPos( APPLY_NUMBERING, CBCOL_SECOND, pOpt->bSetNumRule ); @@ -717,12 +717,12 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* ) IMPL_LINK_TYPED(OfaSwAutoFmtOptionsPage, SelectHdl, SvTreeListBox*, pBox, void) { - m_pEditPB->Enable(0 != pBox->FirstSelected()->GetUserData()); + m_pEditPB->Enable(nullptr != pBox->FirstSelected()->GetUserData()); } IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, SvTreeListBox*, bool) { - EditHdl(NULL); + EditHdl(nullptr); return false; } @@ -922,9 +922,9 @@ void OfaAutocorrReplacePage::dispose() aChangesTable.clear(); delete pCompareClass; - pCompareClass = NULL; + pCompareClass = nullptr; delete pCharClass; - pCharClass = NULL; + pCharClass = nullptr; m_pTextOnlyCB.clear(); m_pShortED.clear(); @@ -1039,7 +1039,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool bFromReset, for( size_t i = 0; i < rArray.size(); i++ ) { DoubleString& rDouble = rArray[i]; - bool bTextOnly = 0 == rDouble.pUserData; + bool bTextOnly = nullptr == rDouble.pUserData; // formatted text is only in Writer if(bSWriter || bTextOnly) { @@ -1149,7 +1149,7 @@ IMPL_LINK_TYPED(OfaAutocorrReplacePage, SelectHdl, SvTreeListBox*, pBox, void) } m_pReplaceED->SetText( SvTabListBox::GetEntryText(pEntry, 1) ); // with UserData there is a Formatinfo - m_pTextOnlyCB->Check( pEntry->GetUserData() == 0); + m_pTextOnlyCB->Check( pEntry->GetUserData() == nullptr); } else { @@ -1272,7 +1272,7 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn) nPos = j; } SvTreeListEntry* pInsEntry = m_pReplaceTLB->InsertEntry( - sEntry, static_cast< SvTreeListEntry * >(NULL), false, + sEntry, static_cast< SvTreeListEntry * >(nullptr), false, nPos == TREELIST_ENTRY_NOTFOUND ? TREELIST_APPEND : nPos); if (bKeepSourceFormatting) { @@ -1342,7 +1342,7 @@ IMPL_LINK_TYPED(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void) if( !bFound ) { m_pReplaceTLB->SelectAll( false ); - pFirstSel = 0; + pFirstSel = nullptr; m_pNewReplacePB->SetText( sNew ); if( bReplaceEditChanged ) m_pTextOnlyCB->Enable(false); @@ -1825,7 +1825,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", &rSet) , sNonBrkSpace(CUI_RESSTR(RID_SVXSTR_NON_BREAK_SPACE)) , sOrdinal(CUI_RESSTR(RID_SVXSTR_ORDINAL)) - , pCheckButtonData(NULL) + , pCheckButtonData(nullptr) , cSglStartQuote(0) , cSglEndQuote(0) , cStartQuote(0) @@ -1905,7 +1905,7 @@ OfaQuoteTabPage::~OfaQuoteTabPage() void OfaQuoteTabPage::dispose() { delete pCheckButtonData; - pCheckButtonData = NULL; + pCheckButtonData = nullptr; m_pSwCheckLB.disposeAndClear(); m_pCheckLB.disposeAndClear(); m_pSingleTypoCB.clear(); @@ -2187,7 +2187,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "WordCompletionPage", "cui/ui/wordcompletionpage.ui", &rSet) - , m_pAutoCompleteList(0) + , m_pAutoCompleteList(nullptr) , m_nAutoCmpltListCnt(0) { get(m_pCBActiv, "enablewordcomplete"); @@ -2348,7 +2348,7 @@ void OfaAutoCompleteTabPage::Reset( const SfxItemSet* ) { m_pAutoCompleteList = const_cast<editeng::SortedAutoCompleteStrings*>( pOpt->m_pAutoCompleteList); - pOpt->m_pAutoCompleteList = 0; + pOpt->m_pAutoCompleteList = nullptr; m_nAutoCmpltListCnt = m_pAutoCompleteList->size(); for (size_t n = 0; n < m_nAutoCmpltListCnt; ++n) { @@ -2453,7 +2453,7 @@ bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify( switch( rKeyCode.GetModifier() | rKeyCode.GetCode() ) { case KEY_DELETE: - m_pPage->DeleteHdl( 0 ); + m_pPage->DeleteHdl( nullptr ); bHandled = true; break; @@ -2679,8 +2679,8 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* ) if ( bModifiedSmartTagTypes || bModifiedRecognize ) { bool bLabelTextWithSmartTags = m_pMainCB->IsChecked(); - pSmartTagMgr->WriteConfiguration( bModifiedRecognize ? &bLabelTextWithSmartTags : 0, - bModifiedSmartTagTypes ? &aDisabledSmartTagTypes : 0 ); + pSmartTagMgr->WriteConfiguration( bModifiedRecognize ? &bLabelTextWithSmartTags : nullptr, + bModifiedSmartTagTypes ? &aDisabledSmartTagTypes : nullptr ); } return true; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 613a3d94b04a..d85a6a8f97d9 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -78,9 +78,9 @@ struct SvxBackgroundTable_Impl sal_Int32 nActPos; SvxBackgroundTable_Impl() - : pCellBrush(NULL) - , pRowBrush(NULL) - , pTableBrush(NULL) + : pCellBrush(nullptr) + , pRowBrush(nullptr) + , pTableBrush(nullptr) , nCellWhich(0) , nRowWhich(0) , nTableWhich(0) @@ -94,7 +94,7 @@ struct SvxBackgroundPage_Impl bool bIsImportDlgInExecute; SvxBackgroundPage_Impl() - : pLoadIdle(NULL) + : pLoadIdle(nullptr) , bIsImportDlgInExecute(false) {} }; @@ -176,7 +176,7 @@ private: BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent) : Window(pParent, WB_BORDER) , bIsBmp(false) - , pBitmap(NULL) + , pBitmap(nullptr) , aDrawRect(Point(0,0), GetOutputSizePixel()) , nTransparency(0) { @@ -204,7 +204,7 @@ BackgroundPreviewImpl::~BackgroundPreviewImpl() void BackgroundPreviewImpl::dispose() { delete pBitmap; - pBitmap = NULL; + pBitmap = nullptr; vcl::Window::dispose(); } @@ -331,8 +331,8 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe , bLinkOnly(false) , bHighlighting(false) , pPageImpl(new SvxBackgroundPage_Impl) - , pImportDlg(NULL) - , pTableBck_Impl(NULL) + , pImportDlg(nullptr) + , pTableBck_Impl(nullptr) , pHighlighting(nullptr) { get(m_pAsGrid, "asgrid"); @@ -371,8 +371,8 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe SfxObjectShell* pShell; if ( SfxItemState::SET == rCoreSet.GetItemState( SID_HTML_MODE, false, &pItem ) - || ( 0 != ( pShell = SfxObjectShell::Current()) && - 0 != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) ) + || ( nullptr != ( pShell = SfxObjectShell::Current()) && + nullptr != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) ) { nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); } @@ -395,11 +395,11 @@ void SvxBackgroundTabPage::dispose() { delete pPageImpl->pLoadIdle; delete pPageImpl; - pPageImpl = NULL; + pPageImpl = nullptr; } delete pImportDlg; - pImportDlg = NULL; + pImportDlg = nullptr; if( pTableBck_Impl) { @@ -407,7 +407,7 @@ void SvxBackgroundTabPage::dispose() delete pTableBck_Impl->pRowBrush; delete pTableBck_Impl->pTableBrush; delete pTableBck_Impl; - pTableBck_Impl = NULL; + pTableBck_Impl = nullptr; } m_pAsGrid.clear(); @@ -456,7 +456,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet ) // get and evaluate Input-BrushItem - const SvxBrushItem* pBgdAttr = NULL; + const SvxBrushItem* pBgdAttr = nullptr; sal_uInt16 nSlot = SID_ATTR_BRUSH; const SfxPoolItem* pItem; sal_uInt16 nDestValue = USHRT_MAX; @@ -575,7 +575,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet ) m_pBtnPreview->Check( !aUserData.isEmpty() && '1' == aUserData[0] ); // get and evaluate Input-BrushItem - const SvxBrushItem* pBgdAttr = NULL; + const SvxBrushItem* pBgdAttr = nullptr; sal_uInt16 nSlot = SID_VIEW_FLD_PIC; sal_uInt16 nWhich = GetWhich( nSlot ); std::unique_ptr<SvxBrushItem> pTemp; @@ -696,7 +696,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet ) SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); const bool bIsLink = m_pBtnLink->IsChecked(); - const bool bWasLink = (NULL != rOldItem.GetGraphicLink() ); + const bool bWasLink = (nullptr != rOldItem.GetGraphicLink() ); if ( !bIsLink && !bIsGraphicValid ) @@ -989,9 +989,9 @@ bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl() void SvxBackgroundTabPage::FillColorValueSets_Impl() { SfxObjectShell* pDocSh = SfxObjectShell::Current(); - const SfxPoolItem* pItem = NULL; - XColorListRef pColorTable = NULL; - if ( pDocSh && ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) ) + const SfxPoolItem* pItem = nullptr; + XColorListRef pColorTable = nullptr; + if ( pDocSh && ( nullptr != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) ) { pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); } @@ -1189,11 +1189,11 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, FileClickHdl_Impl, Button*, pBox, void ) { if ( !aBgdGraphicPath.isEmpty() ) // only for linked bitmap RaiseLoadError_Impl(); - m_pPreviewWin2->NotifyChange( NULL ); + m_pPreviewWin2->NotifyChange( nullptr ); } } else - m_pPreviewWin2->NotifyChange( NULL ); + m_pPreviewWin2->NotifyChange( nullptr ); } } @@ -1294,7 +1294,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle, void ) m_pPreviewWin2->NotifyChange( &aBmp ); } else - m_pPreviewWin2->NotifyChange( NULL ); + m_pPreviewWin2->NotifyChange( nullptr ); } FileClickHdl_Impl(m_pBtnLink); @@ -1318,7 +1318,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, v if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos) { std::unique_ptr<SvxBrushItem> xItemHolder; - SvxBrushItem* pActItem = NULL; + SvxBrushItem* pActItem = nullptr; sal_uInt16 nWhich = 0; switch(pTableBck_Impl->nActPos) { @@ -1335,7 +1335,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, v nWhich = pTableBck_Impl->nTableWhich; break; default: - pActItem = NULL; + pActItem = nullptr; break; } pTableBck_Impl->nActPos = nSelPos; @@ -1386,7 +1386,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, v // The item will be new'ed again below, but that will be the // default item then, not an existing modified one. xItemHolder.reset(); - pActItem = NULL; + pActItem = nullptr; break; } OUString aUserData = GetUserData(); @@ -1435,7 +1435,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, m_pBtnPreview->Check( false ); m_pBtnLink->Check( false ); m_pBtnLink->Disable(); - m_pPreviewWin2->NotifyChange( NULL ); + m_pPreviewWin2->NotifyChange( nullptr ); SetGraphicPosition_Impl( GPOS_TILED ); // tiles as default } } @@ -1501,7 +1501,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, m_pPreviewWin2->NotifyChange( &aBmp ); } else - m_pPreviewWin2->NotifyChange( NULL ); + m_pPreviewWin2->NotifyChange( nullptr ); SetGraphicPosition_Impl( ePos ); } diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index e3e89f40e980..8f3336db60fb 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -42,16 +42,16 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(vcl::Window *pParent, , m_nAreaPageId(0) , m_nTransparencePageId(0) { - AddTabPage("borders", SvxBorderTabPage::Create, 0 ); + AddTabPage("borders", SvxBorderTabPage::Create, nullptr ); if (mbEnableDrawingLayerFillStyles) { //UUUU Here we want full DrawingLayer FillStyle access, so add Area and Transparency TabPages - m_nAreaPageId = AddTabPage("area", SvxAreaTabPage::Create, 0); - m_nTransparencePageId = AddTabPage("transparence", SvxTransparenceTabPage::Create, 0); + m_nAreaPageId = AddTabPage("area", SvxAreaTabPage::Create, nullptr); + m_nTransparencePageId = AddTabPage("transparence", SvxTransparenceTabPage::Create, nullptr); } else { - m_nBackgroundPageId = AddTabPage("background", SvxBackgroundTabPage::Create, 0 ); + m_nBackgroundPageId = AddTabPage("background", SvxBackgroundTabPage::Create, nullptr ); } } diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 3b432e17fe90..1c3f2a5ea1fe 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -158,7 +158,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore is needed across various functions... */ mbUseMarginItem = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN)) != SfxItemState::UNKNOWN; - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; if (rCoreAttrs.HasItem(SID_ATTR_BORDER_STYLES, &pItem)) { const SfxIntegerListItem* p = static_cast<const SfxIntegerListItem*>(pItem); @@ -289,7 +289,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore if ( pDocSh ) { pItem = pDocSh->GetItem( SID_COLOR_TABLE ); - if ( pItem != NULL ) + if ( pItem != nullptr ) pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); } @@ -571,8 +571,8 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) const SfxPoolItem* pItem; SfxObjectShell* pShell; if(SfxItemState::SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem) || - ( 0 != (pShell = SfxObjectShell::Current()) && - 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) + ( nullptr != (pShell = SfxObjectShell::Current()) && + nullptr != (pItem = pShell->GetItem(SID_HTML_MODE)))) { sal_uInt16 nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); if(nHtmlMode & HTMLMODE_ON) @@ -591,7 +591,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) } } - LinesChanged_Impl( 0 ); + LinesChanged_Impl( nullptr ); if(m_pLeftMF->GetValue() == m_pRightMF->GetValue() && m_pTopMF->GetValue() == m_pBottomMF->GetValue() && m_pTopMF->GetValue() == m_pLeftMF->GetValue()) mbSync = true; else @@ -843,7 +843,7 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) // Presets ValueSet does not show a selection (used as push buttons). m_pWndPresets->SetNoSelection(); - LinesChanged_Impl( 0 ); + LinesChanged_Impl( nullptr ); } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index ce791822704c..9e47e2469dd1 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -177,7 +177,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, &rItemset ) - , m_pPreviewWin(NULL) + , m_pPreviewWin(nullptr) , m_bPreviewBackgroundToCharacter( false ) { } @@ -248,7 +248,7 @@ struct SvxCharNamePage_Impl SvxCharNamePage_Impl() : - m_pFontList ( NULL ), + m_pFontList ( nullptr ), m_nExtraEntryPos( COMBOBOX_ENTRY_NOTFOUND ), m_bMustDelete ( false ), m_bInSearchMode ( false ) @@ -384,7 +384,7 @@ SvxCharNamePage::~SvxCharNamePage() void SvxCharNamePage::dispose() { delete m_pImpl; - m_pImpl = NULL; + m_pImpl = nullptr; m_pWestFrame.clear(); m_pWestFontNameFT.clear(); m_pWestFontNameLB.clear(); @@ -452,9 +452,9 @@ const FontList* SvxCharNamePage::GetFontList() const if ( pDocSh ) { const SfxPoolItem* pItem = pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST ); - if ( pItem != NULL ) + if ( pItem != nullptr ) { - DBG_ASSERT(NULL != static_cast<const SvxFontListItem*>(pItem)->GetFontList(), + DBG_ASSERT(nullptr != static_cast<const SvxFontListItem*>(pItem)->GetFontList(), "Where is the font list?"); m_pImpl->m_pFontList = static_cast<const SvxFontListItem*>(pItem )->GetFontList()->Clone(); m_pImpl->m_bMustDelete = true; @@ -587,7 +587,7 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox ) const FontList* pFontList = GetFontList(); DBG_ASSERT( pFontList, "no fontlist" ); - FontStyleBox* pStyleBox = NULL; + FontStyleBox* pStyleBox = nullptr; if ( m_pWestFontNameLB == pNameBox ) pStyleBox = m_pWestFontStyleLB; @@ -624,8 +624,8 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) const FontList* pFontList = GetFontList(); DBG_ASSERT( pFontList, "no fontlist" ); - FontStyleBox* pStyleBox = NULL; - FontSizeBox* pSizeBox = NULL; + FontStyleBox* pStyleBox = nullptr; + FontSizeBox* pSizeBox = nullptr; if ( m_pWestFontNameLB == pNameBox ) { @@ -656,13 +656,13 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ) { - FontNameBox* pNameBox = NULL; - FixedText* pStyleLabel = NULL; - FontStyleBox* pStyleBox = NULL; - FixedText* pSizeLabel = NULL; - FontSizeBox* pSizeBox = NULL; - FixedText* pLangFT = NULL; - SvxLanguageBoxBase* pLangBox = NULL; + FontNameBox* pNameBox = nullptr; + FixedText* pStyleLabel = nullptr; + FontStyleBox* pStyleBox = nullptr; + FixedText* pSizeLabel = nullptr; + FontSizeBox* pSizeBox = nullptr; + FixedText* pLangFT = nullptr; + SvxLanguageBoxBase* pLangBox = nullptr; sal_uInt16 nWhich = 0; switch ( eLangGrp ) @@ -704,7 +704,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp const FontList* pFontList = GetFontList(); pNameBox->Fill( pFontList ); - const SvxFontItem* pFontItem = NULL; + const SvxFontItem* pFontItem = nullptr; SfxItemState eState = rSet.GetItemState( nWhich ); if ( eState >= SfxItemState::DEFAULT ) @@ -882,10 +882,10 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp { bool bModified = false; - FontNameBox* pNameBox = NULL; - FontStyleBox* pStyleBox = NULL; - FontSizeBox* pSizeBox = NULL; - SvxLanguageBoxBase* pLangBox = NULL; + FontNameBox* pNameBox = nullptr; + FontStyleBox* pStyleBox = nullptr; + FontSizeBox* pSizeBox = nullptr; + SvxLanguageBoxBase* pLangBox = nullptr; sal_uInt16 nWhich = 0; sal_uInt16 nSlot = 0; @@ -917,11 +917,11 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp } nWhich = GetWhich( nSlot ); - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; const SfxItemSet& rOldSet = GetItemSet(); - const SfxPoolItem* pOld = NULL; + const SfxPoolItem* pOld = nullptr; - const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; + const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr; bool bChanged = true; const OUString& rFontName = pNameBox->GetText(); @@ -1438,8 +1438,8 @@ void SvxCharEffectsPage::Initialize() const SfxPoolItem* pItem; SfxObjectShell* pShell; if ( SfxItemState::SET == GetItemSet().GetItemState( SID_HTML_MODE, false, &pItem ) || - ( NULL != ( pShell = SfxObjectShell::Current() ) && - NULL != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) ) + ( nullptr != ( pShell = SfxObjectShell::Current() ) && + nullptr != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) ) { m_nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); if ( ( m_nHtmlMode & HTMLMODE_ON ) == HTMLMODE_ON ) @@ -1456,7 +1456,7 @@ void SvxCharEffectsPage::Initialize() if ( pDocSh ) { pItem = pDocSh->GetItem( SID_COLOR_TABLE ); - if ( pItem != NULL ) + if ( pItem != nullptr ) pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); } @@ -1468,7 +1468,7 @@ void SvxCharEffectsPage::Initialize() m_pFontColorLB->SetUpdateMode( false ); { - SfxPoolItem* pDummy = NULL; + SfxPoolItem* pDummy = nullptr; SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocSh ); if ( !pFrame || SfxItemState::DEFAULT > pFrame->GetBindings().QueryState( SID_ATTR_AUTO_COLOR_INVALID, pDummy ) ) @@ -1511,7 +1511,7 @@ void SvxCharEffectsPage::Initialize() m_pStrikeoutLB->SelectEntryPos( 0 ); m_pEmphasisLB->SelectEntryPos( 0 ); m_pPositionLB->SelectEntryPos( 0 ); - SelectHdl_Impl( NULL ); + SelectHdl_Impl( nullptr ); SelectHdl_Impl( m_pEmphasisLB ); m_pEffectsLB->SelectEntryPos( 0 ); @@ -1675,9 +1675,9 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) { sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_COLOR ); const SvxColorItem* pOld = static_cast<const SvxColorItem*>(GetOldItem( rSet, SID_ATTR_CHAR_COLOR )); - const SvxColorItem* pItem = NULL; + const SvxColorItem* pItem = nullptr; bool bChanged = true; - const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; + const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr; const SfxItemSet& rOldSet = GetItemSet(); Color aSelectedColor; @@ -2263,7 +2263,7 @@ void SvxCharEffectsPage::ChangesApplied() bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) { - const SfxPoolItem* pOld = 0; + const SfxPoolItem* pOld = nullptr; const SfxItemSet& rOldSet = GetItemSet(); bool bModified = false; bool bChanged = true; @@ -2474,7 +2474,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) } // Outline - const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; + const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr; nWhich = GetWhich( SID_ATTR_CHAR_CONTOUR ); pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CONTOUR ); TriState eState = m_pOutlineBtn->GetState(); @@ -3083,7 +3083,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) { m_pNormalPosBtn->Check(); m_pHighLowRB->Check(); - PositionHdl_Impl( NULL ); + PositionHdl_Impl( nullptr ); } //the height has to be set after the handler is called to keep the value also if the escapement is zero m_pFontSizeMF->SetValue( m_pFontSizeMF->Normalize( nEscProp ) ); @@ -3432,7 +3432,7 @@ void SvxCharTwoLinesPage::dispose() void SvxCharTwoLinesPage::Initialize() { m_pTwoLinesBtn->Check( false ); - TwoLinesHdl_Impl( NULL ); + TwoLinesHdl_Impl( nullptr ); m_pTwoLinesBtn->SetClickHdl( LINK( this, SvxCharTwoLinesPage, TwoLinesHdl_Impl ) ); @@ -3573,7 +3573,7 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet ) SetBracket( rItem.GetEndBracket(), false ); } } - TwoLinesHdl_Impl( NULL ); + TwoLinesHdl_Impl( nullptr ); SetPrevFontWidthScale( *rSet ); } diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index f717e0fbe29c..80ca0fa25e33 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -74,7 +74,7 @@ SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rI ,&rInAttrs) , rOutAttrs(rInAttrs) , aAttrSet(*rInAttrs.GetPool()) - , pView(NULL) + , pView(nullptr) { get(m_pLbType,"LB_TYPE"); diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index e3ae1cad9a63..280ac7ba17e2 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -35,7 +35,7 @@ SvxDistributeDialog::SvxDistributeDialog(vcl::Window* pParent, SvxDistributeVertical eVer) : SfxSingleTabDialog(pParent, rInAttrs, "DistributionDialog", "cui/ui/distributiondialog.ui") - , mpPage(NULL) + , mpPage(nullptr) { mpPage = VclPtr<SvxDistributePage>::Create(get_content_area(), rInAttrs, eHor, eVer); SetTabPage(mpPage); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index b833b5095500..1ffd0b4ef5f2 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -50,7 +50,7 @@ static inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet ) : SfxTabPage(pParent, "CropPage", "cui/ui/croppage.ui", &rSet) - , pLastCropField(0) + , pLastCropField(nullptr) , nOldWidth(0) , nOldHeight(0) , bReset(false) @@ -227,7 +227,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet *rSet ) OUString referer; SfxStringItem const * it = static_cast<SfxStringItem const *>( rSet->GetItem(SID_REFERER)); - if (it != 0) { + if (it != nullptr) { referer = it->GetValue(); } const Graphic* pGrf = static_cast<const SvxBrushItem*>(pItem)->GetGraphic(referer); @@ -272,8 +272,8 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet) SvxSizeItem aSz( nW ); // size could already have been set from another page - const SfxItemSet* pExSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; - const SfxPoolItem* pItem = 0; + const SfxItemSet* pExSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr; + const SfxPoolItem* pItem = nullptr; if( pExSet && SfxItemState::SET == pExSet->GetItemState( nW, false, &pItem ) ) aSz = *static_cast<const SvxSizeItem*>(pItem); @@ -289,11 +289,11 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet) m_pWidthMF->SaveValue(); m_pHeightMF->SaveValue(); - bModified |= 0 != rSet->Put( aSz ); + bModified |= nullptr != rSet->Put( aSz ); if( bSetOrigSize ) { - bModified |= 0 != rSet->Put( SvxSizeItem( rPool.GetWhich( + bModified |= nullptr != rSet->Put( SvxSizeItem( rPool.GetWhich( SID_ATTR_GRAF_FRMSIZE_PERCENT ), Size( 0, 0 )) ); } } @@ -308,12 +308,12 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet) pNew->SetRight( lcl_GetValue( *m_pRightMF, eUnit ) ); pNew->SetTop( lcl_GetValue( *m_pTopMF, eUnit ) ); pNew->SetBottom( lcl_GetValue( *m_pBottomMF, eUnit ) ); - bModified |= 0 != rSet->Put( *pNew ); + bModified |= nullptr != rSet->Put( *pNew ); } if( m_pZoomConstRB->IsValueChangedFromSaved() ) { - bModified |= 0 != rSet->Put( SfxBoolItem( rPool.GetWhich( + bModified |= nullptr != rSet->Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_GRAF_KEEP_ZOOM), m_pZoomConstRB->IsChecked() ) ); } @@ -380,7 +380,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) OUString referer; SfxStringItem const * it = static_cast<SfxStringItem const *>( rSet.GetItem(SID_REFERER)); - if (it != 0) { + if (it != nullptr) { referer = it->GetValue(); } const Graphic* pGrf = rBrush.GetGraphic(referer); @@ -730,7 +730,7 @@ IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, Timeout, Timer *, void) { DBG_ASSERT(pLastCropField,"Timeout ohne Feld?"); CropHdl(*pLastCropField); - pLastCropField = 0; + pLastCropField = nullptr; } @@ -739,7 +739,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void ) MetricField* pField = static_cast<MetricField*>(&rControl); aTimer.Stop(); CropHdl(*pField); - pLastCropField = 0; + pLastCropField = nullptr; } diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 60f575fd9696..55cb3b301cf9 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -83,7 +83,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rIn , nAnsatzRelPos(0) , nAnsatzTypePos(0) , rOutAttrs(rInAttrs) - , pView(NULL) + , pView(nullptr) { get(m_pCT_CAPTTYPE, "valueset"); diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 339d6418c5ef..5e599ae4788f 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -62,13 +62,13 @@ public: }; _SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl() - : pAssignPB(NULL) - , pDeletePB(NULL) - , pEventLB(NULL) - , pGroupFrame(NULL) - , pGroupLB(NULL) - , pMacroFrame(NULL) - , pMacroLB(NULL) + : pAssignPB(nullptr) + , pDeletePB(nullptr) + , pEventLB(nullptr) + , pGroupFrame(nullptr) + , pGroupLB(nullptr) + , pMacroFrame(nullptr) + , pMacroLB(nullptr) , bReadOnly(false) , bGotEvents(false) , m_bDummyActivated(false) @@ -124,7 +124,7 @@ void _SfxMacroTabPage::EnableButtons() { // get bound macro const SvxMacro* pM = aTbl.Get( (sal_uInt16)reinterpret_cast<sal_uLong>(pE->GetUserData()) ); - mpImpl->pDeletePB->Enable( 0 != pM && !mpImpl->bReadOnly ); + mpImpl->pDeletePB->Enable( nullptr != pM && !mpImpl->bReadOnly ); OUString sEventMacro = static_cast<const SvLBoxString&>(pE->GetItem( LB_MACROS_ITEMPOS )).GetText(); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 6afab7062b32..dfd5abca4620 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -86,7 +86,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ,rInAttrs ), rOutAttrs ( rInAttrs ), aAttrSet ( *rInAttrs.GetPool() ), - pView( 0 ), + pView( nullptr ), eUnit( SFX_MAPUNIT_100TH_MM ), bPositionModified ( false ) { @@ -188,7 +188,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_MEASURELINEDIST ); // SdrMeasureLineDistItem - if( pItem == NULL ) + if( pItem == nullptr ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASURELINEDIST ); if( pItem ) { @@ -203,7 +203,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) // SdrMeasureHelplineOverhangItem pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINEOVERHANG ); - if( pItem == NULL ) + if( pItem == nullptr ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINEOVERHANG ); if( pItem ) { @@ -218,7 +218,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) // SdrMeasureHelplineDistItem pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINEDIST ); - if( pItem == NULL ) + if( pItem == nullptr ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINEDIST ); if( pItem ) { @@ -233,7 +233,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) // SdrMeasureHelpline1LenItem pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINE1LEN ); - if( pItem == NULL ) + if( pItem == nullptr ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINE1LEN ); if( pItem ) { @@ -248,7 +248,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) // SdrMeasureHelpline2LenItem pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINE2LEN ); - if( pItem == NULL ) + if( pItem == nullptr ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINE2LEN ); if( pItem ) { @@ -276,7 +276,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) // SdrMeasureDecimalPlacesItem pItem = GetItem( *rAttrs, SDRATTR_MEASUREDECIMALPLACES ); - if( pItem == NULL ) + if( pItem == nullptr ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREDECIMALPLACES ); if( pItem ) { diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 9f22d4c43aed..72d79a7cb287 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -236,13 +236,13 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "NumberingFormatPage", "cui/ui/numberingformatpage.ui", &rCoreAttrs) - , pNumItem(NULL) - , pNumFmtShell(NULL) + , pNumItem(nullptr) + , pNumFmtShell(nullptr) , nInitFormat(ULONG_MAX) , sAutomaticEntry(CUI_RES(RID_SVXSTR_AUTO_ENTRY)) , sThousandSeparator(CUI_RES(RID_SVXSTR_THOUSAND_SEP)) , sEngineeringNotation(CUI_RES(RID_SVXSTR_ENGINEERING)) - , pLastActivWindow(NULL) + , pLastActivWindow(nullptr) { get(m_pFtCategory, "categoryft"); get(m_pLbCategory, "categorylb"); @@ -288,9 +288,9 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage() void SvxNumberFormatTabPage::dispose() { delete pNumFmtShell; - pNumFmtShell = NULL; + pNumFmtShell = nullptr; delete pNumItem; - pNumItem = NULL; + pNumItem = nullptr; m_pFtCategory.clear(); m_pLbCategory.clear(); m_pFtFormat.clear(); @@ -398,9 +398,9 @@ VclPtr<SfxTabPage> SvxNumberFormatTabPage::Create( vcl::Window* pParent, void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) { - const SfxUInt32Item* pValFmtAttr = NULL; - const SfxPoolItem* pItem = NULL; - const SfxBoolItem* pAutoEntryAttr = NULL; + const SfxUInt32Item* pValFmtAttr = nullptr; + const SfxPoolItem* pItem = nullptr; + const SfxBoolItem* pAutoEntryAttr = nullptr; sal_uInt16 nCatLbSelPos = 0; sal_uInt16 nFmtLbSelPos = 0; @@ -417,7 +417,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) const SfxBoolItem* pBoolLangItem = static_cast<const SfxBoolItem*>( GetItem( *rSet, SID_ATTR_NUMBERFORMAT_NOLANGUAGE)); - if(pBoolLangItem!=NULL && pBoolLangItem->GetValue()) + if(pBoolLangItem!=nullptr && pBoolLangItem->GetValue()) { HideLanguage(); } @@ -432,7 +432,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) if(eState==SfxItemState::SET) { - if(pNumItem==NULL) + if(pNumItem==nullptr) { bNumItemFlag=true; pNumItem= static_cast<SvxNumberInfoItem *>(pItem->Clone()); @@ -455,7 +455,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) const SfxBoolItem* pBoolItem = static_cast<const SfxBoolItem*>( GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ONE_AREA)); - if(pBoolItem!=NULL) + if(pBoolItem!=nullptr) { bOneAreaFlag= pBoolItem->GetValue(); } @@ -544,7 +544,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) FillCurrencyBox(); OUString aPrevString; - Color* pDummy = NULL; + Color* pDummy = nullptr; pNumFmtShell->GetInitSettings( nCatLbSelPos, eLangType, nFmtLbSelPos, aFmtEntryList, aPrevString, pDummy ); @@ -821,7 +821,7 @@ SfxTabPage::sfxpg SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) void SvxNumberFormatTabPage::SetInfoItem( const SvxNumberInfoItem& rItem ) { - if(pNumItem==NULL) + if(pNumItem==nullptr) { pNumItem = static_cast<SvxNumberInfoItem*>(rItem.Clone()); } @@ -866,7 +866,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt default: break; } - if(pNumFmtShell!=NULL) + if(pNumFmtShell!=nullptr) { for ( ; i < rEntries.size(); ++i ) { @@ -874,7 +874,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt short aPrivCat = pNumFmtShell->GetCategory4Entry( static_cast<short>(i) ); if(aPrivCat!=CAT_TEXT) { - Color* pPreviewColor = NULL; + Color* pPreviewColor = nullptr; OUString aPreviewString( GetExpColorString( pPreviewColor, aEntry, aPrivCat ) ); vcl::Font aEntryFont( m_pLbFormat->GetFont() ); m_pLbFormat->InsertFontEntry( aPreviewString, aEntryFont, pPreviewColor ); @@ -1162,12 +1162,12 @@ IMPL_LINK_TYPED( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvTreeListBox*, pL if ( fnOkHdl.IsSet() ) { // temporary solution, should be offered by SfxTabPage - fnOkHdl.Call( NULL ); + fnOkHdl.Call( nullptr ); } else { SfxSingleTabDialog* pParent = dynamic_cast< SfxSingleTabDialog* >( GetParentDialog() ); - OKButton* pOKButton = pParent ? pParent->GetOKButton() : NULL; + OKButton* pOKButton = pParent ? pParent->GetOKButton() : nullptr; if ( pOKButton ) pOKButton->Click(); } @@ -1290,7 +1290,7 @@ void SvxNumberFormatTabPage::SelFormatHdl_Impl(void * pLb ) if (pLb == m_pLbCategory || pLb == m_pLbCurrency) { UpdateFormatListBox_Impl( true, true ); - EditHdl_Impl( NULL ); + EditHdl_Impl( nullptr ); UpdateOptions_Impl( false ); return; @@ -1342,7 +1342,7 @@ bool SvxNumberFormatTabPage::Click_Impl(PushButton* pIB) short nFmtLbSelPos = SELPOS_NONE; sal_Int32 nErrPos=0; - pNumFmtShell->SetCurCurrencyEntry(NULL); + pNumFmtShell->SetCurCurrencyEntry(nullptr); bool bAdded = pNumFmtShell->AddFormat( aFormat, nErrPos, nCatLbSelPos, nFmtLbSelPos, aEntryList); @@ -1619,7 +1619,7 @@ void SvxNumberFormatTabPage::OptHdl_Impl( void* pOptCtrl ) } else { - EditHdl_Impl( NULL ); + EditHdl_Impl( nullptr ); m_pLbFormat->SetNoSelection(); } } @@ -1627,7 +1627,7 @@ void SvxNumberFormatTabPage::OptHdl_Impl( void* pOptCtrl ) IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void) { - pLastActivWindow=NULL; + pLastActivWindow=nullptr; } @@ -1706,7 +1706,7 @@ OUString SvxNumberFormatTabPage::GetExpColorString( void SvxNumberFormatTabPage::MakePreviewText( const OUString& rFormat ) { OUString aPreviewString; - Color* pPreviewColor = NULL; + Color* pPreviewColor = nullptr; pNumFmtShell->MakePreviewString( rFormat, aPreviewString, pPreviewColor ); m_pWndPreview->NotifyChange( aPreviewString, pPreviewColor ); } @@ -1714,7 +1714,7 @@ void SvxNumberFormatTabPage::MakePreviewText( const OUString& rFormat ) void SvxNumberFormatTabPage::ChangePreviewText( sal_uInt16 nPos ) { OUString aPreviewString; - Color* pPreviewColor = NULL; + Color* pPreviewColor = nullptr; pNumFmtShell->FormatChanged( nPos, aPreviewString, pPreviewColor ); m_pWndPreview->NotifyChange( aPreviewString, pPreviewColor ); } @@ -1725,7 +1725,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetWindow() == dynamic_cast<const vcl::Window* >( m_pEdComment.get() ) && !m_pEdComment->IsVisible() ) { - pLastActivWindow = NULL; + pLastActivWindow = nullptr; } else { diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index d04334effe60..4456e89799bd 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -157,7 +157,7 @@ static bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) for( sal_uInt16 i = 0; i < SVX_MAX_NUM && !bRet; i++ ) { if(nLevelMask & nMask) - bRet |= 0 != pNum->Get( i ); + bRet |= nullptr != pNum->Get( i ); nMask <<= 1 ; } return bRet; @@ -183,8 +183,8 @@ static vcl::Font& lcl_GetDefaultBulletFont() SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", &rSet) - , pActNum(0) - , pSaveNum(0) + , pActNum(nullptr) + , pSaveNum(nullptr) , nActNumLvl(SAL_MAX_UINT16) , bModified(false) , bPreset(false) @@ -232,9 +232,9 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage() void SvxSingleNumPickTabPage::dispose() { delete pActNum; - pActNum = NULL; + pActNum = nullptr; delete pSaveNum; - pSaveNum = NULL; + pSaveNum = nullptr; m_pExamplesVS.clear(); SfxTabPage::dispose(); } @@ -376,8 +376,8 @@ IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, v SvxBulletPickTabPage::SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", &rSet) - , pActNum(0) - , pSaveNum(0) + , pActNum(nullptr) + , pSaveNum(nullptr) , nActNumLvl(SAL_MAX_UINT16) , bModified(false) , bPreset(false) @@ -398,9 +398,9 @@ SvxBulletPickTabPage::~SvxBulletPickTabPage() void SvxBulletPickTabPage::dispose() { delete pActNum; - pActNum = NULL; + pActNum = nullptr; delete pSaveNum; - pSaveNum = NULL; + pSaveNum = nullptr; m_pExamplesVS.clear(); SfxTabPage::dispose(); } @@ -544,8 +544,8 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet) SvxNumPickTabPage::SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", &rSet) - , pActNum(0) - , pSaveNum(0) + , pActNum(nullptr) + , pSaveNum(nullptr) , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) , bModified(false) @@ -600,9 +600,9 @@ SvxNumPickTabPage::~SvxNumPickTabPage() void SvxNumPickTabPage::dispose() { delete pActNum; - pActNum = NULL; + pActNum = nullptr; delete pSaveNum; - pSaveNum = NULL; + pSaveNum = nullptr; m_pExamplesVS.clear(); SfxTabPage::dispose(); } @@ -701,12 +701,12 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) bPreset = false; bModified = true; - const FontList* pList = 0; + const FontList* pList = nullptr; SvxNumSettingsArr_Impl& rItemArr = aNumSettingsArrays[m_pExamplesVS->GetSelectItemId() - 1]; vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont(); - SvxNumSettings_Impl* pLevelSettings = 0; + SvxNumSettings_Impl* pLevelSettings = nullptr; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { if(rItemArr.size() > i) @@ -732,7 +732,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) 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 ) ) { @@ -797,8 +797,8 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet) SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", &rSet) - , pActNum(0) - , pSaveNum(0) + , pActNum(nullptr) + , pSaveNum(nullptr) , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) , bModified(false) @@ -850,9 +850,9 @@ SvxBitmapPickTabPage::~SvxBitmapPickTabPage() void SvxBitmapPickTabPage::dispose() { delete pActNum; - pActNum = NULL; + pActNum = nullptr; delete pSaveNum; - pSaveNum = NULL; + pSaveNum = nullptr; m_pBtBrowseFile.clear(); m_pErrorText.clear(); m_pExamplesVS.clear(); @@ -1150,8 +1150,8 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", &rSet) - , pActNum(0) - , pSaveNum(0) + , pActNum(nullptr) + , pSaveNum(nullptr) , bLastWidthModified(false) , bModified(false) , bPreset(false) @@ -1261,9 +1261,9 @@ void SvxNumOptionsTabPage::dispose() delete m_pBitmapMB->GetPopupMenu()->GetPopupMenu(m_nGalleryId); } delete pActNum; - pActNum = NULL; + pActNum = nullptr; delete pSaveNum; - pSaveNum = NULL; + pSaveNum = nullptr; m_pLevelLB.clear(); m_pFmtLB.clear(); m_pSeparatorFT.clear(); @@ -1474,8 +1474,8 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet* rSet ) SfxObjectShell* pShell; if ( SfxItemState::SET == rSet->GetItemState( SID_HTML_MODE, false, &pItem ) - || ( 0 != ( pShell = SfxObjectShell::Current()) && - 0 != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) ) + || ( nullptr != ( pShell = SfxObjectShell::Current()) && + nullptr != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) ) { sal_uInt16 nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); bHTMLMode = 0 != (nHtmlMode&HTMLMODE_ON); @@ -1612,7 +1612,7 @@ void SvxNumOptionsTabPage::InitControls() nHighestLevel = i; } else - aNumFmtArr[i] = 0; + aNumFmtArr[i] = nullptr; nMask <<= 1 ; } @@ -1883,7 +1883,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox, sal_uInt16 nNumberingType = aNumFmt.GetNumberingType(); if(SVX_NUM_BITMAP == (nNumberingType&(~LINK_TOKEN))) { - bBmp |= 0 != aNumFmt.GetBrush(); + bBmp |= nullptr != aNumFmt.GetBrush(); aNumFmt.SetIncludeUpperLevels( sal_False ); aNumFmt.SetSuffix( "" ); aNumFmt.SetPrefix( "" ); @@ -2176,7 +2176,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void) VclPtrInstance< SvxCharacterMap > pMap( this, true ); sal_uInt16 nMask = 1; - const vcl::Font* pFmtFont = 0; + const vcl::Font* pFmtFont = nullptr; bool bSameBullet = true; sal_Unicode cBullet = 0; bool bFirst = true; @@ -2434,9 +2434,9 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, SvxNumberingPreview::SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits) : Window(pParent, nWinBits) - , pActNum(0) + , pActNum(nullptr) , nPageWidth(0) - , pOutlineNames(0) + , pOutlineNames(nullptr) , bPosition(false) , nActLevel(SAL_MAX_UINT16) { @@ -2737,8 +2737,8 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectan SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", &rSet) - , pActNum(0) - , pSaveNum(0) + , pActNum(nullptr) + , pSaveNum(nullptr) , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) , bModified(false) @@ -2836,9 +2836,9 @@ SvxNumPositionTabPage::~SvxNumPositionTabPage() void SvxNumPositionTabPage::dispose() { delete pActNum; - pActNum = NULL; + pActNum = nullptr; delete pSaveNum; - pSaveNum = NULL; + pSaveNum = nullptr; m_pLevelLB.clear(); m_pDistBorderFT.clear(); m_pDistBorderMF.clear(); @@ -3231,7 +3231,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet* rSet ) void SvxNumPositionTabPage::InitPosAndSpaceMode() { - if ( pActNum == 0 ) + if ( pActNum == nullptr ) { DBG_ASSERT( false, "<SvxNumPositionTabPage::InitPosAndSpaceMode()> - misusage of method -> <pAktNum> has to be already set!" ); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index ef7110af8b86..28959c48b8a4 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -182,7 +182,7 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr //UUUU m_nPos( 0 ), - mpDefPrinter( 0 ), + mpDefPrinter( nullptr ), mbDelPrinter( false ), //UUUU @@ -242,8 +242,8 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr SfxObjectShell* pShell; if(SfxItemState::SET == rAttr.GetItemState(SID_HTML_MODE, false, &pItem) || - ( 0 != (pShell = SfxObjectShell::Current()) && - 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) + ( nullptr != (pShell = SfxObjectShell::Current()) && + nullptr != (pItem = pShell->GetItem(SID_HTML_MODE)))) bWeb = 0 != (static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON); // fill text flow listbox with valid entries @@ -711,7 +711,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) DBG_ASSERT( pPool, "Wo ist der Pool" ); sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE ); SfxMapUnit eUnit = pPool->GetMetric( nWhich ); - const SfxPoolItem* pOld = 0; + const SfxPoolItem* pOld = nullptr; // copy old left and right margins SvxLRSpaceItem aMargin( static_cast<const SvxLRSpaceItem&>(rOldSet.Get( nWhich )) ); @@ -1297,7 +1297,7 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet) } drawinglayer::attribute::SdrAllFillAttributesHelperPtr aPageFillAttributes; - const SfxPoolItem* pItem = 0; + const SfxPoolItem* pItem = nullptr; if(mbEnableDrawingLayerFillStyles) { @@ -1336,7 +1336,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) if ( pItem ) m_pBspWin->SetSize( static_cast<const SvxSizeItem*>(pItem)->GetSize() ); - const SvxSetItem* pSetItem = 0; + const SvxSetItem* pSetItem = nullptr; // evaluate header attributes @@ -1487,7 +1487,7 @@ SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) { if ( ScopedVclPtr<QueryBox>::Create( this, WB_YES_NO | WB_DEF_NO, m_pPrintRangeQueryText->GetText() )->Execute() == RET_NO ) { - MetricField* pField = NULL; + MetricField* pField = nullptr; if ( IsPrinterRangeOverflow( *m_pLeftMarginEdit, nFirstLeftMargin, nLastLeftMargin, MARGIN_LEFT ) ) pField = m_pLeftMarginEdit; if ( IsPrinterRangeOverflow( *m_pRightMarginEdit, nFirstRightMargin, nLastRightMargin, MARGIN_RIGHT ) diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index ecbc0ca42c9b..775e80b61dd8 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -143,11 +143,11 @@ void SetLineSpace_Impl( SvxLineSpacingItem& rLineSpace, sal_uInt16 GetHtmlMode_Impl(const SfxItemSet& rSet) { sal_uInt16 nHtmlMode = 0; - const SfxPoolItem* pItem = 0; + const SfxPoolItem* pItem = nullptr; SfxObjectShell* pShell; if(SfxItemState::SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem) || - ( 0 != (pShell = SfxObjectShell::Current()) && - 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) + ( nullptr != (pShell = SfxObjectShell::Current()) && + nullptr != (pItem = pShell->GetItem(SID_HTML_MODE)))) { nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); } @@ -200,7 +200,7 @@ VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( vcl::Window* pParent, const S bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) { SfxItemState eState = SfxItemState::UNKNOWN; - const SfxPoolItem* pOld = 0; + const SfxPoolItem* pOld = nullptr; SfxItemPool* pPool = rOutSet->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -1824,9 +1824,9 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet ) m_pKeepTogetherBox->Enable(false); // so that everything is enabled correctly - KeepTogetherHdl_Impl( 0 ); - WidowHdl_Impl( 0 ); - OrphanHdl_Impl( 0 ); + KeepTogetherHdl_Impl( nullptr ); + WidowHdl_Impl( nullptr ); + OrphanHdl_Impl( nullptr ); ChangesApplied(); } void SvxExtParagraphTabPage::ChangesApplied() diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 5056604dc285..2679637a785a 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -503,9 +503,9 @@ static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "SwPosSizePage", "cui/ui/swpossizepage.ui", &rInAttrs) - , m_pVMap(0) - , m_pHMap(0) - , m_pSdrView(0) + , m_pVMap(nullptr) + , m_pHMap(nullptr) + , m_pSdrView(nullptr) , m_nOldH(HoriOrientation::CENTER) , m_nOldHRel(RelOrientation::FRAME) , m_nOldV(VertOrientation::TOP) @@ -848,7 +848,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) } } if(m_pHoriMirrorCB->IsEnabled() && m_pHoriMirrorCB->IsValueChangedFromSaved()) - bModified |= 0 != rSet->Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, m_pHoriMirrorCB->IsChecked())); + bModified |= nullptr != rSet->Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, m_pHoriMirrorCB->IsChecked())); if ( m_pVMap ) { @@ -892,7 +892,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) { std::unique_ptr<SfxBoolItem> pFollow(static_cast<SfxBoolItem*>(pItem->Clone())); pFollow->SetValue(m_pFollowCB->IsChecked()); - bModified |= 0 != rSet->Put(*pFollow); + bModified |= nullptr != rSet->Put(*pFollow); } } } @@ -1097,7 +1097,7 @@ void SvxSwPosSizeTabPage::EnableAnchorTypes(sal_uInt16 nAnchorEnable) short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) { short nRet = -1; - RadioButton* pCheckedButton = 0; + RadioButton* pCheckedButton = nullptr; if(m_pToParaRB->IsEnabled()) { if(m_pToPageRB->IsChecked()) @@ -1559,7 +1559,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, else if ( nAnchor == TextContentAnchorType_AS_CHARACTER ) { m_pVMap = m_bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap; - m_pHMap = 0; + m_pHMap = nullptr; bEnable = false; } m_pHoriLB->Enable( bEnable ); diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 62169efe59ff..73961af035ea 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -73,22 +73,22 @@ SvxAreaTabDialog::SvxAreaTabDialog mnPos( 0 ), mbAreaTP( false ) { - m_nAreaTabPage = AddTabPage( "RID_SVXPAGE_AREA", SvxAreaTabPage::Create, 0 ); + m_nAreaTabPage = AddTabPage( "RID_SVXPAGE_AREA", SvxAreaTabPage::Create, nullptr ); if(bShadow) { - m_nShadowTabPage = AddTabPage( "RID_SVXPAGE_SHADOW", SvxShadowTabPage::Create, 0 ); + m_nShadowTabPage = AddTabPage( "RID_SVXPAGE_SHADOW", SvxShadowTabPage::Create, nullptr ); } else { RemoveTabPage( "RID_SVXPAGE_SHADOW" ); } - m_nTransparenceTabPage = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", SvxTransparenceTabPage::Create, 0); - m_nColorTabPage = AddTabPage( "RID_SVXPAGE_COLOR", SvxColorTabPage::Create, 0 ); - m_nGradientTabPage = AddTabPage( "RID_SVXPAGE_GRADIENT", SvxGradientTabPage::Create, 0 ); - m_nHatchTabPage = AddTabPage( "RID_SVXPAGE_HATCH", SvxHatchTabPage::Create, 0 ); - m_nBitmapTabPage = AddTabPage( "RID_SVXPAGE_BITMAP", SvxBitmapTabPage::Create, 0); + m_nTransparenceTabPage = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", SvxTransparenceTabPage::Create, nullptr); + m_nColorTabPage = AddTabPage( "RID_SVXPAGE_COLOR", SvxColorTabPage::Create, nullptr ); + m_nGradientTabPage = AddTabPage( "RID_SVXPAGE_GRADIENT", SvxGradientTabPage::Create, nullptr ); + m_nHatchTabPage = AddTabPage( "RID_SVXPAGE_HATCH", SvxHatchTabPage::Create, nullptr ); + m_nBitmapTabPage = AddTabPage( "RID_SVXPAGE_BITMAP", SvxBitmapTabPage::Create, nullptr); SetCurPageId( "RID_SVXPAGE_AREA" ); diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 56245180390f..20b3da921466 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -87,14 +87,14 @@ SvxLineTabDialog::SvxLineTabDialog } - m_nLineTabPage = AddTabPage( "RID_SVXPAGE_LINE", SvxLineTabPage::Create, 0); + m_nLineTabPage = AddTabPage( "RID_SVXPAGE_LINE", SvxLineTabPage::Create, nullptr); if( bLineOnly ) - m_nShadowTabPage = AddTabPage( "RID_SVXPAGE_SHADOW", SvxShadowTabPage::Create, 0 ); + m_nShadowTabPage = AddTabPage( "RID_SVXPAGE_SHADOW", SvxShadowTabPage::Create, nullptr ); else RemoveTabPage( "RID_SVXPAGE_SHADOW" ); - m_nStyleTabPage = AddTabPage( "RID_SVXPAGE_LINE_DEF", SvxLineDefTabPage::Create, 0); - m_nEndTabPage = AddTabPage( "RID_SVXPAGE_LINEEND_DEF", SvxLineEndDefTabPage::Create, 0); + m_nStyleTabPage = AddTabPage( "RID_SVXPAGE_LINE_DEF", SvxLineDefTabPage::Create, nullptr); + m_nEndTabPage = AddTabPage( "RID_SVXPAGE_LINEEND_DEF", SvxLineEndDefTabPage::Create, nullptr); SetCurPageId( "RID_SVXPAGE_LINE" ); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 25ede825288f..aa697b33dbb6 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -47,7 +47,7 @@ public: TabWin_Impl(vcl::Window* pParent, WinBits nBits) : Window(pParent, nBits) - , mpPage(0) + , mpPage(nullptr) , nTabStyle(0) { } @@ -213,7 +213,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet) // Put the controls' values in here if (m_pNewBtn->IsEnabled()) - NewHdl_Impl( 0 ); + NewHdl_Impl( nullptr ); // Call the LoseFocus-Handler first GetDezCharHdl_Impl(*m_pDezChar); @@ -368,7 +368,7 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos ) m_pTabBox->Clear(); long nOffset = 0; - const SfxPoolItem* pItem = 0; + const SfxPoolItem* pItem = nullptr; if (GetItemSet().GetItemState(SID_ATTR_TABSTOP_OFFSET, true, &pItem) == SfxItemState::SET) { nOffset = static_cast<const SfxInt32Item*>(pItem)->GetValue(); @@ -418,8 +418,8 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos ) void SvxTabulatorTabPage::SetFillAndTabType_Impl() { - RadioButton* pTypeBtn = 0; - RadioButton* pFillBtn = 0; + RadioButton* pTypeBtn = nullptr; + RadioButton* pFillBtn = nullptr; m_pDezChar->Disable(); m_pDezCharLabel->Disable(); @@ -468,11 +468,11 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void ) long nVal = static_cast<long>(m_pTabBox->Denormalize( m_pTabBox->GetValue( eDefUnit ) )); // If the pBtn == 0 && the value == 0 then do not create a tab, because we create via OK - if ( nVal == 0 && pBtn == 0 ) + if ( nVal == 0 && pBtn == nullptr ) return; long nOffset = 0; - const SfxPoolItem* pItem = 0; + const SfxPoolItem* pItem = nullptr; if ( GetItemSet().GetItemState( SID_ATTR_TABSTOP_OFFSET, true, &pItem ) == SfxItemState::SET ) @@ -525,7 +525,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelHdl_Impl, Button*, void) if ( m_pTabBox->GetEntryCount() == 1 ) { - DelAllHdl_Impl( 0 ); + DelAllHdl_Impl( nullptr ); return; } diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 4ffacbe99e71..64bf0e17da0c 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -50,8 +50,8 @@ SvxTextTabDialog::SvxTextTabDialog( vcl::Window* pParent, , pAttr ), pView ( pSdrView ) { - m_nTextId = AddTabPage( "RID_SVXPAGE_TEXTATTR", SvxTextAttrPage::Create, 0); - m_nTextAnimId = AddTabPage( "RID_SVXPAGE_TEXTANIMATION", SvxTextAnimationPage::Create, 0); + m_nTextId = AddTabPage( "RID_SVXPAGE_TEXTATTR", SvxTextAttrPage::Create, nullptr); + m_nTextAnimId = AddTabPage( "RID_SVXPAGE_TEXTANIMATION", SvxTextAnimationPage::Create, nullptr); } /************************************************************************* @@ -336,8 +336,8 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) SelectEffectHdl_Impl( *m_pLbEffect ); - ClickEndlessHdl_Impl( NULL ); - ClickAutoHdl_Impl( NULL ); + ClickEndlessHdl_Impl( nullptr ); + ClickAutoHdl_Impl( nullptr ); //ClickPixelHdl_Impl( NULL ); } @@ -501,11 +501,11 @@ IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void m_pTsbStartInside->Enable(); m_pTsbStopInside->Enable(); m_pTsbEndless->Enable(); - ClickEndlessHdl_Impl( NULL ); + ClickEndlessHdl_Impl( nullptr ); } m_pTsbAuto->Enable(); - ClickAutoHdl_Impl( NULL ); + ClickAutoHdl_Impl( nullptr ); if( eAniKind == SDRTEXTANI_BLINK ) { diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 62ebd52393df..50cbcb5671f0 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -56,7 +56,7 @@ const sal_uInt16 SvxTextAttrPage::pRanges[] = SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SvxTabPage(pWindow,"TextAttributesPage","cui/ui/textattrtabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) - , pView(NULL) + , pView(nullptr) , bAutoGrowSizeEnabled(false) , bContourEnabled(false) , bAutoGrowWidthEnabled(false) @@ -287,7 +287,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs ) if((bLeftToRight && (SDRTEXTHORZADJUST_BLOCK == eTHA)) || (!bLeftToRight && (SDRTEXTVERTADJUST_BLOCK == eTVA))) { // Move anchor to valid position. - ClickFullWidthHdl_Impl(NULL); + ClickFullWidthHdl_Impl(nullptr); m_pTsbFullWidth->SetState(TRISTATE_TRUE); } @@ -327,7 +327,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs ) m_pTsbContour->SetState( TRISTATE_INDET ); m_pTsbContour->SaveValue(); - ClickHdl_Impl( NULL ); + ClickHdl_Impl( nullptr ); } /************************************************************************* diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index d1d4f6c62cd3..baa7ee275758 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -108,7 +108,7 @@ IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, Button // preview rXFSet.ClearItem (XATTR_FILLTRANSPARENCE); - ModifiedTrgrHdl_Impl (NULL); + ModifiedTrgrHdl_Impl (nullptr); } SvxTransparenceTabPage::~SvxTransparenceTabPage() @@ -311,8 +311,8 @@ VclPtr<SfxTabPage> SvxTransparenceTabPage::Create(vcl::Window* pWindow, const Sf bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) { - const SfxPoolItem* pGradientItem = NULL; - const SfxPoolItem* pLinearItem = NULL; + const SfxPoolItem* pGradientItem = nullptr; + const SfxPoolItem* pLinearItem = nullptr; SfxItemState eStateGradient(rOutAttrs.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem)); SfxItemState eStateLinear(rOutAttrs.GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem)); bool bGradActive = (eStateGradient == SfxItemState::SET && static_cast<const XFillFloatTransparenceItem*>(pGradientItem)->IsEnabled()); @@ -413,13 +413,13 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs) { - const SfxPoolItem* pGradientItem = NULL; + const SfxPoolItem* pGradientItem = nullptr; SfxItemState eStateGradient(rAttrs->GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem)); if(!pGradientItem) pGradientItem = &rAttrs->Get(XATTR_FILLFLOATTRANSPARENCE); bool bGradActive = (eStateGradient == SfxItemState::SET && static_cast<const XFillFloatTransparenceItem*>(pGradientItem)->IsEnabled()); - const SfxPoolItem* pLinearItem = NULL; + const SfxPoolItem* pLinearItem = nullptr; SfxItemState eStateLinear(rAttrs->GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem)); if(!pLinearItem) pLinearItem = &rAttrs->Get(XATTR_FILLTRANSPARENCE); @@ -446,20 +446,20 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs) { // transparence gradient, set controls appropriate to item m_pRbtTransGradient->Check(); - ClickTransGradientHdl_Impl(NULL); + ClickTransGradientHdl_Impl(nullptr); } else if(bLinearActive) { // linear transparence m_pRbtTransLinear->Check(); - ClickTransLinearHdl_Impl(NULL); + ClickTransLinearHdl_Impl(nullptr); } else { // no transparence m_pRbtTransOff->Check(); - ClickTransOffHdl_Impl(NULL); - ModifiedTrgrHdl_Impl(NULL); + ClickTransOffHdl_Impl(nullptr); + ModifiedTrgrHdl_Impl(nullptr); } // save values @@ -512,13 +512,13 @@ bool SvxTransparenceTabPage::InitPreview ( const SfxItemSet& rSet ) // set transparencetyp for preview if ( m_pRbtTransOff->IsChecked() ) { - ClickTransOffHdl_Impl(NULL); + ClickTransOffHdl_Impl(nullptr); } else if ( m_pRbtTransLinear->IsChecked() ) { - ClickTransLinearHdl_Impl(NULL); + ClickTransLinearHdl_Impl(nullptr); } else if ( m_pRbtTransGradient->IsChecked() ) { - ClickTransGradientHdl_Impl(NULL); + ClickTransGradientHdl_Impl(nullptr); } // Get fillstyle for preview @@ -601,10 +601,10 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs m_rOutAttrs (rInAttrs ), m_eRP( RP_LT ), - m_pColorList( NULL ), - m_pGradientList( NULL ), - m_pHatchingList( NULL ), - m_pBitmapList( NULL ), + m_pColorList( nullptr ), + m_pGradientList( nullptr ), + m_pHatchingList( nullptr ), + m_pBitmapList( nullptr ), // local fixed not o be changed values for local pointers maFixed_ChangeType(ChangeType::NONE), @@ -1056,7 +1056,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) if( m_nDlgType != 0 || *m_pbAreaTP ) { - const SfxPoolItem* pOld = NULL; + const SfxPoolItem* pOld = nullptr; drawing::FillStyle eStyle = (drawing::FillStyle) m_pTypeLB->GetSelectEntryPos(); drawing::FillStyle eSavedStyle = (drawing::FillStyle) m_pTypeLB->GetSavedValue(); switch( eStyle ) @@ -1673,7 +1673,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) else m_pTsbScale->SetState( TRISTATE_TRUE ); - ClickScaleHdl_Impl( NULL ); + ClickScaleHdl_Impl( nullptr ); } else m_pTsbScale->SetState( TRISTATE_INDET ); @@ -1915,7 +1915,7 @@ void SvxAreaTabPage::ClickColorHdl_Impl() IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyColorHdl_Impl, ListBox&, void) { - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbColor->GetSelectEntryPos(); m_pLbHatchBckgrdColor->SelectEntryPos( _nPos ); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -1969,7 +1969,7 @@ void SvxAreaTabPage::ClickGradientHdl_Impl() IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyGradientHdl_Impl, ListBox&, void) { - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbGradient->GetSelectEntryPos(); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -2023,7 +2023,7 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl() IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void) { - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbHatching->GetSelectEntryPos(); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -2049,7 +2049,7 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void) IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, ListBox&, void) { - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbHatchBckgrdColor->GetSelectEntryPos(); m_pLbColor->SelectEntryPos( _nPos ); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -2147,7 +2147,7 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void) maDirectGraphic.Clear(); maDirectName.clear(); - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbBitmap->GetSelectEntryPos(); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 000936a56ad3..88409708d340 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -57,12 +57,12 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rIn rInAttrs ), m_rOutAttrs ( rInAttrs ), - m_pnBitmapListState ( 0 ), - m_pnColorListState ( 0 ), - m_pPageType ( 0 ), + m_pnBitmapListState ( nullptr ), + m_pnColorListState ( nullptr ), + m_pPageType ( nullptr ), m_nDlgType ( 0 ), - m_pPos ( 0 ), - m_pbAreaTP ( 0 ), + m_pPos ( nullptr ), + m_pbAreaTP ( nullptr ), m_bBmpChanged ( false ), @@ -126,7 +126,7 @@ SvxBitmapTabPage::~SvxBitmapTabPage() void SvxBitmapTabPage::dispose() { delete m_pBitmapCtl; - m_pBitmapCtl = NULL; + m_pBitmapCtl = nullptr; m_pBxPixelEditor.clear(); m_pCtlPixel.clear(); m_pLbColor.clear(); @@ -327,7 +327,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangeBitmapHdl_Impl, ListBox&, void) } else { - const SfxPoolItem* pPoolItem = 0; + const SfxPoolItem* pPoolItem = nullptr; if(SfxItemState::SET == m_rOutAttrs.GetItemState(GetWhich(XATTR_FILLSTYLE), true, &pPoolItem)) { @@ -456,13 +456,13 @@ long SvxBitmapTabPage::CheckChanges_Impl() { case RET_BTN_1: { - ClickModifyHdl_Impl( NULL ); + ClickModifyHdl_Impl( nullptr ); } break; case RET_BTN_2: { - ClickAddHdl_Impl( NULL ); + ClickAddHdl_Impl( nullptr ); } break; @@ -540,7 +540,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void) if( !nError ) { - XBitmapEntry* pEntry = 0; + XBitmapEntry* pEntry = nullptr; if( m_pCtlPixel->IsEnabled() ) { const BitmapEx aBitmapEx(m_pBitmapCtl->GetBitmapEx()); @@ -549,7 +549,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void) } else // it must be a not existing imported bitmap { - const SfxPoolItem* pPoolItem = 0; + const SfxPoolItem* pPoolItem = nullptr; if(SfxItemState::SET == m_rOutAttrs.GetItemState(XATTR_FILLBITMAP, true, &pPoolItem)) { diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 4096920da5f2..9c7ee227cd0f 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -313,11 +313,11 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr , pShadow ( new SvxColorTabPageShadow() ) , rOutAttrs ( rInAttrs ) // All the horrific pointers we store and should not - , pnColorListState( 0 ) - , pPageType( NULL ) + , pnColorListState( nullptr ) + , pPageType( nullptr ) , nDlgType( 0 ) - , pPos( NULL ) - , pbAreaTP( NULL ) + , pPos( nullptr ) + , pbAreaTP( nullptr ) , aXFStyleItem( drawing::FillStyle_SOLID ) , aXFillColorItem( OUString(), Color( COL_BLACK ) ) , aXFillAttr( static_cast<XOutdevItemPool*>( rInAttrs.GetPool() )) @@ -409,7 +409,7 @@ SvxColorTabPage::~SvxColorTabPage() void SvxColorTabPage::dispose() { delete pShadow; - pShadow = NULL; + pShadow = nullptr; mpTopDlg.clear(); m_pBoxEmbed.clear(); m_pBtnLoad.clear(); @@ -475,7 +475,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) } else if( *pPageType == PT_COLOR && *pPos == LISTBOX_ENTRY_NOTFOUND ) { - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = nullptr; if( SfxItemState::SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true, &pPoolItem ) ) { m_pLbColorModel->SelectEntryPos( CM_RGB ); @@ -556,14 +556,14 @@ long SvxColorTabPage::CheckChanges_Impl() { case RET_BTN_1: { - ClickModifyHdl_Impl( NULL ); + ClickModifyHdl_Impl( nullptr ); aColor = pColorList->GetColor( nPos )->GetColor(); } break; case RET_BTN_2: { - ClickAddHdl_Impl( NULL ); + ClickAddHdl_Impl( nullptr ); nPos = m_pLbColor->GetSelectEntryPos(); aColor = pColorList->GetColor( nPos )->GetColor(); } @@ -1152,8 +1152,8 @@ void SvxColorTabPage::FillUserData() void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame ) { - const OfaRefItem<XColorList> *pPtr = NULL; - if ( pViewFrame != NULL && pViewFrame->GetDispatcher() ) + const OfaRefItem<XColorList> *pPtr = nullptr; + if ( pViewFrame != nullptr && pViewFrame->GetDispatcher() ) pPtr = static_cast<const OfaRefItem<XColorList> *>(pViewFrame-> GetDispatcher()->Execute( SID_GET_COLORLIST, SfxCallMode::SYNCHRON )); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 60d9a60a1fd9..c074fca231b0 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -52,12 +52,12 @@ SvxGradientTabPage::SvxGradientTabPage m_rOutAttrs ( rInAttrs ), - m_pnGradientListState ( 0 ), - m_pnColorListState ( 0 ), - m_pPageType ( 0 ), + m_pnGradientListState ( nullptr ), + m_pnColorListState ( nullptr ), + m_pPageType ( nullptr ), m_nDlgType ( 0 ), - m_pPos ( 0 ), - m_pbAreaTP ( 0 ), + m_pPos ( nullptr ), + m_pbAreaTP ( nullptr ), m_aXFStyleItem ( drawing::FillStyle_GRADIENT ), m_aXGradientItem ( OUString(), XGradient( COL_BLACK, COL_WHITE ) ), @@ -306,14 +306,14 @@ long SvxGradientTabPage::CheckChanges_Impl() { case RET_BTN_1: { - ClickModifyHdl_Impl( NULL ); + ClickModifyHdl_Impl( nullptr ); aGradient = m_pGradientList->GetGradient( nPos )->GetGradient(); } break; case RET_BTN_2: { - ClickAddHdl_Impl( NULL ); + ClickAddHdl_Impl( nullptr ); nPos = m_pLbGradients->GetSelectEntryPos(); aGradient = m_pGradientList->GetGradient( nPos )->GetGradient(); } @@ -819,7 +819,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ChangeGradientHdl_Impl, ListBox&, void pGradient.reset(new XGradient( m_pGradientList->GetGradient( nPos )->GetGradient() )); else { - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = nullptr; if( SfxItemState::SET == m_rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), true, &pPoolItem ) ) { if( ( drawing::FillStyle_GRADIENT == (drawing::FillStyle) static_cast<const XFillStyleItem*>( pPoolItem )->GetValue() ) && diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 46be349633f7..d6d4f850342b 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -55,12 +55,12 @@ SvxHatchTabPage::SvxHatchTabPage m_rOutAttrs ( rInAttrs ), - m_pnHatchingListState ( 0 ), - m_pnColorListState ( 0 ), - m_pPageType ( 0 ), + m_pnHatchingListState ( nullptr ), + m_pnColorListState ( nullptr ), + m_pPageType ( nullptr ), m_nDlgType ( 0 ), - m_pPos ( 0 ), - m_pbAreaTP ( 0 ), + m_pPos ( nullptr ), + m_pbAreaTP ( nullptr ), m_aXFStyleItem ( drawing::FillStyle_HATCH ), m_aXHatchItem ( OUString(), XHatch() ), @@ -276,13 +276,13 @@ long SvxHatchTabPage::CheckChanges_Impl() { case RET_BTN_1: { - ClickModifyHdl_Impl( NULL ); + ClickModifyHdl_Impl( nullptr ); } break; case RET_BTN_2: { - ClickAddHdl_Impl( NULL ); + ClickAddHdl_Impl( nullptr ); } break; @@ -415,7 +415,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ChangeHatchHdl_Impl, ListBox&, void) pHatch.reset(new XHatch( m_pHatchingList->GetHatch( nPos )->GetHatch() )); else { - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = nullptr; if( SfxItemState::SET == m_rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), true, &pPoolItem ) ) { if( ( drawing::FillStyle_HATCH == (drawing::FillStyle) static_cast<const XFillStyleItem*>( pPoolItem )->GetValue() ) && diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 03f095d70a25..65992f56815a 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -84,11 +84,11 @@ SvxLineTabPage::SvxLineTabPage ,"cui/ui/linetabpage.ui" , rInAttrs ), - m_pSymbolList(NULL), + m_pSymbolList(nullptr), m_bNewSize(false), m_nNumMenuGalleryItems(0), m_nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), // unknown respectively unchanged - m_pSymbolAttr(NULL), + m_pSymbolAttr(nullptr), m_bLastWidthModified(false), m_aSymbolLastSize(Size(0,0)), @@ -104,14 +104,14 @@ SvxLineTabPage::SvxLineTabPage m_aXColor ( OUString(), COL_LIGHTRED ), m_aXLineAttr ( rInAttrs.GetPool() ), m_rXLSet ( m_aXLineAttr.GetItemSet() ), - m_pnLineEndListState( 0 ), - m_pnDashListState( 0 ), - m_pnColorListState( 0 ), + m_pnLineEndListState( nullptr ), + m_pnDashListState( nullptr ), + m_pnColorListState( nullptr ), m_nPageType ( 0 ), m_nDlgType(0), - m_pPosDashLb(NULL), - m_pPosLineEndLb(NULL) + m_pPosDashLb(nullptr), + m_pPosLineEndLb(nullptr) { get(m_pLbLineStyle,"LB_LINE_STYLE"); get(m_pBoxColor,"boxCOLOR"); @@ -237,7 +237,7 @@ void SvxLineTabPage::dispose() if(m_pSymbolList) delete m_pSymbolMB->GetPopupMenu()->GetPopupMenu( MN_SYMBOLS ); - m_pSymbolMB = NULL; + m_pSymbolMB = nullptr; } for ( size_t i = 0, n = m_aGrfBrushItems.size(); i < n; ++i ) @@ -381,7 +381,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton) for(size_t i=0;; ++i) { SdrObject *pObj=m_pSymbolList->GetObj(i); - if(pObj==NULL) + if(pObj==nullptr) break; pObj=pObj->Clone(); m_aGrfNames.push_back(""); @@ -439,7 +439,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton) void SvxLineTabPage::SymbolSelected(MenuButton* pButton) { sal_uInt16 nItemId = pButton->GetCurItemId(); - const Graphic* pGraphic = 0; + const Graphic* pGraphic = nullptr; Graphic aGraphic; bool bResetSize = false; bool bEnable = true; @@ -472,7 +472,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) case MN_SYMBOLS_NONE: { m_nSymbolType=SVX_SYMBOLTYPE_NONE; - pGraphic=NULL; + pGraphic=nullptr; bEnable = false; } break; @@ -520,7 +520,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) else { m_aSymbolGraphic=Graphic(); - m_pCtlPreview->SetSymbol(NULL,m_aSymbolSize); + m_pCtlPreview->SetSymbol(nullptr,m_aSymbolSize); bEnable = false; } m_aSymbolLastSize=m_aSymbolSize; @@ -707,7 +707,7 @@ SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) { - const SfxPoolItem* pOld = NULL; + const SfxPoolItem* pOld = nullptr; sal_Int32 nPos; bool bModified = false; @@ -962,7 +962,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) SfxInt32Item aTItem(rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),m_nSymbolType); const SfxPoolItem* pTOld = GetOldItem( *rAttrs, rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE) ); - bool bNewType = pTOld == NULL || *static_cast<const SfxInt32Item*>(pTOld) != aTItem; + bool bNewType = pTOld == nullptr || *static_cast<const SfxInt32Item*>(pTOld) != aTItem; if(bNewType && m_nSymbolType==SVX_SYMBOLTYPE_UNKNOWN) bNewType=false; // a small fix, type wasn't set -> don't create a type item after all! if(bNewType) @@ -976,7 +976,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) SvxBrushItem aBItem(m_aSymbolGraphic,GPOS_MM,rAttrs->GetPool()->GetWhich(SID_ATTR_BRUSH)); const SfxPoolItem* pBOld = GetOldItem( *rAttrs, rAttrs->GetPool()->GetWhich(SID_ATTR_BRUSH) ); bool bNewBrush = - pBOld == NULL || *static_cast<const SvxBrushItem*>(pBOld) != aBItem; + pBOld == nullptr || *static_cast<const SvxBrushItem*>(pBOld) != aBItem; if(bNewBrush) { rAttrs->Put(aBItem); @@ -1155,7 +1155,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) std::unique_ptr<SdrView> pView(new SdrView( pModel.get(), pVDev )); pView->hideMarkHandles(); pView->ShowSdrPage(pPage); - SdrObject *pObj=NULL; + SdrObject *pObj=nullptr; size_t nSymTmp = static_cast<size_t>(nSymType); if(m_pSymbolList) { @@ -1510,7 +1510,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) ClickInvisibleHdl_Impl( *m_pLbLineStyle ); - ChangePreviewHdl_Impl( NULL ); + ChangePreviewHdl_Impl( nullptr ); } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 89d4a8209ace..3ec2f9247eea 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -67,10 +67,10 @@ SvxLineDefTabPage::SvxLineDefTabPage aXColor ( OUString(), COL_BLACK ), aXLineAttr ( rInAttrs.GetPool() ), rXLSet ( aXLineAttr.GetItemSet() ), - pnDashListState(0), - pPageType(0), + pnDashListState(nullptr), + pPageType(nullptr), nDlgType(0), - pPosDashLb(0) + pPosDashLb(nullptr) { get(m_pLbLineStyles ,"LB_LINESTYLES"); @@ -149,7 +149,7 @@ SvxLineDefTabPage::SvxLineDefTabPage m_pMtrLength2->SetModifyHdl( aLink2 ); m_pMtrDistance->SetModifyHdl( aLink2 ); - pDashList = NULL; + pDashList = nullptr; } SvxLineDefTabPage::~SvxLineDefTabPage() @@ -258,13 +258,13 @@ void SvxLineDefTabPage::CheckChanges_Impl() { case RET_BTN_1: { - ClickModifyHdl_Impl( NULL ); + ClickModifyHdl_Impl( nullptr ); } break; case RET_BTN_2: { - ClickAddHdl_Impl( NULL ); + ClickAddHdl_Impl( nullptr ); } break; @@ -329,7 +329,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) break; } } - SelectLinestyleHdl_Impl( NULL ); + SelectLinestyleHdl_Impl( nullptr ); // determine button state if( pDashList->Count() ) @@ -499,7 +499,7 @@ IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) SetMetricValue( *m_pMtrDistance, nTmp3, ePoolUnit ); } - SelectTypeHdl_Impl( NULL ); + SelectTypeHdl_Impl( nullptr ); } @@ -912,7 +912,7 @@ void SvxLineDefTabPage::FillDialog_Impl() m_pLbType2->SelectEntryPos( aDash.GetDashLen() == 0 ? 0 : 1 ); SetMetricValue( *m_pMtrDistance, aDash.GetDistance(), ePoolUnit ); - ChangeMetricHdl_Impl( NULL ); + ChangeMetricHdl_Impl( nullptr ); // save values for changes recognition (-> method) m_pNumFldNumber1->SaveValue(); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index e0157ccc0bb9..254fa299c28f 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -58,7 +58,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage , "cui/ui/lineendstabpage.ui" , &rInAttrs ), rOutAttrs ( rInAttrs ), - pPolyObj ( NULL ), + pPolyObj ( nullptr ), bObjSelected ( false ), aXLStyle ( css::drawing::LineStyle_SOLID ), @@ -66,11 +66,11 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage aXColor ( OUString(), COL_BLACK ), aXLineAttr ( rInAttrs.GetPool() ), rXLSet ( aXLineAttr.GetItemSet() ), - pLineEndList ( NULL ), - pnLineEndListState ( NULL ), - pPageType ( NULL ), + pLineEndList ( nullptr ), + pnLineEndListState ( nullptr ), + pPageType ( nullptr ), nDlgType ( 0 ), - pPosLineEndLb ( NULL ) + pPosLineEndLb ( nullptr ) { get(m_pEdtName,"EDT_NAME"); get(m_pLbLineEnds,"LB_LINEENDS"); @@ -140,15 +140,15 @@ void SvxLineEndDefTabPage::Construct() { bCreateArrowPossible = false; } - else if( 0 == dynamic_cast<const SdrPathObj*>( pPolyObj) ) + else if( nullptr == dynamic_cast<const SdrPathObj*>( pPolyObj) ) { SdrObjTransformInfoRec aInfoRec; pPolyObj->TakeObjInfo( aInfoRec ); - SdrObject* pNewObj = 0; + SdrObject* pNewObj = nullptr; if( aInfoRec.bCanConvToPath ) pNewObj = pPolyObj->ConvertToPolyObj( true, false ); - bCreateArrowPossible = pNewObj && 0 != dynamic_cast<const SdrPathObj*>( pNewObj); + bCreateArrowPossible = pNewObj && nullptr != dynamic_cast<const SdrPathObj*>( pNewObj); SdrObject::Free( pNewObj ); } @@ -208,7 +208,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() ,"AskChangeLineEndDialog" ,"cui/ui/querychangelineenddialog.ui" ); if ( aQueryBox->Execute() == RET_YES ) - ClickModifyHdl_Impl( NULL ); + ClickModifyHdl_Impl( nullptr ); } } nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -404,9 +404,9 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) if( pPolyObj ) { const SdrObject* pNewObj; - SdrObject* pConvPolyObj = NULL; + SdrObject* pConvPolyObj = nullptr; - if( 0 != dynamic_cast<const SdrPathObj*>( pPolyObj) ) + if( nullptr != dynamic_cast<const SdrPathObj*>( pPolyObj) ) { pNewObj = pPolyObj; } @@ -419,7 +419,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) { pNewObj = pConvPolyObj = pPolyObj->ConvertToPolyObj( true, false ); - if( !pNewObj || 0 == dynamic_cast<const SdrPathObj*>( pNewObj) ) + if( !pNewObj || nullptr == dynamic_cast<const SdrPathObj*>( pNewObj) ) return; // cancel, additional safety, which // has no use for group objects though. } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index ec3cf5f73a5b..37a64510b280 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -55,10 +55,10 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA rInAttrs ), m_rOutAttrs ( rInAttrs ), m_eRP ( RP_LT ), - m_pnColorListState ( 0 ), + m_pnColorListState ( nullptr ), m_nPageType ( 0 ), m_nDlgType ( 0 ), - m_pbAreaTP ( 0 ), + m_pbAreaTP ( nullptr ), m_bDisable ( false ), m_aXFillAttr ( rInAttrs.GetPool() ), m_rXFSet ( m_aXFillAttr.GetItemSet() ) @@ -273,7 +273,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) if( !m_bDisable ) { - const SfxPoolItem* pOld = NULL; + const SfxPoolItem* pOld = nullptr; if( m_pTsbShowShadow->IsValueChangedFromSaved() ) { @@ -477,7 +477,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) // It IS the error. m_pMtrTransparent->SaveValue(); - ClickShadowHdl_Impl( NULL ); + ClickShadowHdl_Impl( nullptr ); ModifyShadowHdl_Impl( *m_pMtrTransparent ); } } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 0db63dbff63f..feca458c8c24 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -179,7 +179,7 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link<SvxSwFrameValidat SvxAngleTabPage::SvxAngleTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage( pParent,"Rotation","cui/ui/rotationtabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) - , pView(NULL) + , pView(nullptr) , eDlgUnit(FUNIT_NONE) { get(m_pFlPosition, "FL_POSITION"); @@ -424,7 +424,7 @@ SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr : SvxTabPage( pParent,"SlantAndCornerRadius","cui/ui/slantcornertabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) - , pView(NULL) + , pView(nullptr) , eDlgUnit(FUNIT_NONE) { get(m_pFlRadius, "FL_RADIUS"); @@ -701,7 +701,7 @@ VclPtr<SfxTabPage> SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemS void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) { - SfxRectangleItem const * pRectItem = NULL; + SfxRectangleItem const * pRectItem = nullptr; if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, reinterpret_cast<SfxPoolItem const **>(&pRectItem) ) ) { @@ -736,7 +736,7 @@ void SvxSlantTabPage::PointChanged( vcl::Window* , RECT_POINT ) SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage(pParent,"PositionAndSize","cui/ui/possizetabpage.ui", rInAttrs) , mrOutAttrs(rInAttrs) - , mpView(NULL) + , mpView(nullptr) , meDlgUnit(FUNIT_NONE) , mnProtectSizeState(TRISTATE_FALSE) , mbPageDisabled(false) @@ -1079,7 +1079,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) m_pCtlPos->Reset(); // #i2379# Disable controls for protected objects - ChangePosProtectHdl( NULL ); + ChangePosProtectHdl( nullptr ); } { // #i75273# set width @@ -1141,10 +1141,10 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) m_pTsbSizeProtect->SaveValue(); m_pTsbAutoGrowWidth->SaveValue(); m_pTsbAutoGrowHeight->SaveValue(); - ClickSizeProtectHdl( NULL ); + ClickSizeProtectHdl( nullptr ); // #i2379# Disable controls for protected objects - ChangeSizeProtectHdl( NULL ); + ChangeSizeProtectHdl( nullptr ); } @@ -1158,7 +1158,7 @@ VclPtr<SfxTabPage> SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const S void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) { - SfxRectangleItem const * pRectItem = NULL; + SfxRectangleItem const * pRectItem = nullptr; if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, reinterpret_cast<SfxPoolItem const **>(&pRectItem) ) ) { |