diff options
Diffstat (limited to 'sc/source/filter/inc')
27 files changed, 58 insertions, 58 deletions
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index c88284d56d03..875906e08ee3 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -319,13 +319,13 @@ private: sal_uInt16* pBuffer; sal_uInt16 nTabCount; - inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } + inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = nullptr; } virtual void SaveCont( XclExpStream& rStrm ) override; public: inline XclExpChTrTabId( sal_uInt16 nCount ) : - pBuffer( NULL ), nTabCount( nCount ) {} + pBuffer( nullptr ), nTabCount( nCount ) {} XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer ); virtual ~XclExpChTrTabId(); diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 3bb393cff0ef..09115c12c0c5 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -61,7 +61,7 @@ public: explicit Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, - const sal_Char* pcServiceName = 0 ); + const sal_Char* pcServiceName = nullptr ); protected: virtual void finalizeXShape( @@ -89,7 +89,7 @@ public: sal_Int32 nElement, const AttributeList& rAttribs, const ::oox::drawingml::ShapePtr& rxParentShape, - ::oox::drawingml::ShapePtr* pxShape = 0 ); + ::oox::drawingml::ShapePtr* pxShape = nullptr ); protected: virtual ::oox::core::ContextHandlerRef diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx index 3b1217dbf808..ed86794005bf 100644 --- a/sc/source/filter/inc/eeimport.hxx +++ b/sc/source/filter/inc/eeimport.hxx @@ -55,7 +55,7 @@ public: virtual ScRange GetRange() override { return maRange; } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, - SvNumberFormatter* pFormatter = NULL, + SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) override; }; diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index ccd5e685d545..ec2b45b6fce2 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -42,7 +42,7 @@ struct ScHTMLImage sal_Char nDir; // 1==hori, 2==verti, 3==beides ScHTMLImage() : - aSize( 0, 0 ), aSpace( 0, 0 ), pGraphic( NULL ), + aSize( 0, 0 ), aSpace( 0, 0 ), pGraphic( nullptr ), nDir( nHorizontal ) {} @@ -70,16 +70,16 @@ struct ScEEParseEntry bool bEntirePara:1; // true = use entire paragraph, false = use selection ScEEParseEntry( SfxItemPool* pPool ) : - aItemSet( *pPool ), pValStr( NULL ), - pNumStr( NULL ), pName( NULL ), + aItemSet( *pPool ), pValStr( nullptr ), + pNumStr( nullptr ), pName( nullptr ), nCol(SCCOL_MAX), nRow(SCROW_MAX), nTab(0), nTwips(0), nColOverlap(1), nRowOverlap(1), nOffset(0), nWidth(0), bHasGraphic(false), bEntirePara(true) {} ScEEParseEntry( const SfxItemSet& rItemSet ) : - aItemSet( rItemSet ), pValStr( NULL ), - pNumStr( NULL ), pName( NULL ), + aItemSet( rItemSet ), pValStr( nullptr ), + pNumStr( nullptr ), pName( nullptr ), nCol(SCCOL_MAX), nRow(SCROW_MAX), nTab(0), nTwips(0), nColOverlap(1), nRowOverlap(1), nOffset(0), nWidth(0), bHasGraphic(false), bEntirePara(true) diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index fa3b152c0564..547fdb144b57 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -82,7 +82,7 @@ public: @return The encryption data or an empty sequence on 'Cancel' or any error. */ static css::uno::Sequence< css::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, ::comphelper::IDocPasswordVerifier& rVerifier, - const ::std::vector< OUString >* pDefaultPasswords = 0 ); + const ::std::vector< OUString >* pDefaultPasswords = nullptr ); }; template< typename Type > diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 5a920c870620..0a9667a36769 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -280,7 +280,7 @@ public: virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) override; virtual FltError ScImportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, bool bCalcWidthHeight = true, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) override; + SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) override; virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) override; virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) override; diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 858e5beeb25c..562a64b45afd 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -34,7 +34,7 @@ public: const ScHTMLParser* GetParser() const { return static_cast<ScHTMLParser*>(mpParser); } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) override; + SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) override; static OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ); }; diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index 3529d6e3565d..230a9a77530e 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -39,10 +39,10 @@ private: sal_Int32 nType; // < 0 -> undefiniert inline ENTRY() { - pTmpName = NULL; - pFont = NULL; - pHeight = NULL; - pColor = NULL; + pTmpName = nullptr; + pFont = nullptr; + pHeight = nullptr; + pColor = nullptr; nType = -1; } inline ~ENTRY() diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 766193710810..7312d26d4ef4 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -63,7 +63,7 @@ public: /** Returns the text data of this portion. */ inline const OUString& getText() const { return maText; } /** Returns true, if the portion contains font formatting. */ - inline bool hasFont() const { return mxFont.get() != 0; } + inline bool hasFont() const { return mxFont.get() != nullptr; } /** Converts the portion and replaces or appends to the passed XText. */ void convert( @@ -248,7 +248,7 @@ public: if there is only one unformatted portion. */ bool extractPlainString( OUString& orString, - const oox::xls::Font* pFirstPortionFont = 0 ) const; + const oox::xls::Font* pFirstPortionFont = nullptr ) const; /** Converts the string and writes it into the passed XText. @param rxText The XText interface of the target object. @@ -258,7 +258,7 @@ public: void convert( const css::uno::Reference< css::text::XText >& rxText, bool bReplaceOld, - const oox::xls::Font* pFirstPortionFont = 0 ) const; + const oox::xls::Font* pFirstPortionFont = nullptr ) const; ::EditTextObject* convert( ScEditEngineDefaulter& rEE, const oox::xls::Font* pFont ) const; private: diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 9e0457fd6b58..216dc4f41e52 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -467,7 +467,7 @@ struct Sc10ColAttr Sc10ColAttr() : Count(0) - , pData(NULL) + , pData(nullptr) { } ~Sc10ColAttr() { delete [] pData; } diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index a1d2aea4e9d6..b14007958c23 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -824,25 +824,25 @@ public: /** Creates a new empty font object. @param opnFontId (out-param) The identifier of the new font object. */ - FontRef createFont( sal_Int32* opnFontId = 0 ); + FontRef createFont( sal_Int32* opnFontId = nullptr ); /** Creates a number format. */ NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const OUString& rFmtCode ); sal_Int32 nextFreeNumFmtId(); /** Creates a new empty border object. @param opnBorderId (out-param) The identifier of the new border object. */ - BorderRef createBorder( sal_Int32* opnBorderId = 0 ); + BorderRef createBorder( sal_Int32* opnBorderId = nullptr ); /** Creates a new empty fill object. @param opnFillId (out-param) The identifier of the new fill object. */ - FillRef createFill( sal_Int32* opnFillId = 0 ); + FillRef createFill( sal_Int32* opnFillId = nullptr ); /** Creates a new empty cell formatting object. @param opnXfId (out-param) The identifier of the new XF object. */ - XfRef createCellXf( sal_Int32* opnXfId = 0 ); + XfRef createCellXf( sal_Int32* opnXfId = nullptr ); /** Creates a new empty style formatting object. @param opnXfId (out-param) The identifier of the new XF object. */ - XfRef createStyleXf( sal_Int32* opnXfId = 0 ); + XfRef createStyleXf( sal_Int32* opnXfId = nullptr ); /** Creates a new empty differential formatting object. @param opnDxfId (out-param) The identifier of the new DXF object. */ - DxfRef createDxf( sal_Int32* opnDxfId = 0 ); + DxfRef createDxf( sal_Int32* opnDxfId = nullptr ); /** Appends a new color to the color palette. */ void importPaletteColor( const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 3c02a9500ad0..a3895c7c5efc 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -69,7 +69,7 @@ public: const XclExpRoot& rRoot, XclExpObjectManager& rObjMgr, SvStream& rStrm, - const XclEscherEx* pParent = 0 ); + const XclEscherEx* pParent = nullptr ); virtual ~XclEscherEx(); /** Called by MSODRAWING record constructors to initialize the DFF stream diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 6d34a3410aa5..9f23f9cfc627 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -42,7 +42,7 @@ public: ///! count>=0xFFFF: Obj will be deleted, return 0 sal_uInt16 Add( XclObj* ); - XclObj* back () { return maObjs.empty() ? NULL : maObjs.back(); } + XclObj* back () { return maObjs.empty() ? nullptr : maObjs.back(); } /** * diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 001666a9c63a..3292a24097a7 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -496,7 +496,7 @@ public: virtual void SetRotation( sal_uInt16 nRotation ) override; /** Converts all text settings of the passed title text object. */ - void ConvertTitle( css::uno::Reference< css::chart2::XTitle > xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = NULL ); + void ConvertTitle( css::uno::Reference< css::chart2::XTitle > xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = nullptr ); /** Converts all text settings of the passed legend. */ void ConvertLegend( const ScfPropertySet& rPropSet ); /** Converts all settings of the passed data point caption text object. */ diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index e735b0fe6d80..ba1ff9500e77 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -104,7 +104,7 @@ public: virtual ~XclExpHyperlink(); /** Returns the cell representation text or 0, if not available. */ - inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? 0 : &m_Repr; } + inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? nullptr : &m_Repr; } virtual void SaveXml( XclExpXmlStream& rStrm ) override; diff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx index f42d2b4c6397..4c3839fb3371 100644 --- a/sc/source/filter/inc/xeformula.hxx +++ b/sc/source/filter/inc/xeformula.hxx @@ -56,7 +56,7 @@ public: /** Creates and returns the token array of a formula. */ XclTokenArrayRef CreateFormula( XclFormulaType eType, const ScTokenArray& rScTokArr, - const ScAddress* pScBasePos = 0, XclExpRefLog* pRefLog = 0 ); + const ScAddress* pScBasePos = nullptr, XclExpRefLog* pRefLog = nullptr ); /** Creates and returns a token array containing a single cell address. */ XclTokenArrayRef CreateFormula( XclFormulaType eType, const ScAddress& rScPos ); diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index a55cae54da2f..af40492984d7 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -398,7 +398,7 @@ class XclExpUrlHelper : boost::noncopyable public: /** Encodes and returns the URL passed in rAbsUrl to an Excel like URL. @param pTableName Optional pointer to a table name to be encoded in this URL. */ - static OUString EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName = 0 ); + static OUString EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName = nullptr ); /** Encodes and returns the passed DDE link to an Excel like DDE link. */ static OUString EncodeDde( const OUString& rApplic, const OUString& rTopic ); diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index 9112a9c7192a..b269e29e43a5 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -145,7 +145,7 @@ public: param pRefLogEntry If not 0, data about the external link is stored here. */ void FindExtSheet( sal_uInt16& rnExtSheet, sal_uInt16& rnXclTab, SCTAB nScTab, - XclExpRefLogEntry* pRefLogEntry = 0 ); + XclExpRefLogEntry* pRefLogEntry = nullptr ); /** Searches for an EXTERNSHEET index for the given Calc sheet range. @descr See above for the meaning of EXTERNSHEET indexes. @param rnExtSheet (out-param) Returns the EXTERNSHEET index. @@ -157,13 +157,13 @@ public: void FindExtSheet( sal_uInt16& rnExtSheet, sal_uInt16& rnFirstXclTab, sal_uInt16& rnLastXclTab, SCTAB nFirstScTab, SCTAB nLastScTab, - XclExpRefLogEntry* pRefLogEntry = 0 ); + XclExpRefLogEntry* pRefLogEntry = nullptr ); /** Searches for a special EXTERNSHEET index for the own document. */ sal_uInt16 FindExtSheet( sal_Unicode cCode ); void FindExtSheet( sal_uInt16 nFileId, const OUString& rTabName, sal_uInt16 nXclTabSpan, sal_uInt16& rnExtSheet, sal_uInt16& rnFirstSBTab, sal_uInt16& rnLastSBTab, - XclExpRefLogEntry* pRefLogEntry = NULL ); + XclExpRefLogEntry* pRefLogEntry = nullptr ); /** Stores the cell with the given address in a CRN record list. */ void StoreCell( const ScSingleRefData& rRef, const ScAddress& rPos ); diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index a13a39650f75..dd10a6fa1533 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -233,7 +233,7 @@ private: // `s.GetChar(0) != 0` needed because some strings on export only contain NULL. #define XESTRING_TO_PSZ(s) \ - (s.Len() && s.GetChar( 0 ) != 0 ? XclXmlUtils::ToOString( s ).getStr() : NULL) + (s.Len() && s.GetChar( 0 ) != 0 ? XclXmlUtils::ToOString( s ).getStr() : nullptr) class ScAddress; class ScDocShell; @@ -317,7 +317,7 @@ public: const css::uno::Reference< css::io::XOutputStream >& xParentRelation, const char* sContentType, const char* sRelationshipType, - OUString* pRelationshipId = NULL ); + OUString* pRelationshipId = nullptr ); // ignore virtual bool exportDocument() diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index dd012cf090f4..f06f6f80bb92 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -158,7 +158,7 @@ public: void ConvertFont( ScfPropertySet& rPropSet, sal_uInt16 nFontIdx, - const Color* pFontColor = 0 ) const; + const Color* pFontColor = nullptr ) const; /** Writes the pie rotation property for the passed angle. */ static void ConvertPieRotation( diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 85536e6a6a3a..eb27f388ea7d 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -466,7 +466,7 @@ public: virtual ~XclImpControlHelper(); /** Returns true, if a linked cell address is present. */ - inline bool HasCellLink() const { return mxCellLink != 0; } + inline bool HasCellLink() const { return mxCellLink != nullptr; } /** Returns the SdrObject from the passed control shape and sets the bounding rectangle. */ SdrObjectPtr CreateSdrObjectFromShape( @@ -891,7 +891,7 @@ public: private: /** Updates the data of a connected shape in a connector rule. */ - void UpdateConnection( sal_uInt32 nDffShapeId, SdrObject*& rpSdrObj, sal_uInt32* pnDffFlags = 0 ); + void UpdateConnection( sal_uInt32 nDffShapeId, SdrObject*& rpSdrObj, sal_uInt32* pnDffFlags = nullptr ); private: /** Stores data about an SdrObject processed during import. */ @@ -899,7 +899,7 @@ private: { SdrObject* mpSdrObj; /// Pointer to an SdrObject. sal_uInt32 mnDffFlags; /// Shape flags from DFF stream. - inline explicit XclImpSdrInfo() : mpSdrObj( 0 ), mnDffFlags( 0 ) {} + inline explicit XclImpSdrInfo() : mpSdrObj( nullptr ), mnDffFlags( 0 ) {} inline void Set( SdrObject* pSdrObj, sal_uInt32 nDffFlags ) { mpSdrObj = pSdrObj; mnDffFlags = nDffFlags; } }; @@ -978,7 +978,7 @@ private: DffObjData& rDffObjData, void* pClientData, Rectangle& rTextRect, - SdrObject* pOldSdrObj = 0 ) override; + SdrObject* pOldSdrObj = nullptr ) override; // virtual functions of SvxMSConvertOCXControls diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index 4da2a7025063..6bdbbfc163a9 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -194,7 +194,7 @@ public: /** Reads a CRN record and appends it to the current SUPBOOK. */ void ReadCrn( XclImpStream& rStrm ); /** Reads an EXTERNNAME record and appends it to the current SUPBOOK. */ - void ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv = NULL ); + void ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv = nullptr ); /** Returns true, if the specified XTI entry contains an internal reference. */ bool IsSelfRef( sal_uInt16 nXtiIndex ) const; diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index f4dc557c9c32..d0e8771f8204 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -117,7 +117,7 @@ public: /** Writes all font properties to the passed property set. @param pFontColor If set, overrides internal stored font color. */ void WriteFontProperties( ScfPropertySet& rPropSet, - XclFontPropSetType eType, const Color* pFontColor = 0 ) const; + XclFontPropSetType eType, const Color* pFontColor = nullptr ) const; private: /** Reads and sets height and flags. */ @@ -185,7 +185,7 @@ public: @param pFontColor If set, overrides internal stored font color. */ void WriteFontProperties( ScfPropertySet& rPropSet, XclFontPropSetType eType, - sal_uInt16 nFontIdx, const Color* pFontColor = 0 ) const; + sal_uInt16 nFontIdx, const Color* pFontColor = nullptr ) const; /** Writes default font properties for form controls to the passed property set. */ void WriteDefaultCtrlFontProperties( ScfPropertySet& rPropSet ) const; @@ -488,10 +488,10 @@ public: /** Returns the object that stores all contents of an XF record. */ inline XclImpXF* GetXF( sal_uInt16 nXFIndex ) - { return (nXFIndex >= maXFList.size()) ? NULL : &maXFList.at(nXFIndex); } + { return (nXFIndex >= maXFList.size()) ? nullptr : &maXFList.at(nXFIndex); } inline const XclImpXF* GetXF( sal_uInt16 nXFIndex ) const - { return (nXFIndex >= maXFList.size()) ? NULL : &maXFList.at(nXFIndex); } + { return (nXFIndex >= maXFList.size()) ? nullptr : &maXFList.at(nXFIndex); } /** Returns the index to the Excel font used in the specified XF record. */ sal_uInt16 GetFontIndex( sal_uInt16 nXFIndex ) const; diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index 9efb0697cc95..f235cf9fa7fd 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -428,11 +428,11 @@ public: css::script::ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, const OUString& rXclMacroName, - SfxObjectShell* pDocShell = 0 ); + SfxObjectShell* pDocShell = nullptr ); /** Tries to extract an Excel macro name from the passed macro descriptor. */ static OUString ExtractFromMacroDescriptor( const css::script::ScriptEventDescriptor& rDescriptor, - XclTbxEventType eEventType, SfxObjectShell* pShell = NULL ); + XclTbxEventType eEventType, SfxObjectShell* pShell = nullptr ); }; #endif diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index 4283ad16b17d..a5e9f9516b57 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -330,9 +330,9 @@ struct XclFunctionInfo /** Returns true, if the function parameter count is fixed. */ inline bool IsFixedParamCount() const { return (mnXclFunc != EXC_FUNCID_EXTERNCALL) && (mnMinParamCount == mnMaxParamCount); } /** Returns true, if the function is simulated by a macro call. */ - inline bool IsMacroFunc() const { return mpcMacroName != 0 && !(mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } + inline bool IsMacroFunc() const { return mpcMacroName != nullptr && !(mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } /** Returns true, if the function is stored as an add-in call. */ - inline bool IsAddInEquivalent() const { return mpcMacroName != 0 && (mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } + inline bool IsAddInEquivalent() const { return mpcMacroName != nullptr && (mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } /** Returns the name of the external function as string. */ OUString GetMacroFuncName() const; /** Returns the programmatical name of the Add-In function as string. */ @@ -387,7 +387,7 @@ public: /** Returns the size of the token array in bytes. */ sal_uInt16 GetSize() const; /** Returns read-only access to the byte vector storing token data. */ - inline const sal_uInt8* GetData() const { return maTokVec.empty() ? 0 : &maTokVec.front(); } + inline const sal_uInt8* GetData() const { return maTokVec.empty() ? nullptr : &maTokVec.front(); } /** Returns true, if the formula contains a volatile function. */ inline bool IsVolatile() const { return mbVolatile; } @@ -446,9 +446,9 @@ public: void Init( const ScTokenArray& rScTokArr, bool bSkipSpaces ); - inline bool Is() const { return mppScToken != 0; } + inline bool Is() const { return mppScToken != nullptr; } inline bool operator!() const { return !Is(); } - inline const ::formula::FormulaToken* Get() const { return mppScToken ? *mppScToken : 0; } + inline const ::formula::FormulaToken* Get() const { return mppScToken ? *mppScToken : nullptr; } inline const ::formula::FormulaToken* operator->() const { return Get(); } inline const ::formula::FormulaToken& operator*() const { return *Get(); } diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index f861cecd9bb7..73e332837b98 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -421,7 +421,7 @@ public: ScfPropertySet& rPropSet, XclFontPropSetType eType, const XclFontData& rFontData, bool bHasWstrn, bool bHasAsian, bool bHasCmplx, - const Color* pFontColor = 0 ); + const Color* pFontColor = nullptr ); private: /** Returns a chart property set helper according to the passed script type. */ diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 4a067cfad69a..67c8f3ca4966 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -195,7 +195,7 @@ public: /** Returns true, if the passed string is a name of an Excel built-in style. @param pnStyleId If not 0, the found style identifier will be returned here. @param pnNextChar If not 0, the index of the char after the evaluated substring will be returned here. */ - static bool IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyleId = 0, sal_Int32* pnNextChar = 0 ); + static bool IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyleId = nullptr, sal_Int32* pnNextChar = nullptr ); /** Returns the Excel built-in style identifier of a passed style name. @param rnStyleId The style identifier is returned here. @param rnLevel The zero-based outline level for RowLevel and ColLevel styles is returned here. @@ -225,7 +225,7 @@ public: // Basic macro names ------------------------------------------------------ /** Returns the full StarBasic macro URL from an Excel macro name. */ - static OUString GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell = 0 ); + static OUString GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell = nullptr ); /** Returns the Excel macro name from a full StarBasic macro URL. */ static OUString GetXclMacroName( const OUString& rSbMacroUrl ); |