summaryrefslogtreecommitdiff
path: root/svx/source/xoutdev
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/xoutdev')
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx4
-rw-r--r--svx/source/xoutdev/_xpoly.cxx14
-rw-r--r--svx/source/xoutdev/xattr.cxx32
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx8
-rw-r--r--svx/source/xoutdev/xexch.cxx8
-rw-r--r--svx/source/xoutdev/xpool.cxx6
-rw-r--r--svx/source/xoutdev/xtabdash.cxx2
-rw-r--r--svx/source/xoutdev/xtable.cxx12
8 files changed, 43 insertions, 43 deletions
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index e9f042ccb02b..e445b0954c26 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -38,7 +38,7 @@
#define FORMAT_JPG "jpg"
#define FORMAT_PNG "png"
-GraphicFilter* XOutBitmap::pGrfFilter = NULL;
+GraphicFilter* XOutBitmap::pGrfFilter = nullptr;
Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, bool bHMirr, bool bVMirr )
{
@@ -383,7 +383,7 @@ sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObje
nRet = rFilter.ExportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pOStm, nFormat, pFilterData );
- pGrfFilter = NULL;
+ pGrfFilter = nullptr;
aMedium.Commit();
if( aMedium.GetError() && ( GRFILTER_OK == nRet ) )
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index cea38481999f..464a58fdf6e4 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -35,9 +35,9 @@
ImpXPolygon::ImpXPolygon(sal_uInt16 nInitSize, sal_uInt16 _nResize)
- : pPointAry(NULL)
- , pFlagAry(NULL)
- , pOldPointAry(NULL)
+ : pPointAry(nullptr)
+ , pFlagAry(nullptr)
+ , pOldPointAry(nullptr)
, bDeleteOldPoints(false)
, nSize(0)
, nResize(_nResize)
@@ -48,9 +48,9 @@ ImpXPolygon::ImpXPolygon(sal_uInt16 nInitSize, sal_uInt16 _nResize)
}
ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly )
- : pPointAry(NULL)
- , pFlagAry(NULL)
- , pOldPointAry(NULL)
+ : pPointAry(nullptr)
+ , pFlagAry(nullptr)
+ , pOldPointAry(nullptr)
, bDeleteOldPoints(false)
, nSize(0)
, nResize(rImpXPoly.nResize)
@@ -861,7 +861,7 @@ basegfx::B2DPolygon XPolygon::getB2DPolygon() const
// #i74631# use tools Polygon class for conversion to not have the code doubled
// here. This needs one more conversion but avoids different convertors in
// the long run
- DBG_ASSERT(pImpXPolygon != 0, "XPolygon::getB2DPolygon(): XPolygon has no implementation incarnated (!)");
+ DBG_ASSERT(pImpXPolygon != nullptr, "XPolygon::getB2DPolygon(): XPolygon has no implementation incarnated (!)");
const tools::Polygon aSource(GetPointCount(), pImpXPolygon->pPointAry, pImpXPolygon->pFlagAry);
return aSource.getB2DPolygon();
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index eaa7d8cb4851..5d08e1e54ca3 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1002,7 +1002,7 @@ XLineDashItem* XLineDashItem::checkForUniqueItem( SdrModel* pModel ) const
{
const OUString aUniqueName = NameOrIndex::CheckNamedItem(
this, XATTR_LINEDASH, &pModel->GetItemPool(),
- pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL,
+ pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr,
XLineDashItem::CompareValueFunc, RID_SVXSTR_DASH11,
pModel->GetPropertyList( XDASH_LIST ) );
@@ -1011,7 +1011,7 @@ XLineDashItem* XLineDashItem::checkForUniqueItem( SdrModel* pModel ) const
return new XLineDashItem( aUniqueName, aDash );
}
- return NULL;
+ return nullptr;
}
TYPEINIT1_AUTOFACTORY(XLineWidthItem, SfxMetricItem);
@@ -1350,7 +1350,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
{
if( pModel )
{
- XLineStartItem* pTempItem = NULL;
+ XLineStartItem* pTempItem = nullptr;
const XLineStartItem* pLineStartItem = this;
OUString aUniqueName( GetName() );
@@ -1359,7 +1359,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
{
// if the polygon is empty, check if the name is empty
if( aUniqueName.isEmpty() )
- return NULL;
+ return nullptr;
// force empty name for empty polygons
return new XLineStartItem( "", maPolyPolygon );
@@ -1432,7 +1432,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
}
}
- const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL;
+ const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr;
if( !aUniqueName.isEmpty() && pPool2)
{
nCount = pPool2->GetItemCount2( XATTR_LINESTART );
@@ -1561,7 +1561,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
}
}
- return NULL;
+ return nullptr;
}
TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex);
@@ -1633,7 +1633,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
{
if( pModel )
{
- XLineEndItem* pTempItem = NULL;
+ XLineEndItem* pTempItem = nullptr;
const XLineEndItem* pLineEndItem = this;
OUString aUniqueName( GetName() );
@@ -1642,7 +1642,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
{
// if the polygon is empty, check if the name is empty
if( aUniqueName.isEmpty() )
- return NULL;
+ return nullptr;
// force empty name for empty polygons
return new XLineEndItem( "", maPolyPolygon );
@@ -1715,7 +1715,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
}
}
- const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL;
+ const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr;
if( !aUniqueName.isEmpty() && pPool2)
{
nCount = pPool2->GetItemCount2( XATTR_LINESTART );
@@ -1844,7 +1844,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
}
}
- return NULL;
+ return nullptr;
}
bool XLineEndItem::GetPresentation
@@ -2736,7 +2736,7 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con
{
const OUString aUniqueName = NameOrIndex::CheckNamedItem(
this, Which(), &pModel->GetItemPool(),
- pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL,
+ pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr,
XFillGradientItem::CompareValueFunc, RID_SVXSTR_GRADIENT,
pModel->GetPropertyList( XGRADIENT_LIST ) );
@@ -2745,7 +2745,7 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con
return new XFillGradientItem( aUniqueName, aGradient, Which() );
}
- return NULL;
+ return nullptr;
}
TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem );
@@ -2830,7 +2830,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
const OUString aUniqueName = NameOrIndex::CheckNamedItem( this,
XATTR_FILLFLOATTRANSPARENCE,
&pModel->GetItemPool(),
- pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL,
+ pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr,
XFillFloatTransparenceItem::CompareValueFunc,
RID_SVXSTR_TRASNGR0,
XPropertyListRef() );
@@ -2851,7 +2851,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
}
}
- return NULL;
+ return nullptr;
}
XHatch::XHatch(const Color& rCol, css::drawing::HatchStyle eTheStyle, long nTheDistance,
@@ -3142,7 +3142,7 @@ XFillHatchItem* XFillHatchItem::checkForUniqueItem( SdrModel* pModel ) const
{
const OUString aUniqueName = NameOrIndex::CheckNamedItem(
this, XATTR_FILLHATCH, &pModel->GetItemPool(),
- pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL,
+ pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr,
XFillHatchItem::CompareValueFunc, RID_SVXSTR_HATCH10,
pModel->GetPropertyList( XHATCH_LIST ) );
@@ -3151,7 +3151,7 @@ XFillHatchItem* XFillHatchItem::checkForUniqueItem( SdrModel* pModel ) const
return new XFillHatchItem( aUniqueName, aHatch );
}
- return NULL;
+ return nullptr;
}
// --- form text attributes ---
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 1393104867c1..ac6c003f18b7 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -47,13 +47,13 @@ using namespace ::com::sun::star;
XOBitmap::XOBitmap( const Bitmap& rBmp ) :
eType ( XBITMAP_IMPORT ),
aGraphicObject ( rBmp ),
- pPixelArray ( NULL ),
+ pPixelArray ( nullptr ),
bGraphicDirty ( false )
{
}
XOBitmap::XOBitmap( const XOBitmap& rXBmp ) :
- pPixelArray ( NULL )
+ pPixelArray ( nullptr )
{
eType = rXBmp.eType;
aGraphicObject = rXBmp.aGraphicObject;
@@ -542,7 +542,7 @@ XFillBitmapItem* XFillBitmapItem::checkForUniqueItem( SdrModel* pModel ) const
{
const OUString aUniqueName = NameOrIndex::CheckNamedItem(
this, XATTR_FILLBITMAP, &pModel->GetItemPool(),
- pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL,
+ pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr,
XFillBitmapItem::CompareValueFunc, RID_SVXSTR_BMP21,
pModel->GetPropertyList( XBITMAP_LIST ) );
@@ -553,7 +553,7 @@ XFillBitmapItem* XFillBitmapItem::checkForUniqueItem( SdrModel* pModel ) const
}
}
- return NULL;
+ return nullptr;
}
void XFillBitmapItem::dumpAsXml(xmlTextWriterPtr pWriter) const
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 7e618275d83f..2993c5bc4395 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -32,8 +32,8 @@
/// default CTOR, for Assign()
XFillExchangeData::XFillExchangeData() :
- pXFillAttrSetItem( NULL ),
- pPool( NULL )
+ pXFillAttrSetItem( nullptr ),
+ pPool( nullptr )
{
}
@@ -132,8 +132,8 @@ XFillExchangeData& XFillExchangeData::operator=( const XFillExchangeData& rData
pXFillAttrSetItem = static_cast<XFillAttrSetItem*>( rData.pXFillAttrSetItem->Clone( pPool = rData.pXFillAttrSetItem->GetItemSet().GetPool() ) );
else
{
- pPool = NULL;
- pXFillAttrSetItem = NULL;
+ pPool = nullptr;
+ pXFillAttrSetItem = nullptr;
}
return( *this );
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 1cbaff05599e..dc1085e8b4dc 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -29,7 +29,7 @@ XOutdevItemPool::XOutdevItemPool(
sal_uInt16 nAttrStart,
sal_uInt16 nAttrEnd,
bool bLoadRefCounts)
-: SfxItemPool("XOutdevItemPool", nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts)
+: SfxItemPool("XOutdevItemPool", nAttrStart, nAttrEnd, nullptr, nullptr, bLoadRefCounts)
{
// prepare some defaults
const OUString aNullStr;
@@ -167,8 +167,8 @@ XOutdevItemPool::XOutdevItemPool(
// copy ctor, clones all static defaults
XOutdevItemPool::XOutdevItemPool(const XOutdevItemPool& rPool)
: SfxItemPool(rPool, true),
- mppLocalPoolDefaults(0L),
- mpLocalItemInfos(0L)
+ mppLocalPoolDefaults(nullptr),
+ mpLocalItemInfos(nullptr)
{
}
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 32ffa31aa323..8bb9e5a7da93 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -193,7 +193,7 @@ Bitmap XDashList::GetBitmapForUISolidLine() const
{
if(maBitmapSolidLine.IsEmpty())
{
- const_cast< XDashList* >(this)->maBitmapSolidLine = XDashList::ImpCreateBitmapForXDash(0);
+ const_cast< XDashList* >(this)->maBitmapSolidLine = XDashList::ImpCreateBitmapForXDash(nullptr);
}
return maBitmapSolidLine;
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index ca489fb5f1cf..f7776f15eb25 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -149,7 +149,7 @@ XPropertyEntry* XPropertyList::Get( long nIndex ) const
if( !const_cast<XPropertyList*>(this)->Load() )
const_cast<XPropertyList*>(this)->Create();
}
- return ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : NULL;
+ return ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : nullptr;
}
long XPropertyList::GetIndex(const OUString& rName) const
@@ -171,7 +171,7 @@ long XPropertyList::GetIndex(const OUString& rName) const
Bitmap XPropertyList::GetUiBitmap( long nIndex ) const
{
Bitmap aRetval;
- XPropertyEntry* pEntry = ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : NULL;
+ XPropertyEntry* pEntry = ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : nullptr;
if(pEntry)
{
aRetval = pEntry->GetUiBitmap();
@@ -196,7 +196,7 @@ void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
{
- XPropertyEntry* pOldEntry = (size_t)nIndex < maList.size() ? maList[ nIndex ] : NULL;
+ XPropertyEntry* pOldEntry = (size_t)nIndex < maList.size() ? maList[ nIndex ] : nullptr;
if ( pOldEntry ) {
maList[ nIndex ] = pEntry;
}
@@ -205,7 +205,7 @@ XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
XPropertyEntry* XPropertyList::Remove( long nIndex )
{
- XPropertyEntry* pEntry = NULL;
+ XPropertyEntry* pEntry = nullptr;
if ( (size_t)nIndex < maList.size() ) {
pEntry = maList[ nIndex ];
maList.erase( maList.begin() + nIndex );
@@ -257,7 +257,7 @@ bool XPropertyList::Load()
bool bRet = SvxXMLXTableImport::load(aURL.GetMainURL(INetURLObject::NO_DECODE),
maReferer, uno::Reference < embed::XStorage >(),
- createInstance(), NULL );
+ createInstance(), nullptr );
if (bRet)
return bRet;
}
@@ -300,7 +300,7 @@ bool XPropertyList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ),
createInstance(),
- uno::Reference< embed::XStorage >(), NULL );
+ uno::Reference< embed::XStorage >(), nullptr );
}
bool XPropertyList::SaveTo( const uno::Reference< embed::XStorage > &xStorage,
generated by cgit (git 2.34.1) at 2024-07-25 22:30:41 +0000