diff options
Diffstat (limited to 'lotuswordpro/source/filter/xfilter')
24 files changed, 56 insertions, 56 deletions
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx index a263a6355ce6..ddc77000b6d5 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx @@ -64,8 +64,8 @@ XFCell::XFCell() { - m_pSubTable = NULL; - m_pOwnerRow = NULL; + m_pSubTable = nullptr; + m_pOwnerRow = nullptr; m_nCol = 0; m_nColSpaned = 1; m_nRepeated = 0; diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx index a6350e2f1f65..38e7a21c7739 100644 --- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx @@ -67,8 +67,8 @@ XFCellStyle::XFCellStyle() m_eHoriAlign = enumXFAlignNone; m_eVertAlign = enumXFAlignNone; m_fTextIndent = 0; - m_pBorders = NULL; - m_pBackImage = NULL; + m_pBorders = nullptr; + m_pBackImage = nullptr; m_bWrapText = false; } diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx index dab6c9da91c7..87e146bd1107 100644 --- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx +++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx @@ -60,9 +60,9 @@ #include "xfconfigmanager.hxx" XFConfigManager::XFConfigManager() - : m_pLineNumberConfig(0) - , m_pFootnoteConfig(0) - , m_pEndnoteConfig(0) + : m_pLineNumberConfig(nullptr) + , m_pFootnoteConfig(nullptr) + , m_pEndnoteConfig(nullptr) { } @@ -103,9 +103,9 @@ void XFConfigManager::ToXml(IXFStream *pStrm) XFStyleContainer::ToXml(pStrm); XFStyleContainer::Reset(); - m_pLineNumberConfig = NULL; - m_pFootnoteConfig = NULL; - m_pEndnoteConfig = NULL; + m_pLineNumberConfig = nullptr; + m_pFootnoteConfig = nullptr; + m_pEndnoteConfig = nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx index ece407e9f6a2..05a24f948f33 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx @@ -143,7 +143,7 @@ rtl::Reference<XFContent> XFContentContainer::GetLastContent() return m_aContents[index]; } - return NULL; + return nullptr; } void XFContentContainer::RemoveLastContent() diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx index 339625950e8e..20d067f5c2f7 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx @@ -132,7 +132,7 @@ private: inline rtl::Reference<XFContent> XFContentContainer::GetContent(sal_uInt32 index) const { if (index > m_aContents.size()-1) - return NULL; + return nullptr; return m_aContents[index]; } #endif diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx index e7ffd4ca0176..e0e5ae130745 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx @@ -68,10 +68,10 @@ XFDrawStyle::XFDrawStyle() m_eWrap = enumXFWrapNone; m_nWrapLines = 0; //not limited. - m_pLineStyle = NULL; - m_pAreaStyle = NULL; + m_pLineStyle = nullptr; + m_pAreaStyle = nullptr; - m_pFontWorkStyle = NULL; + m_pFontWorkStyle = nullptr; m_fArrowStartSize = 0.3; m_fArrowEndSize = 0.3; @@ -85,7 +85,7 @@ XFDrawStyle::~XFDrawStyle() if (m_pFontWorkStyle) { delete m_pFontWorkStyle; - m_pFontWorkStyle = NULL; + m_pFontWorkStyle = nullptr; } } diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx index 7bdaf8f5ed0c..af9fd504e744 100644 --- a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx +++ b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx @@ -87,6 +87,6 @@ rtl::Reference<XFFont> XFFontFactory::FindSameFont(rtl::Reference<XFFont> const return *it; } - return NULL; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx index b11ce54694e2..e5e2779ff7da 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx @@ -67,10 +67,10 @@ XFFrameStyle::XFFrameStyle() { m_eWrap = enumXFWrapNone; m_nWrapLines = 0; //not limited. - m_pBorders = NULL; - m_pColumns = NULL; - m_pShadow = NULL; - m_pBGImage = NULL; + m_pBorders = nullptr; + m_pColumns = nullptr; + m_pShadow = nullptr; + m_pBGImage = nullptr; m_bProtectContent = false; m_bProtectSize = false; diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx index d2521ab9bf39..4722ca168c43 100644 --- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx @@ -66,9 +66,9 @@ XFHeaderStyle::XFHeaderStyle(bool isFooter) m_bDynamicSpace = true; m_fHeight = -1; m_fMinHeight = -1; - m_pBorders = NULL; - m_pShadow = NULL; - m_pBGImage = NULL; + m_pBorders = nullptr; + m_pShadow = nullptr; + m_pBGImage = nullptr; } XFHeaderStyle::~XFHeaderStyle() diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx index a028aa919120..32c5fb7f30b5 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.cxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx @@ -62,7 +62,7 @@ XFIndex::XFIndex() { - m_pTitle = NULL; + m_pTitle = nullptr; m_eType = enumXFIndexTOC; m_bProtect = true; m_bSeparator = false; diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx index a5b4722fb613..24980edafac5 100644 --- a/lotuswordpro/source/filter/xfilter/xflist.cxx +++ b/lotuswordpro/source/filter/xfilter/xflist.cxx @@ -66,7 +66,7 @@ XFList::XFList() { m_bOrdered = true; m_bContinueNumber = false; - m_pHeader = NULL; + m_pHeader = nullptr; } XFList::~XFList() @@ -76,7 +76,7 @@ XFList::~XFList() void XFList::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); - assert(NULL!=pAttrList); + assert(nullptr!=pAttrList); pAttrList->Clear(); if( !GetStyleName().isEmpty() ) diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx index 4cfc34e523f7..7f7e868247f7 100644 --- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx @@ -182,7 +182,7 @@ XFListStyle::XFListStyle(const XFListStyle& other):XFStyle(other) m_pListLevels[i] = new XFListLevelBullet(*pBullet); } else - m_pListLevels[i] = NULL; + m_pListLevels[i] = nullptr; } } @@ -202,7 +202,7 @@ XFListStyle& XFListStyle::operator=(const XFListStyle& other) m_pListLevels[i] = new XFListLevelBullet(*pBullet); } else - m_pListLevels[i] = NULL; + m_pListLevels[i] = nullptr; } return *this; } diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx index 084f50e757cf..5fe16aa49556 100644 --- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx @@ -65,8 +65,8 @@ #include "../lwpglobalmgr.hxx" XFMasterPage::XFMasterPage() { - m_pHeader = NULL; - m_pFooter = NULL; + m_pHeader = nullptr; + m_pFooter = nullptr; } XFMasterPage::~XFMasterPage() diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx index 15e2fa1e693c..e22d6f19fb23 100644 --- a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx +++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx @@ -69,8 +69,8 @@ #include "xfbgimage.hxx" XFPageMaster::XFPageMaster() : m_fPageWidth(0), m_fPageHeight(0), m_eUsage(enumXFPageUsageNone), -m_eTextDir(enumXFTextDirNone), m_bPrintOrient(true), m_pBorders(NULL), m_pShadow(NULL), -m_pColumns(NULL), m_pBGImage(NULL), m_pHeaderStyle(NULL), m_pFooterStyle(NULL), +m_eTextDir(enumXFTextDirNone), m_bPrintOrient(true), m_pBorders(nullptr), m_pShadow(nullptr), +m_pColumns(nullptr), m_pBGImage(nullptr), m_pHeaderStyle(nullptr), m_pFooterStyle(nullptr), m_eSepAlign(enumXFAlignNone), m_fSepWidth(0), m_aSepColor(0), m_fSepSpaceAbove(0), m_fSepSpaceBelow(0), m_nSepLengthPercent(0) { diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx index 78c80db96883..7eaa391813b6 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx @@ -71,8 +71,8 @@ XFParaStyle::XFParaStyle() , m_bJustSingleWord(false) , m_bKeepWithNext(false) , m_fTextIndent(0) - , m_pBorders(NULL) - , m_pBGImage(NULL) + , m_pBorders(nullptr) + , m_pBGImage(nullptr) , m_nPageNumber(0) , m_bNumberLines(true) , m_nLineNumberRestart(0) @@ -108,12 +108,12 @@ XFParaStyle::XFParaStyle(const XFParaStyle& other) if( other.m_pBorders ) m_pBorders = new XFBorders(*other.m_pBorders); else - m_pBorders = NULL; + m_pBorders = nullptr; if( other.m_pBGImage ) m_pBGImage = new XFBGImage(*other.m_pBGImage); else - m_pBGImage = NULL; + m_pBGImage = nullptr; for (size_t i = 0; i < other.m_aTabs.GetCount(); ++i) { @@ -155,12 +155,12 @@ XFParaStyle& XFParaStyle::operator=(const XFParaStyle& other) if( other.m_pBorders ) m_pBorders = new XFBorders(*other.m_pBorders); else - m_pBorders = NULL; + m_pBorders = nullptr; m_aBackColor = other.m_aBackColor; if( other.m_pBGImage ) m_pBGImage = new XFBGImage(*other.m_pBGImage); else - m_pBGImage = NULL; + m_pBGImage = nullptr; m_aShadow = other.m_aShadow; m_aMargin = other.m_aMargin; diff --git a/lotuswordpro/source/filter/xfilter/xfrow.cxx b/lotuswordpro/source/filter/xfilter/xfrow.cxx index 26c258174d50..4c2736b0ea9f 100644 --- a/lotuswordpro/source/filter/xfilter/xfrow.cxx +++ b/lotuswordpro/source/filter/xfilter/xfrow.cxx @@ -67,7 +67,7 @@ #include "xftable.hxx" XFRow::XFRow() - : m_pOwnerTable(NULL) + : m_pOwnerTable(nullptr) , m_nRepeat(0) , m_nRow(0) { @@ -101,7 +101,7 @@ sal_Int32 XFRow::GetCellCount() const XFCell* XFRow::GetCell(sal_Int32 col) const { if( m_aCells.find(col) == m_aCells.end() ) - return NULL; + return nullptr; else return m_aCells.find(col)->second; } diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx index a8acfbadc490..460ba39ef786 100644 --- a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx @@ -64,7 +64,7 @@ XFRowStyle::XFRowStyle():m_fHeight(0) { m_fHeight = 0; m_fMinHeight = 0; - m_pBGImage = NULL; + m_pBGImage = nullptr; } enumXFStyle XFRowStyle::GetStyleFamily() @@ -113,7 +113,7 @@ XFRowStyle& XFRowStyle::operator=(XFRowStyle const &other) if( other.m_pBGImage ) m_pBGImage = new XFBGImage(*other.m_pBGImage); else - m_pBGImage = NULL; + m_pBGImage = nullptr; } return *this; } diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx index cb9d5cf972f9..1db64ed1ae41 100644 --- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx @@ -64,8 +64,8 @@ XFSectionStyle::XFSectionStyle() { m_fMarginLeft = 0; m_fMarginRight = 0; - m_pBackImage = NULL; - m_pColumns = NULL; + m_pBackImage = nullptr; + m_pColumns = nullptr; } XFSectionStyle::~XFSectionStyle() diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx index 544402ac7c7e..7e4d60ceff07 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx @@ -108,7 +108,7 @@ IXFStyleRet XFStyleContainer::AddStyle(IXFStyle *pStyle) { IXFStyleRet aRet; - IXFStyle *pConStyle = NULL; + IXFStyle *pConStyle = nullptr; OUString name; if( !pStyle ) @@ -162,7 +162,7 @@ IXFStyle* XFStyleContainer::FindSameStyle(IXFStyle *pStyle) return pConStyle; } - return NULL; + return nullptr; } IXFStyle* XFStyleContainer::FindStyle(const OUString& name) @@ -176,7 +176,7 @@ IXFStyle* XFStyleContainer::FindStyle(const OUString& name) return pConStyle; } - return NULL; + return nullptr; } const IXFStyle* XFStyleContainer::Item(size_t index) const @@ -186,7 +186,7 @@ const IXFStyle* XFStyleContainer::Item(size_t index) const { return m_aStyles[index]; } - return NULL; + return nullptr; } void XFStyleContainer::ToXml(IXFStream *pStrm) diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx index 5757d233eaf8..de6b6f13ea16 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx @@ -70,7 +70,7 @@ struct IXFStyleRet IXFStyle* m_pStyle; bool m_bOrigDeleted; IXFStyleRet() - : m_pStyle(NULL) + : m_pStyle(nullptr) , m_bOrigDeleted(false) { } diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx index 8704816b3fc3..6cd468b2cbcb 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx @@ -69,7 +69,7 @@ XFStyleManager::XFStyleManager() : s_aStdArrowStyles( "arrow" ), s_aTextStyles( s_aParaStyles( "P" ),s_aListStyles( "L" ),s_aSectionStyles( "Sect" ), s_aPageMasters( "PM" ),s_aMasterpages( "MP" ),s_aDateStyles( "N" ), s_aGraphicsStyles( "fr" ),s_aTableStyles( "table" ),s_aTableCellStyles( "cell" ), - s_aTableRowStyles( "row" ),s_aTableColStyles( "col" ),s_pOutlineStyle(NULL) + s_aTableRowStyles( "row" ),s_aTableColStyles( "col" ),s_pOutlineStyle(nullptr) { } @@ -83,7 +83,7 @@ void XFStyleManager::Reset() if( s_pOutlineStyle ) { delete s_pOutlineStyle; - s_pOutlineStyle = NULL; + s_pOutlineStyle = nullptr; } s_aStdTextStyles.Reset(); @@ -276,7 +276,7 @@ IXFStyle* XFStyleManager::FindStyle(const OUString& name) if( pStyle ) return pStyle; - return NULL; + return nullptr; } XFParaStyle* XFStyleManager::FindParaStyle(const OUString& name) diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx index 13d51934bd64..9a96db8d5077 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.cxx +++ b/lotuswordpro/source/filter/xfilter/xftable.cxx @@ -67,7 +67,7 @@ XFTable::XFTable() { m_strName = XFGlobal::GenTableName(); m_bSubTable = false; - m_pOwnerCell = NULL; + m_pOwnerCell = nullptr; } XFTable::~XFTable() diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx index 42656c88f323..bdb0aacc1e15 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.hxx +++ b/lotuswordpro/source/filter/xfilter/xftable.hxx @@ -125,7 +125,7 @@ inline void XFTable::SetTableName(const OUString& name) inline void XFTable::SetOwnerCell(XFCell *pCell) { m_pOwnerCell = pCell; - m_bSubTable = (pCell!=NULL); + m_bSubTable = (pCell!=nullptr); } inline bool XFTable::IsSubTable() diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx index 0e055515c25e..ba6406d508cb 100644 --- a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx @@ -64,7 +64,7 @@ XFTableStyle::XFTableStyle() { m_fWidth = 2; m_eAlign = enumXFAlignStart; - m_pBGImage = NULL; + m_pBGImage = nullptr; } XFTableStyle::~XFTableStyle() |