diff options
Diffstat (limited to 'sd/source/filter/html/htmlex.cxx')
-rw-r--r-- | sd/source/filter/html/htmlex.cxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index cfe2ea237568..aee3bdf1a7e3 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -349,7 +349,7 @@ HtmlExport::HtmlExport( : maPath( aPath ), mpDoc(pExpDoc), mpDocSh( pDocShell ), - meEC(NULL), + meEC(nullptr), meMode( PUBLISH_SINGLE_DOCUMENT ), mbContentsPage(false), mnButtonThema(-1), @@ -803,7 +803,7 @@ void HtmlExport::ExportHtml() void HtmlExport::SetDocColors( SdPage* pPage ) { - if( pPage == NULL ) + if( pPage == nullptr ) pPage = mpDoc->GetSdPage(0, PK_STANDARD); svtools::ColorConfig aConfig; @@ -812,19 +812,19 @@ void HtmlExport::SetDocColors( SdPage* pPage ) maLinkColor = Color(aConfig.GetColorValue(svtools::LINKS).nColor); maTextColor = Color(COL_BLACK); - SfxStyleSheet* pSheet = NULL; + SfxStyleSheet* pSheet = nullptr; if( mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS ) { // default text color from the outline template of the first page pSheet = pPage->GetStyleSheetForPresObj(PRESOBJ_OUTLINE); - if(pSheet == NULL) + if(pSheet == nullptr) pSheet = pPage->GetStyleSheetForPresObj(PRESOBJ_TEXT); - if(pSheet == NULL) + if(pSheet == nullptr) pSheet = pPage->GetStyleSheetForPresObj(PRESOBJ_TITLE); } - if(pSheet == NULL) + if(pSheet == nullptr) pSheet = mpDoc->GetDefaultStyleSheet(); if(pSheet) @@ -852,7 +852,7 @@ void HtmlExport::InitProgress( sal_uInt16 nProgrCount ) void HtmlExport::ResetProgress() { delete mpProgress; - mpProgress = NULL; + mpProgress = nullptr; } void HtmlExport::ExportKiosk() @@ -1034,7 +1034,7 @@ bool HtmlExport::CreateImagesForPresPages( bool bThumbnail) SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) { const size_t nObjectCount = pPage->GetObjCount(); - SdrTextObj* pResult = NULL; + SdrTextObj* pResult = nullptr; for (size_t nObject = 0; nObject < nObjectCount; ++nObject) { @@ -1282,7 +1282,7 @@ void HtmlExport::WriteTable(OUStringBuffer& aStr, SdrTableObj* pTableObject, Sdr sal_Int32 nCellIndex = nRow * nColCount + nCol; SdrText* pText = pTableObject->getText(nCellIndex); - if (pText == NULL) + if (pText == nullptr) continue; WriteOutlinerParagraph(aStr, pOutliner, pText->GetOutlinerParaObject(), rBackgroundColor, false); aStr.append(" </td>\r\n"); @@ -1307,7 +1307,7 @@ void HtmlExport::WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup* pObjectGrou else { OutlinerParaObject* pOutlinerParagraphObject = pCurrentObject->GetOutlinerParaObject(); - if (pOutlinerParagraphObject != NULL) + if (pOutlinerParagraphObject != nullptr) { WriteOutlinerParagraph(aStr, pOutliner, pOutlinerParagraphObject, rBackgroundColor, bHeadLine); } @@ -1319,7 +1319,7 @@ void HtmlExport::WriteOutlinerParagraph(OUStringBuffer& aStr, SdrOutliner* pOutl OutlinerParaObject* pOutlinerParagraphObject, const Color& rBackgroundColor, bool bHeadLine) { - if (pOutlinerParagraphObject == NULL) + if (pOutlinerParagraphObject == nullptr) return; pOutliner->SetText(*pOutlinerParagraphObject); @@ -1332,7 +1332,7 @@ void HtmlExport::WriteOutlinerParagraph(OUStringBuffer& aStr, SdrOutliner* pOutl for (sal_Int32 nIndex = 0; nIndex < nCount; nIndex++) { Paragraph* pParagraph = pOutliner->GetParagraph(nIndex); - if(pParagraph == NULL) + if(pParagraph == nullptr) continue; const sal_Int16 nDepth = (sal_uInt16) pOutliner->GetDepth(nIndex); @@ -1410,7 +1410,7 @@ OUString HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_Int32 nP { OUStringBuffer aStr; - if(NULL == pOutliner) + if(nullptr == pOutliner) return OUString(); // TODO: MALTE!!! @@ -1419,7 +1419,7 @@ OUString HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_Int32 nP rEditEngine.SetUpdateMode(true); Paragraph* pPara = pOutliner->GetParagraph(nPara); - if(NULL == pPara) + if(nullptr == pPara) return OUString(); HtmlState aState( (mbUserAttr || mbDocColors) ? maTextColor : Color(COL_BLACK) ); @@ -1455,7 +1455,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState { OUStringBuffer aStr; - if(NULL == pSet) + if(nullptr == pSet) return OUString(); OUString aLink, aTarget; @@ -1723,7 +1723,7 @@ bool HtmlExport::CreateHtmlForPresPages() // corresponding names of the html file bool bIsMasterPage; sal_uInt16 nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage ); - SdrObject* pObj = NULL; + SdrObject* pObj = nullptr; if (nPgNum == SDRPAGE_NOTFOUND) { @@ -1809,7 +1809,7 @@ bool HtmlExport::CreateHtmlForPresPages() { bool bIsMasterPage; sal_uInt16 nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ); - SdrObject* pObj = NULL; + SdrObject* pObj = nullptr; if( nPgNum == SDRPAGE_NOTFOUND ) { @@ -3146,8 +3146,8 @@ OUString HtmlExport::GetButtonName( int nButton ) EasyFile::EasyFile() { - pMedium = NULL; - pOStm = NULL; + pMedium = nullptr; + pOStm = nullptr; bOpen = false; } @@ -3188,7 +3188,7 @@ sal_uLong EasyFile::createStream( const OUString& rUrl, SvStream* &rpStr ) bOpen = false; delete pMedium; delete pOStm; - pOStm = NULL; + pOStm = nullptr; } rpStr = pOStm; @@ -3225,7 +3225,7 @@ sal_uLong EasyFile::close() sal_uLong nErr = 0; delete pOStm; - pOStm = NULL; + pOStm = nullptr; bOpen = false; @@ -3238,7 +3238,7 @@ sal_uLong EasyFile::close() nErr = pMedium->GetError(); delete pMedium; - pMedium = NULL; + pMedium = nullptr; } return nErr; |