summaryrefslogtreecommitdiff
path: root/svx/source/unodraw/unoshape.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/unodraw/unoshape.cxx')
-rw-r--r--svx/source/unodraw/unoshape.cxx166
1 files changed, 83 insertions, 83 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 8a62fcb5656d..0b682a624cbf 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -128,9 +128,9 @@ struct SvxShapeImpl
SvxShapeImpl( SvxShape& _rAntiImpl, ::osl::Mutex& _rMutex )
:mrAntiImpl( _rAntiImpl )
- ,mpItemSet( NULL )
+ ,mpItemSet( nullptr )
,mnObjId( 0 )
- ,mpMaster( NULL )
+ ,mpMaster( nullptr )
,mbHasSdrObjectOwnership( false )
,mbDisposing( false )
,mpCreatedObj()
@@ -178,7 +178,7 @@ SvxShape::SvxShape( SdrObject* pObject ) throw( uno::RuntimeException )
, mpPropSet(getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool()))
, maPropMapEntries(getSvxMapProvider().GetMap(SVXMAP_SHAPE))
, mpObj(pObject)
-, mpModel(NULL)
+, mpModel(nullptr)
, mnLockCount(0)
{
impl_construct();
@@ -192,7 +192,7 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries,
, mpPropSet(pPropertySet)
, maPropMapEntries(pEntries)
, mpObj(pObject)
-, mpModel(NULL)
+, mpModel(nullptr)
, mnLockCount(0)
{
impl_construct();
@@ -205,8 +205,8 @@ SvxShape::SvxShape() throw( uno::RuntimeException )
, mbIsMultiPropertyCall(false)
, mpPropSet(getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool()))
, maPropMapEntries(getSvxMapProvider().GetMap(SVXMAP_SHAPE))
-, mpObj(NULL)
-, mpModel(NULL)
+, mpObj(nullptr)
+, mpModel(nullptr)
, mnLockCount(0)
{
impl_construct();
@@ -226,7 +226,7 @@ SvxShape::~SvxShape() throw()
mpImpl->mpMaster->dispose();
if ( mpObj.is() )
- mpObj->setUnoShape(NULL);
+ mpObj->setUnoShape(nullptr);
if( HasSdrObjectOwnership() && mpObj.is() )
{
@@ -235,7 +235,7 @@ SvxShape::~SvxShape() throw()
SdrObject::Free( pObject );
}
- delete mpImpl, mpImpl = NULL;
+ delete mpImpl, mpImpl = nullptr;
EndListeningAll(); // call explictily within SolarMutexGuard
}
@@ -310,7 +310,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >&
if( xUT.is() )
return reinterpret_cast<SvxShape*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( SvxShape::getUnoTunnelId())));
else
- return NULL;
+ return nullptr;
}
@@ -409,7 +409,7 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ )
return;
SdrObject* pCreatedObj = mpImpl->mpCreatedObj.get();
- OSL_ENSURE( ( pCreatedObj == NULL ) || ( pCreatedObj == pNewObj ),
+ OSL_ENSURE( ( pCreatedObj == nullptr ) || ( pCreatedObj == pNewObj ),
"SvxShape::Create: the same shape used for two different objects?! Strange ..." );
// Correct condition (#i52126#)
@@ -436,7 +436,7 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ )
// save user call
SdrObjUserCall* pUser = mpObj->GetUserCall();
- mpObj->SetUserCall(NULL);
+ mpObj->SetUserCall(nullptr);
setPosition( maPosition );
setSize( maSize );
@@ -666,7 +666,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
DBG_TESTSOLARMUTEX();
uno::Any aAny;
- if( !mpObj.is() || mpModel == NULL || !mpObj->IsInserted() || NULL == mpObj->GetPage() )
+ if( !mpObj.is() || mpModel == nullptr || !mpObj->IsInserted() || nullptr == mpObj->GetPage() )
return aAny;
ScopedVclPtrInstance< VirtualDevice > pVDev;
@@ -690,7 +690,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
if( bMetaFile )
{
SvMemoryStream aDestStrm( 65535, 65535 );
- ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, false );
+ ConvertGDIMetaFileToWMF( aMtf, aDestStrm, nullptr, false );
const uno::Sequence<sal_Int8> aSeq(
static_cast< const sal_Int8* >(aDestStrm.GetData()),
aDestStrm.GetEndOfData());
@@ -1029,7 +1029,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
uno::Reference< uno::XInterface > xSelf( mpObj->getWeakUnoShape() );
if( !xSelf.is() )
{
- mpObj.reset( NULL );
+ mpObj.reset( nullptr );
return;
}
@@ -1045,7 +1045,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
case HINT_MODELCLEARED:
{
bClearMe = true;
- mpModel = NULL;
+ mpModel = nullptr;
break;
}
default:
@@ -1056,8 +1056,8 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
{
if( !HasSdrObjectOwnership() ) {
if( mpObj.is() )
- mpObj->setUnoShape( NULL );
- mpObj.reset( NULL );
+ mpObj->setUnoShape( nullptr );
+ mpObj.reset( nullptr );
}
if ( !mpImpl->mbDisposing )
dispose();
@@ -1330,7 +1330,7 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception)
}
}
- mpObj->setUnoShape(NULL);
+ mpObj->setUnoShape(nullptr);
if ( bFreeSdrObject )
{
@@ -1345,7 +1345,7 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception)
if( mpModel )
{
EndListening( *mpModel );
- mpModel = NULL;
+ mpModel = nullptr;
}
}
@@ -1686,7 +1686,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
SfxItemSet* pSet;
if( mbIsMultiPropertyCall && !bIsNotPersist )
{
- if( mpImpl->mpItemSet == NULL )
+ if( mpImpl->mpItemSet == nullptr )
{
pSet = mpImpl->mpItemSet = mpObj->GetMergedItemSet().Clone();
}
@@ -1769,7 +1769,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
uno::Any aAny;
if( mpObj.is() && mpModel )
{
- if(pMap == NULL )
+ if(pMap == nullptr )
throw beans::UnknownPropertyException();
if( !getPropertyValueImpl( PropertyName, pMap, aAny ) )
@@ -1886,7 +1886,7 @@ void SvxShape::endSetPropertyValues()
if( mpImpl->mpItemSet )
{
delete mpImpl->mpItemSet;
- mpImpl->mpItemSet = 0;
+ mpImpl->mpItemSet = nullptr;
}
}
@@ -1958,7 +1958,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
{
case SDRATTR_CIRCSTARTANGLE:
{
- const SfxPoolItem* pPoolItem=NULL;
+ const SfxPoolItem* pPoolItem=nullptr;
if(aSet.GetItemState(SDRATTR_CIRCSTARTANGLE,false,&pPoolItem)==SfxItemState::SET)
{
sal_Int32 nAngle = static_cast<const SdrAngleItem*>(pPoolItem)->GetValue();
@@ -1969,7 +1969,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
case SDRATTR_CIRCENDANGLE:
{
- const SfxPoolItem* pPoolItem=NULL;
+ const SfxPoolItem* pPoolItem=nullptr;
if (aSet.GetItemState(SDRATTR_CIRCENDANGLE,false,&pPoolItem)==SfxItemState::SET)
{
sal_Int32 nAngle = static_cast<const SdrAngleItem*>(pPoolItem)->GetValue();
@@ -2051,7 +2051,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName);
- if( !mpObj.is() || pMap == NULL )
+ if( !mpObj.is() || pMap == nullptr )
throw beans::UnknownPropertyException();
beans::PropertyState eState;
@@ -2087,7 +2087,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
case XATTR_LINEDASH:
{
const NameOrIndex* pItem = static_cast<const NameOrIndex*>(rSet.GetItem((sal_uInt16)pMap->nWID));
- if( ( pItem == NULL ) || pItem->GetName().isEmpty() )
+ if( ( pItem == nullptr ) || pItem->GetName().isEmpty() )
eState = beans::PropertyState_DEFAULT_VALUE;
}
break;
@@ -2102,7 +2102,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
case XATTR_FILLFLOATTRANSPARENCE:
{
const NameOrIndex* pItem = static_cast<const NameOrIndex*>(rSet.GetItem((sal_uInt16)pMap->nWID));
- if ( pItem == NULL )
+ if ( pItem == nullptr )
eState = beans::PropertyState_DEFAULT_VALUE;
}
break;
@@ -2372,7 +2372,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
if( rValue >>= aLayerName )
{
const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, true);
- if( pLayer != NULL )
+ if( pLayer != nullptr )
{
mpObj->SetLayer( pLayer->GetID() );
return true;
@@ -2505,7 +2505,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
if( pPageObj )
{
SdrModel* pModel = pPageObj->GetModel();
- SdrPage* pNewPage = 0L;
+ SdrPage* pNewPage = nullptr;
const sal_uInt16 nDestinationPageNum((sal_uInt16)((nPageNum << 1L) - 1L));
if(pModel)
@@ -2920,7 +2920,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
// #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically
GDIMetaFile aMtf(pObj->GetGraphic()->GetGDIMetaFile());
SvMemoryStream aDestStrm( 65535, 65535 );
- ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, false );
+ ConvertGDIMetaFileToWMF( aMtf, aDestStrm, nullptr, false );
const uno::Sequence<sal_Int8> aSeq(
static_cast< const sal_Int8* >(aDestStrm.GetData()),
aDestStrm.GetEndOfData());
@@ -3033,7 +3033,7 @@ void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName )
const SfxItemPropertySimpleEntry* pProperty = mpPropSet->getPropertyMapEntry(PropertyName);
- if( !mpObj.is() || mpModel == NULL || pProperty == NULL )
+ if( !mpObj.is() || mpModel == nullptr || pProperty == nullptr )
throw beans::UnknownPropertyException();
if( !setPropertyToDefaultImpl( pProperty ) )
@@ -3066,7 +3066,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(aPropertyName);
- if( !mpObj.is() || pMap == NULL || mpModel == NULL )
+ if( !mpObj.is() || pMap == nullptr || mpModel == nullptr )
throw beans::UnknownPropertyException();
if(( pMap->nWID >= OWN_ATTR_VALUE_START && pMap->nWID <= OWN_ATTR_VALUE_END ) ||
@@ -3217,8 +3217,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
{
case OBJ_GRUP:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_GroupServices;
@@ -3233,8 +3233,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
}
case OBJ_CUSTOMSHAPE:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_CustomShapeServices;
@@ -3260,8 +3260,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
}
case OBJ_LINE:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_LineServices;
@@ -3291,8 +3291,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_RECT:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_RectServices;
@@ -3323,8 +3323,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_CARC:
case OBJ_CCUT:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_CircServices;
@@ -3356,8 +3356,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_PATHPLIN:
case OBJ_PLIN:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_PathServices;
comphelper::ServiceInfoHelper::addToSequence( SvxShape_PathServices,14,
@@ -3387,8 +3387,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_PATHPOLY:
case OBJ_POLY:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_PolyServices;
comphelper::ServiceInfoHelper::addToSequence( SvxShape_PolyServices,15,
@@ -3420,8 +3420,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_FREELINE:
case OBJ_PATHLINE:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_FreeLineServices;
@@ -3455,8 +3455,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_FREEFILL:
case OBJ_PATHFILL:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_FreeFillServices;
comphelper::ServiceInfoHelper::addToSequence( SvxShape_FreeFillServices,15,
@@ -3489,8 +3489,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_TITLETEXT:
case OBJ_TEXT:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_TextServices;
comphelper::ServiceInfoHelper::addToSequence( SvxShape_TextServices,14,
@@ -3519,8 +3519,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_GRAF:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_GrafServices;
comphelper::ServiceInfoHelper::addToSequence( SvxShape_GrafServices, 12,
@@ -3547,8 +3547,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_OLE2:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_Ole2Services;
@@ -3576,8 +3576,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_CAPTION:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_CaptionServices;
@@ -3608,8 +3608,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_PAGE:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_PageServices;
@@ -3625,8 +3625,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_MEASURE:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_MeasureServices;
comphelper::ServiceInfoHelper::addToSequence( SvxShape_MeasureServices,15,
@@ -3658,8 +3658,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_FRAME:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_FrameServices;
@@ -3675,8 +3675,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_UNO:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_UnoServices;
comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2,
@@ -3690,8 +3690,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
case OBJ_EDGE:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_EdgeServices;
@@ -3721,8 +3721,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
}
case OBJ_MEDIA:
{
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_MediaServices;
@@ -3742,8 +3742,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
const sal_uInt16 nIdent = mpObj->GetObjIdentifier();
OSL_ENSURE( nIdent == OBJ_UNO, "SvxShape::_getSupportedServiceNames: FmFormInventor, but no UNO object?" );
#endif
- static uno::Sequence< OUString > *pSeq = 0;
- if( 0 == pSeq )
+ static uno::Sequence< OUString > *pSeq = nullptr;
+ if( nullptr == pSeq )
{
static uno::Sequence< OUString > SvxShape_UnoServices;
comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2,
@@ -3933,7 +3933,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject ) throw ()
: SvxShape( pObject, getSvxMapProvider().GetMap(SVXMAP_TEXT), getSvxMapProvider().GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
{
if( pObject && pObject->GetModel() )
- SetEditSource( new SvxTextEditSource( pObject, 0 ) );
+ SetEditSource( new SvxTextEditSource( pObject, nullptr ) );
}
@@ -3941,21 +3941,21 @@ SvxShapeText::SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* p
: SvxShape( pObject, pPropertyMap, pPropertySet ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
{
if( pObject && pObject->GetModel() )
- SetEditSource( new SvxTextEditSource( pObject, 0 ) );
+ SetEditSource( new SvxTextEditSource( pObject, nullptr ) );
}
SvxShapeText::~SvxShapeText() throw ()
{
// check if only this instance is registered at the ranges
- DBG_ASSERT( (NULL == GetEditSource()) || (GetEditSource()->getRanges().size()==1),
+ DBG_ASSERT( (nullptr == GetEditSource()) || (GetEditSource()->getRanges().size()==1),
"svx::SvxShapeText::~SvxShapeText(), text shape with living text ranges destroyed!");
}
void SvxShapeText::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
{
- if( pNewObj && (NULL == GetEditSource()))
- SetEditSource( new SvxTextEditSource( pNewObj, 0 ) );
+ if( pNewObj && (nullptr == GetEditSource()))
+ SetEditSource( new SvxTextEditSource( pNewObj, nullptr ) );
SvxShape::Create( pNewObj, pNewPage );
}
@@ -4059,7 +4059,7 @@ void SvxShapeText::unlock()
uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::RuntimeException, std::exception)
{
::SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
return SvxUnoTextBase::getStart();
@@ -4069,7 +4069,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::
uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::RuntimeException, std::exception)
{
::SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
return SvxUnoTextBase::getEnd();
@@ -4078,7 +4078,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::Ru
OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException, std::exception)
{
::SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
return SvxUnoTextBase::getString();
@@ -4088,7 +4088,7 @@ OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException, std::ex
void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception)
{
::SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
SvxUnoTextBase::setString( aString );
@@ -4190,7 +4190,7 @@ uno::Reference< drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw
SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) throw()
{
SvxShape* pShape = SvxShape::getImplementation( xShape );
- return pShape ? pShape->GetSdrObject() : 0;
+ return pShape ? pShape->GetSdrObject() : nullptr;
}
@@ -4198,7 +4198,7 @@ SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) th
SdrObject* SdrObject::getSdrObjectFromXShape( const css::uno::Reference< css::uno::XInterface >& xInt )
{
SvxShape* pSvxShape = SvxShape::getImplementation( xInt );
- return pSvxShape ? pSvxShape->GetSdrObject() : 0;
+ return pSvxShape ? pSvxShape->GetSdrObject() : nullptr;
}
uno::Any SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet )
generated by cgit (git 2.34.1) at 2024-07-10 02:50:55 +0000