summaryrefslogtreecommitdiff
path: root/include/filter
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:15:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:25 +0100
commit3cdda9af2c12a9ae2a1f0bdf8ca898f1f5c69bfb (patch)
treeba25525cbc9661509d8f01e93164e0febb8a0894 /include/filter
parent7702e3128768f1b4b8a1ee9e87e397887e151af4 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I61e494952df8cc40fff3ccad0936adf06035dbeb
Diffstat (limited to 'include/filter')
-rw-r--r--include/filter/msfilter/escherex.hxx22
-rw-r--r--include/filter/msfilter/msdffimp.hxx30
-rw-r--r--include/filter/msfilter/msvbahelper.hxx2
-rw-r--r--include/filter/msfilter/rtfutil.hxx2
-rw-r--r--include/filter/msfilter/svdfppt.hxx20
5 files changed, 38 insertions, 38 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 852202b5817d..78210d97552e 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -668,7 +668,7 @@ public:
sal_uInt32 nPictureOffset,
const GraphicObject& rObj,
const OString& rId,
- const GraphicAttr* pAttr = NULL
+ const GraphicAttr* pAttr = nullptr
);
~EscherBlibEntry();
@@ -700,16 +700,16 @@ protected:
public:
- sal_uInt32 GetBlibStoreContainerSize( SvStream* pMergePicStreamBSE = NULL ) const;
- void WriteBlibStoreContainer( SvStream& rStrm, SvStream* pMergePicStreamBSE = NULL );
+ sal_uInt32 GetBlibStoreContainerSize( SvStream* pMergePicStreamBSE = nullptr ) const;
+ void WriteBlibStoreContainer( SvStream& rStrm, SvStream* pMergePicStreamBSE = nullptr );
bool WriteBlibStoreEntry(SvStream& rStrm, sal_uInt32 nBlipId,
bool bWritePictureOffset, sal_uInt32 nResize = 0);
sal_uInt32 GetBlibID(
SvStream& rPicOutStream,
const OString& rGraphicId,
const Rectangle& rBoundRect,
- const css::awt::Rectangle* pVisArea = NULL,
- const GraphicAttr* pGrafikAttr = NULL,
+ const css::awt::Rectangle* pVisArea = nullptr,
+ const GraphicAttr* pGrafikAttr = nullptr,
const bool ooxmlExport = false
);
bool HasGraphics() const { return mnBlibEntrys != 0; };
@@ -885,7 +885,7 @@ public:
sal_uInt32 nFlags,
bool bBezier,
css::awt::Rectangle& rGeoRect,
- tools::Polygon* pPolygon = NULL
+ tools::Polygon* pPolygon = nullptr
);
static sal_uInt32 GetGradientColor(
@@ -1046,8 +1046,8 @@ private:
bool bDontWriteShape;
public:
- EscherExHostAppData() : pClientAnchor(0), pClientData(0),
- pClientTextbox(0), pInteractionInfo(0), bDontWriteShape(false)
+ EscherExHostAppData() : pClientAnchor(nullptr), pClientData(nullptr),
+ pClientTextbox(nullptr), pInteractionInfo(nullptr), bDontWriteShape(false)
{}
void SetInteractionInfo( InteractionInfo* p )
@@ -1215,7 +1215,7 @@ public:
/// If pPicStreamMergeBSE is known, the BLIPs from this stream are being
/// merged into the MsofbtBSE Records of the EscherStream like it's
/// required for Excel (and maybe Word?)
- void Flush( SvStream* pPicStreamMergeBSE = NULL );
+ void Flush( SvStream* pPicStreamMergeBSE = nullptr );
/** Inserts the passed number of bytes at the current position of the
output stream.
@@ -1264,8 +1264,8 @@ public:
void AddChildAnchor( const Rectangle& rRectangle );
void AddClientAnchor( const Rectangle& rRectangle );
- virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 );
- sal_uInt32 EnterGroup( const Rectangle* pBoundRect = NULL );
+ virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = nullptr );
+ sal_uInt32 EnterGroup( const Rectangle* pBoundRect = nullptr );
sal_uInt32 GetGroupLevel() const { return mnGroupLevel; };
bool SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect );
bool SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect );
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 2a9a644c3bb8..6578a458e440 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -176,9 +176,9 @@ struct SvxMSDffConnectorRule
, ncptiB(0)
, nSpFlagsA( 0 )
, nSpFlagsB( 0 )
- , pAObj( NULL )
- , pBObj( NULL )
- , pCObj( NULL )
+ , pAObj( nullptr )
+ , pBObj( nullptr )
+ , pCObj( nullptr )
{};
};
@@ -487,7 +487,7 @@ protected:
DffObjData& rData,
void* pData,
Rectangle& rTextRect,
- SdrObject* pObj = NULL);
+ SdrObject* pObj = nullptr);
virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const;
// Fontwork objects use a new implementation of ReadObjText because the old
@@ -527,12 +527,12 @@ public:
static bool SeekToRec( SvStream& rSt,
sal_uInt16 nRecId,
sal_uLong nMaxFilePos,
- DffRecordHeader* pRecHd = NULL,
+ DffRecordHeader* pRecHd = nullptr,
sal_uLong nSkipCount = 0 );
bool SeekToRec2( sal_uInt16 nRecId1,
sal_uInt16 nRecId2,
sal_uLong nMaxFilePos,
- DffRecordHeader* pRecHd = NULL,
+ DffRecordHeader* pRecHd = nullptr,
sal_uLong nSkipCount = 0 ) const;
static OUString MSDFFReadZString( SvStream& rIn,
@@ -571,10 +571,10 @@ public:
const OUString& rBaseURL,
sal_uInt32 nOffsDgg,
SvStream* pStData,
- SdrModel* pSdrModel_ = 0,
+ SdrModel* pSdrModel_ = nullptr,
long nApplicationScale = 0,
ColorData mnDefaultColor_ = COL_DEFAULT,
- SvStream* pStData2_ = 0,
+ SvStream* pStData2_ = nullptr,
bool bSkipImages = false );
// in PPT the parameters DGGContainerOffset and PicStream are provided by an
@@ -616,7 +616,7 @@ public:
@return true if successful, false otherwise
*/
- bool GetBLIP( sal_uLong nIdx, Graphic& rData, Rectangle* pVisArea = NULL );
+ bool GetBLIP( sal_uLong nIdx, Graphic& rData, Rectangle* pVisArea = nullptr );
// TODO: provide proper documentation here
/** read a BLIP out of a already positioned stream
@@ -628,7 +628,7 @@ public:
@return true if successful, false otherwise
*/
- static bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = NULL );
+ static bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = nullptr );
bool GetShape(sal_uLong nId, SdrObject*& rpData, SvxMSDffImportData& rData);
@@ -637,21 +637,21 @@ public:
Rectangle& rClientRect,
const Rectangle& rGlobalChildRect,
int nCalledByGroup = 0,
- sal_Int32* pShapeId = NULL);
+ sal_Int32* pShapeId = nullptr);
SdrObject* ImportGroup( const DffRecordHeader& rHd,
SvStream& rSt,
void* pData,
Rectangle& rClientRect,
const Rectangle& rGlobalChildRect,
int nCalledByGroup = 0,
- sal_Int32* pShapeId = NULL );
+ sal_Int32* pShapeId = nullptr );
SdrObject* ImportShape( const DffRecordHeader& rHd,
SvStream& rSt,
void* pData,
Rectangle& rClientRect,
const Rectangle& rGlobalChildRect,
int nCalledByGroup = 0,
- sal_Int32* pShapeId = NULL);
+ sal_Int32* pShapeId = nullptr);
Rectangle GetGlobalChildAnchor( const DffRecordHeader& rHd,
SvStream& rSt,
@@ -672,7 +672,7 @@ public:
void StoreShapeOrder(sal_uLong nId,
sal_uLong nTxBx,
SdrObject* pObject,
- SwFlyFrameFormat* pFly = 0,
+ SwFlyFrameFormat* pFly = nullptr,
short nHdFtSection = 0) const;
void ExchangeInShapeOrder(SdrObject* pOldObject,
@@ -755,7 +755,7 @@ struct SvxMSDffShapeOrder
// the shape order array. The Text-Box number and the object
// pointer are only stored if the shape is really imported.
explicit SvxMSDffShapeOrder( sal_uLong nId ):
- nShapeId( nId ), nTxBxComp( 0 ), pFly( 0 ), nHdFtSection( 0 ), pObj( 0 ){}
+ nShapeId( nId ), nTxBxComp( 0 ), pFly( nullptr ), nHdFtSection( 0 ), pObj( nullptr ){}
bool operator==( const SvxMSDffShapeOrder& rEntry ) const
{ return (nTxBxComp == rEntry.nTxBxComp); }
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index fe380bbfd3d3..acd6e593460a 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -38,7 +38,7 @@ struct MSFILTER_DLLPUBLIC MacroResolvedInfo
OUString msResolvedMacro;
bool mbFound;
- inline explicit MacroResolvedInfo( SfxObjectShell* pDocContext = 0 ) : mpDocContext( pDocContext ), mbFound( false ) {}
+ inline explicit MacroResolvedInfo( SfxObjectShell* pDocContext = nullptr ) : mpDocContext( pDocContext ), mbFound( false ) {}
};
MSFILTER_DLLPUBLIC OUString makeMacroURL( const OUString& sMacroName );
diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx
index b9a1de290b09..4628287d8c12 100644
--- a/include/filter/msfilter/rtfutil.hxx
+++ b/include/filter/msfilter/rtfutil.hxx
@@ -23,7 +23,7 @@ namespace rtfutil {
MSFILTER_DLLPUBLIC OString OutHex(sal_uLong nHex, sal_uInt8 nLen);
/// Handles correct unicode and legacy export of a single character.
-MSFILTER_DLLPUBLIC OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc, bool* pSuccess = 0, bool bUnicode = true);
+MSFILTER_DLLPUBLIC OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc, bool* pSuccess = nullptr, bool bUnicode = true);
/**
* Handles correct unicode and legacy export of a string.
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 793b80e67715..710eee35c0a6 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -490,7 +490,7 @@ struct MSFILTER_DLLPUBLIC PPTFieldEntry
SvxFieldItem* pField2;
OUString* pString;
- PPTFieldEntry() : nPos( 0 ), nTextRangeEnd( 0 ), pField1( NULL ), pField2( NULL ), pString( NULL ) {};
+ PPTFieldEntry() : nPos( 0 ), nTextRangeEnd( 0 ), pField1( nullptr ), pField2( nullptr ), pString( nullptr ) {};
~PPTFieldEntry();
void SetDateTime( sal_uInt32 nType );
@@ -515,7 +515,7 @@ struct MSFILTER_DLLPUBLIC HeaderFooterEntry
const PptSlidePersistEntry& rSlidePersist
);
- explicit HeaderFooterEntry( const PptSlidePersistEntry* pMaster = NULL );
+ explicit HeaderFooterEntry( const PptSlidePersistEntry* pMaster = nullptr );
~HeaderFooterEntry();
};
@@ -529,7 +529,7 @@ struct ProcessData
ProcessData( PptSlidePersistEntry& rP, SdPageCapsule pP ) :
rPersistEntry ( rP ),
pPage ( pP ),
- pTableRowProperties ( NULL ) {};
+ pTableRowProperties ( nullptr ) {};
~ProcessData() { delete[] pTableRowProperties; };
};
@@ -569,8 +569,8 @@ protected:
protected:
using SdrEscherImport::ReadObjText;
- bool SeekToAktPage(DffRecordHeader* pRecHd=NULL) const;
- bool SeekToDocument(DffRecordHeader* pRecHd=NULL) const;
+ bool SeekToAktPage(DffRecordHeader* pRecHd=nullptr) const;
+ bool SeekToDocument(DffRecordHeader* pRecHd=nullptr) const;
static bool SeekToContentOfProgTag(
sal_Int32 nVersion,
SvStream& rSt,
@@ -629,7 +629,7 @@ public:
PptPageKind ePageKind = PPT_SLIDEPAGE
) const;
- void ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL );
+ void ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = nullptr );
virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const override;
virtual bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const override;
virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const override;
@@ -689,7 +689,7 @@ struct PPTTextSpecInfoAtomInterpreter
SvStream& rIn,
const DffRecordHeader& rRecHd,
sal_uInt16 nRecordType,
- const PPTTextSpecInfo* pTextSpecDefault = NULL
+ const PPTTextSpecInfo* pTextSpecDefault = nullptr
);
};
@@ -1234,13 +1234,13 @@ struct ImplPPTTextObj
: mnRefCount(0)
, mnShapeId(0)
, mnShapeMaster(0)
- , mpPlaceHolderAtom(NULL)
+ , mpPlaceHolderAtom(nullptr)
, mnInstance(0)
, mnDestinationInstance(0)
, meShapeType(mso_sptMin)
, mnCurrentObject(0)
, mnParagraphCount(0)
- , mpParagraphList(NULL)
+ , mpParagraphList(nullptr)
, mrPersistEntry ( rPersistEntry )
, mnTextFlags(0) {};
};
@@ -1309,7 +1309,7 @@ public:
{};
bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1,
css::uno::Reference<
- css::drawing::XShape > *pShapeRef=0,
+ css::drawing::XShape > *pShapeRef=nullptr,
bool bFloatingCtrl=false );
virtual bool InsertControl(
const css::uno::Reference< css::form::XFormComponent > &rFComp,