summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdoole2.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw/svdoole2.cxx')
-rw-r--r--svx/source/svdraw/svdoole2.cxx88
1 files changed, 44 insertions, 44 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 216783663603..814f41e1921d 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -397,7 +397,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
xParentFrame->setActiveFrame( xOwnFrame );
OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache();
- const ULONG nCount = rObjCache.Count();
+ const sal_uIntPtr nCount = rObjCache.Count();
for(sal_Int32 i = nCount-1 ; i >= 0;--i)
{
SdrOle2Obj* pObj = reinterpret_cast<SdrOle2Obj*>(rObjCache.GetObject(i));
@@ -627,7 +627,7 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject):
::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
pObj(pObject)
{
- SetSynchron( FALSE );
+ SetSynchron( sal_False );
}
// -----------------------------------------------------------------------------
@@ -752,29 +752,29 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact()
TYPEINIT1(SdrOle2Obj,SdrRectObj);
DBG_NAME(SdrOle2Obj)
-SdrOle2Obj::SdrOle2Obj(FASTBOOL bFrame_) : m_bTypeAsked(false)
+SdrOle2Obj::SdrOle2Obj(int bFrame_) : m_bTypeAsked(false)
,m_bChart(false)
{
DBG_CTOR( SdrOle2Obj,NULL);
- bInDestruction = FALSE;
+ bInDestruction = sal_False;
Init();
bFrame=bFrame_;
}
// -----------------------------------------------------------------------------
-SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_)
+SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, int bFrame_)
: xObjRef( rNewObjRef )
, m_bTypeAsked(false)
, m_bChart(false)
{
DBG_CTOR( SdrOle2Obj,NULL);
- bInDestruction = FALSE;
+ bInDestruction = sal_False;
Init();
bFrame=bFrame_;
if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(TRUE);
+ SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -783,20 +783,20 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFram
// -----------------------------------------------------------------------------
-SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, FASTBOOL bFrame_)
+SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, int bFrame_)
: xObjRef( rNewObjRef )
, m_bTypeAsked(false)
, m_bChart(false)
{
DBG_CTOR( SdrOle2Obj,NULL);
- bInDestruction = FALSE;
+ bInDestruction = sal_False;
Init();
mpImpl->aPersistName = rNewObjName;
bFrame=bFrame_;
if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(TRUE);
+ SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -805,21 +805,21 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStrin
// -----------------------------------------------------------------------------
-SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_)
+SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, int bFrame_)
: SdrRectObj(rNewRect)
, xObjRef( rNewObjRef )
, m_bTypeAsked(false)
, m_bChart(false)
{
DBG_CTOR( SdrOle2Obj,NULL);
- bInDestruction = FALSE;
+ bInDestruction = sal_False;
Init();
mpImpl->aPersistName = rNewObjName;
bFrame=bFrame_;
if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(TRUE);
+ SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -836,7 +836,7 @@ void SdrOle2Obj::Init()
mpImpl->pGraphicObject=NULL;
mpImpl->pLightClient = 0;
- xObjRef.Lock( TRUE );
+ xObjRef.Lock( sal_True );
}
// -----------------------------------------------------------------------------
@@ -844,7 +844,7 @@ void SdrOle2Obj::Init()
SdrOle2Obj::~SdrOle2Obj()
{
DBG_DTOR( SdrOle2Obj,NULL);
- bInDestruction = TRUE;
+ bInDestruction = sal_True;
if ( mpImpl->mbConnected )
Disconnect();
@@ -911,7 +911,7 @@ void SdrOle2Obj::SetGraphic(const Graphic* pGrf)
// -----------------------------------------------------------------------------
-FASTBOOL SdrOle2Obj::IsEmpty() const
+int SdrOle2Obj::IsEmpty() const
{
return !(xObjRef.is());
}
@@ -1123,7 +1123,7 @@ void SdrOle2Obj::Connect_Impl()
{
xObjRef.AssignToContainer( &rContainer, mpImpl->aPersistName );
mpImpl->mbConnected = true;
- xObjRef.Lock( TRUE );
+ xObjRef.Lock( sal_True );
}
}
@@ -1174,7 +1174,7 @@ void SdrOle2Obj::Connect_Impl()
pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER)
{
// Kein RefDevice oder RefDevice kein Printer
- BOOL bModified = (*ppObjRef)->IsModified();
+ sal_Bool bModified = (*ppObjRef)->IsModified();
Printer* pPrinter = (Printer*) pModel->GetRefDevice();
(*ppObjRef)->OnDocumentPrinterChanged( pPrinter );
(*ppObjRef)->SetModified( bModified );
@@ -1419,8 +1419,8 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel)
void SdrOle2Obj::SetPage(SdrPage* pNewPage)
{
- FASTBOOL bRemove=pNewPage==NULL && pPage!=NULL;
- FASTBOOL bInsert=pNewPage!=NULL && pPage==NULL;
+ int bRemove=pNewPage==NULL && pPage!=NULL;
+ int bInsert=pNewPage!=NULL && pPage==NULL;
if (bRemove && mpImpl->mbConnected )
Disconnect();
@@ -1442,7 +1442,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
// MBA: the caller of the method is responsible to control the old object, it will not be closed here
// Otherwise WW8 import crashes because it tranfers control to OLENode by this method
if ( xObjRef.GetObject().is() )
- xObjRef.Lock( FALSE );
+ xObjRef.Lock( sal_False );
// MBA: avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)!
// This call will try to close the objects; so if anybody else wants to keep it, it must be locked by a CloseListener
@@ -1459,7 +1459,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
DELETEZ( pGraphic );
if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(TRUE);
+ SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
if( ImplIsMathObj( rNewObjRef ) )
@@ -1557,28 +1557,28 @@ String SdrOle2Obj::GetPersistName() const
void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed=FALSE;
- rInfo.bRotate90Allowed =FALSE;
- rInfo.bMirrorFreeAllowed=FALSE;
- rInfo.bMirror45Allowed =FALSE;
- rInfo.bMirror90Allowed =FALSE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bNoOrthoDesired =FALSE;
- rInfo.bCanConvToPath =FALSE;
- rInfo.bCanConvToPoly =FALSE;
- rInfo.bCanConvToPathLineToArea=FALSE;
- rInfo.bCanConvToPolyLineToArea=FALSE;
- rInfo.bCanConvToContour = FALSE;
+ rInfo.bRotateFreeAllowed=sal_False;
+ rInfo.bRotate90Allowed =sal_False;
+ rInfo.bMirrorFreeAllowed=sal_False;
+ rInfo.bMirror45Allowed =sal_False;
+ rInfo.bMirror90Allowed =sal_False;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bNoOrthoDesired =sal_False;
+ rInfo.bCanConvToPath =sal_False;
+ rInfo.bCanConvToPoly =sal_False;
+ rInfo.bCanConvToPathLineToArea=sal_False;
+ rInfo.bCanConvToPolyLineToArea=sal_False;
+ rInfo.bCanConvToContour = sal_False;
}
// -----------------------------------------------------------------------------
-UINT16 SdrOle2Obj::GetObjIdentifier() const
+sal_uInt16 SdrOle2Obj::GetObjIdentifier() const
{
- return bFrame ? UINT16(OBJ_FRAME) : UINT16(OBJ_OLE2);
+ return bFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2);
}
// -----------------------------------------------------------------------------
@@ -1980,23 +1980,23 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb
// -----------------------------------------------------------------------------
-BOOL SdrOle2Obj::Unload()
+sal_Bool SdrOle2Obj::Unload()
{
- BOOL bUnloaded = FALSE;
+ sal_Bool bUnloaded = sal_False;
if( xObjRef.is() )
{
//TODO/LATER: no refcounting tricks anymore!
//"customers" must register as state change listeners
//Nicht notwendig im Doc DTor (MM)
- //ULONG nRefCount = (*ppObjRef)->GetRefCount();
+ //sal_uIntPtr nRefCount = (*ppObjRef)->GetRefCount();
// prevent Unload if there are external references
//if( nRefCount > 2 )
- // return FALSE;
+ // return sal_False;
//DBG_ASSERT( nRefCount == 2, "Wrong RefCount for unload" );
}
else
- bUnloaded = TRUE;
+ bUnloaded = sal_True;
if ( pModel && xObjRef.is() )
{
generated by cgit (git 2.34.1) at 2024-07-13 06:09:38 +0000