Kaydet (Commit) 4f9ce93e authored tarafından Noel Grandin's avatar Noel Grandin

sfx2: sal_Bool->bool

Change-Id: I125e09933be2841315252fbc3fc021c195f255f8
üst 85341374
...@@ -106,7 +106,7 @@ class SFX2_DLLPUBLIC SfxEventConfiguration ...@@ -106,7 +106,7 @@ class SFX2_DLLPUBLIC SfxEventConfiguration
{ {
public: public:
static void ConfigureEvent( const OUString& aName, const SvxMacro&, SfxObjectShell* pObjSh); static void ConfigureEvent( const OUString& aName, const SvxMacro&, SfxObjectShell* pObjSh);
static SvxMacro* ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp ); static SvxMacro* ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, bool bBlowUp );
}; };
#endif #endif
......
...@@ -38,8 +38,8 @@ public: ...@@ -38,8 +38,8 @@ public:
GenLink& operator = ( const GenLink& rOrig ) GenLink& operator = ( const GenLink& rOrig )
{ pFunc = rOrig.pFunc; aLink = rOrig.aLink; return *this; } { pFunc = rOrig.pFunc; aLink = rOrig.aLink; return *this; }
sal_Bool operator!() const { return !aLink && !pFunc; } bool operator!() const { return !aLink && !pFunc; }
sal_Bool IsSet() const { return aLink.IsSet() || pFunc; } bool IsSet() const { return aLink.IsSet() || pFunc; }
long Call( void* pCaller ) long Call( void* pCaller )
{ return pFunc ? (*pFunc)(pCaller) : aLink.Call(pCaller); } { return pFunc ? (*pFunc)(pCaller) : aLink.Call(pCaller); }
......
...@@ -68,14 +68,14 @@ public: ...@@ -68,14 +68,14 @@ public:
void SetObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rObject ); void SetObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rObject );
void SetObjectState( sal_Int32 ); void SetObjectState( sal_Int32 );
Size GetObjectVisAreaSize() const; Size GetObjectVisAreaSize() const;
sal_Bool IsObjectUIActive() const; bool IsObjectUIActive() const;
sal_Bool IsObjectInPlaceActive() const; bool IsObjectInPlaceActive() const;
void DeactivateObject(); void DeactivateObject();
sal_Bool SetObjArea( const Rectangle & ); bool SetObjArea( const Rectangle & );
Rectangle GetObjArea() const; Rectangle GetObjArea() const;
Rectangle GetScaledObjArea() const; Rectangle GetScaledObjArea() const;
void SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight ); void SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight );
sal_Bool SetObjAreaAndScale( const Rectangle&, const Fraction&, const Fraction& ); bool SetObjAreaAndScale( const Rectangle&, const Fraction&, const Fraction& );
const Fraction& GetScaleWidth() const; const Fraction& GetScaleWidth() const;
const Fraction& GetScaleHeight() const; const Fraction& GetScaleHeight() const;
void Invalidate(); void Invalidate();
...@@ -85,7 +85,7 @@ public: ...@@ -85,7 +85,7 @@ public:
ErrCode DoVerb( long nVerb ); ErrCode DoVerb( long nVerb );
void VisAreaChanged(); void VisAreaChanged();
void ResetObject(); void ResetObject();
sal_Bool IsUIActive(); bool IsUIActive();
virtual void FormatChanged(); // object format was changed (used for StarMath formulas aligning) virtual void FormatChanged(); // object format was changed (used for StarMath formulas aligning)
}; };
......
...@@ -272,7 +272,7 @@ void SfxEventConfiguration::ConfigureEvent( const OUString& aName, const SvxMacr ...@@ -272,7 +272,7 @@ void SfxEventConfiguration::ConfigureEvent( const OUString& aName, const SvxMacr
} }
SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp ) SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, bool bBlowUp )
{ {
return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, bBlowUp ); return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, bBlowUp );
} }
......
...@@ -731,7 +731,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject ...@@ -731,7 +731,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
} }
sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea ) bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
{ {
if( rArea != m_pImp->m_aObjArea ) if( rArea != m_pImp->m_aObjArea )
{ {
...@@ -739,10 +739,10 @@ sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea ) ...@@ -739,10 +739,10 @@ sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
m_pImp->SizeHasChanged(); m_pImp->SizeHasChanged();
Invalidate(); Invalidate();
return sal_True; return true;
} }
return sal_False; return false;
} }
...@@ -776,7 +776,7 @@ void SfxInPlaceClient::SetSizeScale( const Fraction & rScaleWidth, const Fractio ...@@ -776,7 +776,7 @@ void SfxInPlaceClient::SetSizeScale( const Fraction & rScaleWidth, const Fractio
} }
sal_Bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fraction& rScaleWidth, const Fraction& rScaleHeight ) bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fraction& rScaleWidth, const Fraction& rScaleHeight )
{ {
if( rArea != m_pImp->m_aObjArea || m_pImp->m_aScaleWidth != rScaleWidth || m_pImp->m_aScaleHeight != rScaleHeight ) if( rArea != m_pImp->m_aObjArea || m_pImp->m_aScaleWidth != rScaleWidth || m_pImp->m_aScaleHeight != rScaleHeight )
{ {
...@@ -787,10 +787,10 @@ sal_Bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fra ...@@ -787,10 +787,10 @@ sal_Bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fra
m_pImp->SizeHasChanged(); m_pImp->SizeHasChanged();
Invalidate(); Invalidate();
return sal_True; return true;
} }
return sal_False; return false;
} }
...@@ -820,7 +820,7 @@ void SfxInPlaceClient::Invalidate() ...@@ -820,7 +820,7 @@ void SfxInPlaceClient::Invalidate()
} }
sal_Bool SfxInPlaceClient::IsObjectUIActive() const bool SfxInPlaceClient::IsObjectUIActive() const
{ {
try { try {
return ( m_pImp->m_xObject.is() && ( m_pImp->m_xObject->getCurrentState() == embed::EmbedStates::UI_ACTIVE ) ); return ( m_pImp->m_xObject.is() && ( m_pImp->m_xObject->getCurrentState() == embed::EmbedStates::UI_ACTIVE ) );
...@@ -828,11 +828,11 @@ sal_Bool SfxInPlaceClient::IsObjectUIActive() const ...@@ -828,11 +828,11 @@ sal_Bool SfxInPlaceClient::IsObjectUIActive() const
catch( uno::Exception& ) catch( uno::Exception& )
{} {}
return sal_False; return false;
} }
sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const bool SfxInPlaceClient::IsObjectInPlaceActive() const
{ {
try { try {
return( return(
...@@ -849,7 +849,7 @@ sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const ...@@ -849,7 +849,7 @@ sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const
catch( uno::Exception& ) catch( uno::Exception& )
{} {}
return sal_False; return false;
} }
...@@ -1106,7 +1106,7 @@ void SfxInPlaceClient::ResetObject() ...@@ -1106,7 +1106,7 @@ void SfxInPlaceClient::ResetObject()
} }
} }
sal_Bool SfxInPlaceClient::IsUIActive() bool SfxInPlaceClient::IsUIActive()
{ {
return m_pImp->m_bUIActive; return m_pImp->m_bUIActive;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment