diff options
Diffstat (limited to 'sw/source/filter/basflt/fltini.cxx')
-rw-r--r-- | sw/source/filter/basflt/fltini.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 545a34f211cc..7e785aa9966e 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -61,7 +61,7 @@ using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star; -SwRead ReadAscii = 0, ReadHTML = 0, ReadXML = 0; +SwRead ReadAscii = nullptr, ReadHTML = nullptr, ReadXML = nullptr; Reader* GetRTFReader(); Reader* GetWW8Reader(); @@ -71,15 +71,15 @@ Reader* GetWW8Reader(); SwReaderWriterEntry aReaderWriter[] = { SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter, true ), - SwReaderWriterEntry( 0, &::GetASCWriter, false ), + SwReaderWriterEntry( nullptr, &::GetASCWriter, false ), SwReaderWriterEntry( &::GetWW8Reader, nullptr, true ), SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer, true ), SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter, true ), - SwReaderWriterEntry( 0, &::GetHTMLWriter, true ), - SwReaderWriterEntry( &::GetWW8Reader, 0, true ), - SwReaderWriterEntry( 0, &::GetXMLWriter, true ), - SwReaderWriterEntry( 0, &::GetASCWriter, false ), - SwReaderWriterEntry( 0, &::GetASCWriter, true ) + SwReaderWriterEntry( nullptr, &::GetHTMLWriter, true ), + SwReaderWriterEntry( &::GetWW8Reader, nullptr, true ), + SwReaderWriterEntry( nullptr, &::GetXMLWriter, true ), + SwReaderWriterEntry( nullptr, &::GetASCWriter, false ), + SwReaderWriterEntry( nullptr, &::GetASCWriter, true ) }; Reader* SwReaderWriterEntry::GetReader() @@ -91,7 +91,7 @@ Reader* SwReaderWriterEntry::GetReader() pReader = (*fnGetReader)(); return pReader; } - return NULL; + return nullptr; } void SwReaderWriterEntry::GetWriter( const OUString& rNm, const OUString& rBaseURL, WriterRef& xWrt ) const @@ -99,7 +99,7 @@ void SwReaderWriterEntry::GetWriter( const OUString& rNm, const OUString& rBaseU if ( fnGetWriter ) (*fnGetWriter)( rNm, rBaseURL, xWrt ); else - xWrt = WriterRef(0); + xWrt = WriterRef(nullptr); } SwRead SwGetReaderXML() // SW_DLLPUBLIC @@ -130,7 +130,7 @@ Filters::~Filters() { SwReaderWriterEntry& rEntry = aReaderWriter[n]; if( rEntry.bDelReader && rEntry.pReader ) - delete rEntry.pReader, rEntry.pReader = NULL; + delete rEntry.pReader, rEntry.pReader = nullptr; } } @@ -147,7 +147,7 @@ oslGenericFunction Filters::GetMswordLibSymbol( const char *pSymbol ) } if (msword_.is()) return msword_.getFunctionSymbol( OUString::createFromAscii( pSymbol ) ); - return NULL; + return nullptr; } #endif @@ -173,7 +173,7 @@ void GetWriter( const OUString& rFltName, const OUString& rBaseURL, WriterRef& x SwRead GetReader( const OUString& rFltName ) { - SwRead pRead = 0; + SwRead pRead = nullptr; for( int n = 0; n < MAXFILTER; ++n ) { if ( aFilterDetect[n].IsFilter( rFltName ) ) @@ -296,7 +296,7 @@ SwRelNumRuleSpaces::~SwRelNumRuleSpaces() void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, SwTwips nPageWidth) { - const SfxPoolItem* pItem = 0; + const SfxPoolItem* pItem = nullptr; if( SfxItemState::SET != rFlySet.GetItemState( RES_FRM_SIZE, true, &pItem ) || MINFLY > static_cast<const SwFormatFrmSize*>(pItem)->GetWidth() ) { @@ -320,7 +320,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, bool bOnlyOneNode = true; sal_uLong nMinFrm = 0; sal_uLong nMaxFrm = 0; - SwTextNode* pFirstTextNd = 0; + SwTextNode* pFirstTextNd = nullptr; SwNodeIndex aIdx( *pSttNd, 1 ); SwNodeIndex aEnd( *pSttNd->GetNode().EndOfSectionNode() ); while( aIdx < aEnd ) @@ -509,7 +509,7 @@ const CharSetNameMap *GetCharSetNameMap() IMPLENTRY(UCS4), IMPLENTRY(UCS2), IMPLENTRY(UNICODE), - {0,0} //Last + {0,nullptr} //Last }; return &aMapArr[0]; } @@ -655,7 +655,7 @@ Reader* GetRTFReader() if ( pFunction ) return (*pFunction)(); - return NULL; + return nullptr; #else return ImportRTF(); #endif @@ -670,7 +670,7 @@ void GetRTFWriter( const OUString& rFltName, const OUString& rBaseURL, WriterRef if ( pFunction ) (*pFunction)( rFltName, rBaseURL, xRet ); else - xRet = WriterRef(0); + xRet = WriterRef(nullptr); #else ExportRTF( rFltName, rBaseURL, xRet ); #endif @@ -684,7 +684,7 @@ Reader* GetWW8Reader() if ( pFunction ) return (*pFunction)(); - return NULL; + return nullptr; #else return ImportDOC(); #endif @@ -698,7 +698,7 @@ void GetWW8Writer( const OUString& rFltName, const OUString& rBaseURL, WriterRef if ( pFunction ) (*pFunction)( rFltName, rBaseURL, xRet ); else - xRet = WriterRef(0); + xRet = WriterRef(nullptr); #else ExportDOC( rFltName, rBaseURL, xRet ); #endif |