You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/11/23 18:14:32 UTC
svn commit: r1412988 [2/3] - in /incubator/ooo/branches/alg/aw080/main:
basegfx/inc/basegfx/matrix/ filter/inc/filter/msfilter/
filter/source/msfilter/ sd/source/filter/eppt/ svx/source/svdraw/
vcl/source/gdi/
Modified: incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx?rev=1412988&r1=1412987&r2=1412988&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx Fri Nov 23 17:14:30 2012
@@ -152,46 +152,48 @@ EscherExClientAnchor_Base::~EscherExClie
// ---------------------------------------------------------------------------------------------
-void EscherPropertyContainer::ImplInit()
+EscherPropertyContainer::EscherPropertyContainer()
+: mpGraphicProvider(0),
+ mpPicOutStrm(0),
+ mpObjectRange(),
+ mpSortStruct(0),
+ mnSortCount(0),
+ mnSortBufSize(64),
+ mnCountCount(0),
+ mnCountSize(0),
+ mbHasComplexData(false)
{
- nSortCount = 0;
- nCountCount = 0;
- nCountSize = 0;
- nSortBufSize = 64;
- bHasComplexData = sal_False;
- pSortStruct = new EscherPropSortStruct[ nSortBufSize ];
-}
-
-EscherPropertyContainer::EscherPropertyContainer() :
- pGraphicProvider ( NULL ),
- pPicOutStrm ( NULL )
-{
- ImplInit();
+ mpSortStruct = new EscherPropSortStruct[mnSortBufSize];
};
EscherPropertyContainer::EscherPropertyContainer(
- EscherGraphicProvider& rGraphProv,
+ EscherGraphicProvider& rGraphProv,
SvStream* pPiOutStrm,
- basegfx::B2DRange& rObjectRange) : // FillBitmaps or GraphicObjects.
-
- pGraphicProvider ( &rGraphProv ),
- pPicOutStrm ( pPiOutStrm ),
- mpObjectRange(&rObjectRange)
+ basegfx::B2DRange& rObjectRange) // FillBitmaps or GraphicObjects.
+: mpGraphicProvider(&rGraphProv),
+ mpPicOutStrm(pPiOutStrm),
+ mpObjectRange(&rObjectRange),
+ mpSortStruct(0),
+ mnSortCount(0),
+ mnSortBufSize(64),
+ mnCountCount(0),
+ mnCountSize(0),
+ mbHasComplexData(false)
{
- ImplInit();
+ mpSortStruct = new EscherPropSortStruct[mnSortBufSize];
}
EscherPropertyContainer::~EscherPropertyContainer()
{
- if ( bHasComplexData )
+ if ( mbHasComplexData )
{
- while ( nSortCount-- )
- delete[] pSortStruct[ nSortCount ].pBuf;
+ while ( mnSortCount-- )
+ delete[] mpSortStruct[ mnSortCount ].pBuf;
}
- delete[] pSortStruct;
+ delete[] mpSortStruct;
};
-void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, sal_uInt32 nPropValue, sal_Bool bBlib )
+void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, sal_uInt32 nPropValue, bool bBlib )
{
AddOpt( nPropID, bBlib, nPropValue, NULL, 0 );
}
@@ -208,91 +210,91 @@ void EscherPropertyContainer::AddOpt( sa
}
pBuf[ j++ ] = 0;
pBuf[ j++ ] = 0;
- AddOpt( nPropID, sal_True, nLen, pBuf, nLen );
+ AddOpt( nPropID, true, nLen, pBuf, nLen );
}
-void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, sal_Bool bBlib, sal_uInt32 nPropValue, sal_uInt8* pProp, sal_uInt32 nPropSize )
+void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, bool bBlib, sal_uInt32 nPropValue, sal_uInt8* pProp, sal_uInt32 nPropSize )
{
if ( bBlib ) // bBlib is only valid when fComplex = 0
nPropID |= 0x4000;
if ( pProp )
- nPropID |= 0x8000; // fComplex = sal_True;
+ nPropID |= 0x8000; // fComplex = true;
sal_uInt32 i;
- for( i = 0; i < nSortCount; i++ )
+ for( i = 0; i < mnSortCount; i++ )
{
- if ( ( pSortStruct[ i ].nPropId &~0xc000 ) == ( nPropID &~0xc000 ) ) // pruefen, ob Property nur ersetzt wird
+ if ( ( mpSortStruct[ i ].nPropId &~0xc000 ) == ( nPropID &~0xc000 ) ) // pruefen, ob Property nur ersetzt wird
{
- pSortStruct[ i ].nPropId = nPropID;
- if ( pSortStruct[ i ].pBuf )
+ mpSortStruct[ i ].nPropId = nPropID;
+ if ( mpSortStruct[ i ].pBuf )
{
- nCountSize -= pSortStruct[ i ].nPropSize;
- delete[] pSortStruct[ i ].pBuf;
+ mnCountSize -= mpSortStruct[ i ].nPropSize;
+ delete[] mpSortStruct[ i ].pBuf;
}
- pSortStruct[ i ].pBuf = pProp;
- pSortStruct[ i ].nPropSize = nPropSize;
- pSortStruct[ i ].nPropValue = nPropValue;
+ mpSortStruct[ i ].pBuf = pProp;
+ mpSortStruct[ i ].nPropSize = nPropSize;
+ mpSortStruct[ i ].nPropValue = nPropValue;
if ( pProp )
- nCountSize += nPropSize;
+ mnCountSize += nPropSize;
return;
}
}
- nCountCount++;
- nCountSize += 6;
- if ( nSortCount == nSortBufSize ) // buffer vergroessern
- {
- nSortBufSize <<= 1;
- EscherPropSortStruct* pTemp = new EscherPropSortStruct[ nSortBufSize ];
- for( i = 0; i < nSortCount; i++ )
- {
- pTemp[ i ] = pSortStruct[ i ];
- }
- delete pSortStruct;
- pSortStruct = pTemp;
- }
- pSortStruct[ nSortCount ].nPropId = nPropID; // property einfuegen
- pSortStruct[ nSortCount ].pBuf = pProp;
- pSortStruct[ nSortCount ].nPropSize = nPropSize;
- pSortStruct[ nSortCount++ ].nPropValue = nPropValue;
+ mnCountCount++;
+ mnCountSize += 6;
+ if ( mnSortCount == mnSortBufSize ) // buffer vergroessern
+ {
+ mnSortBufSize <<= 1;
+ EscherPropSortStruct* pTemp = new EscherPropSortStruct[ mnSortBufSize ];
+ for( i = 0; i < mnSortCount; i++ )
+ {
+ pTemp[ i ] = mpSortStruct[ i ];
+ }
+ delete mpSortStruct;
+ mpSortStruct = pTemp;
+ }
+ mpSortStruct[ mnSortCount ].nPropId = nPropID; // property einfuegen
+ mpSortStruct[ mnSortCount ].pBuf = pProp;
+ mpSortStruct[ mnSortCount ].nPropSize = nPropSize;
+ mpSortStruct[ mnSortCount++ ].nPropValue = nPropValue;
if ( pProp )
{
- nCountSize += nPropSize;
- bHasComplexData = sal_True;
+ mnCountSize += nPropSize;
+ mbHasComplexData = true;
}
}
-sal_Bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, sal_uInt32& rPropValue ) const
+bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, sal_uInt32& rPropValue ) const
{
EscherPropSortStruct aPropStruct;
if ( GetOpt( nPropId, aPropStruct ) )
{
rPropValue = aPropStruct.nPropValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-sal_Bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, EscherPropSortStruct& rPropValue ) const
+bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, EscherPropSortStruct& rPropValue ) const
{
- for( sal_uInt32 i = 0; i < nSortCount; i++ )
+ for( sal_uInt32 i = 0; i < mnSortCount; i++ )
{
- if ( ( pSortStruct[ i ].nPropId &~0xc000 ) == ( nPropId &~0xc000 ) )
+ if ( ( mpSortStruct[ i ].nPropId &~0xc000 ) == ( nPropId &~0xc000 ) )
{
- rPropValue = pSortStruct[ i ];
- return sal_True;
+ rPropValue = mpSortStruct[ i ];
+ return true;
}
}
- return sal_False;
+ return false;
}
EscherProperties EscherPropertyContainer::GetOpts() const
{
EscherProperties aVector;
- for ( sal_uInt32 i = 0; i < nSortCount; ++i )
- aVector.push_back( pSortStruct[ i ] );
+ for ( sal_uInt32 i = 0; i < mnSortCount; ++i )
+ aVector.push_back( mpSortStruct[ i ] );
return aVector;
}
@@ -312,39 +314,39 @@ extern "C" int __LOADONCALLAPI EscherPro
void EscherPropertyContainer::Commit( SvStream& rSt, sal_uInt16 nVersion, sal_uInt16 nRecType )
{
- rSt << (sal_uInt16)( ( nCountCount << 4 ) | ( nVersion & 0xf ) ) << nRecType << nCountSize;
- if ( nSortCount )
+ rSt << (sal_uInt16)( ( mnCountCount << 4 ) | ( nVersion & 0xf ) ) << nRecType << mnCountSize;
+ if ( mnSortCount )
{
- qsort( pSortStruct, nSortCount, sizeof( EscherPropSortStruct ), EscherPropSortFunc );
+ qsort( mpSortStruct, mnSortCount, sizeof( EscherPropSortStruct ), EscherPropSortFunc );
sal_uInt32 i;
- for ( i = 0; i < nSortCount; i++ )
+ for ( i = 0; i < mnSortCount; i++ )
{
- sal_uInt32 nPropValue = pSortStruct[ i ].nPropValue;
- sal_uInt16 nPropId = pSortStruct[ i ].nPropId;
+ sal_uInt32 nPropValue = mpSortStruct[ i ].nPropValue;
+ sal_uInt16 nPropId = mpSortStruct[ i ].nPropId;
rSt << nPropId
<< nPropValue;
}
- if ( bHasComplexData )
+ if ( mbHasComplexData )
{
- for ( i = 0; i < nSortCount; i++ )
+ for ( i = 0; i < mnSortCount; i++ )
{
- if ( pSortStruct[ i ].pBuf )
- rSt.Write( pSortStruct[ i ].pBuf, pSortStruct[ i ].nPropSize );
+ if ( mpSortStruct[ i ].pBuf )
+ rSt.Write( mpSortStruct[ i ].pBuf, mpSortStruct[ i ].nPropSize );
}
}
}
}
-sal_Bool EscherPropertyContainer::IsFontWork() const
+bool EscherPropertyContainer::IsFontWork() const
{
sal_uInt32 nTextPathFlags = 0;
GetOpt( DFF_Prop_gtextFStrikethrough, nTextPathFlags );
return ( nTextPathFlags & 0x4000 ) != 0;
}
-sal_uInt32 EscherPropertyContainer::ImplGetColor( const sal_uInt32 nSOColor, sal_Bool bSwap )
+sal_uInt32 EscherPropertyContainer::ImplGetColor( const sal_uInt32 nSOColor, bool bSwap )
{
if ( bSwap )
{
@@ -437,7 +439,7 @@ void EscherPropertyContainer::CreateGrad
}
void EscherPropertyContainer::CreateGradientProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet , sal_Bool bTransparentGradient)
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet , bool bTransparentGradient)
{
::com::sun::star::uno::Any aAny;
::com::sun::star::awt::Gradient* pGradient = NULL;
@@ -452,14 +454,14 @@ void EscherPropertyContainer::CreateGrad
//Transparency gradient: Means the third setting in transparency page is set
if (bTransparentGradient && EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparenceGradient" ) ), sal_False ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparenceGradient" ) ), false ) )
{
pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue();
::com::sun::star::uno::Any aAnyTemp;
const rtl::OUString aPropName( String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) );
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAnyTemp, rXPropSet, aPropName, sal_False ) )
+ aAnyTemp, rXPropSet, aPropName, false ) )
{
::com::sun::star::drawing::FillStyle eFS;
if ( ! ( aAnyTemp >>= eFS ) )
@@ -468,17 +470,17 @@ void EscherPropertyContainer::CreateGrad
if ( eFS == ::com::sun::star::drawing::FillStyle_SOLID)
{
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAnyTemp, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ), sal_False ) )
+ aAnyTemp, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ), false ) )
{
- pGradient->StartColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), sal_False );
- pGradient->EndColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), sal_False );
+ pGradient->StartColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), false );
+ pGradient->EndColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), false );
}
}
//gradient and transparency.
else if( eFS == ::com::sun::star::drawing::FillStyle_GRADIENT )
{
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ), sal_False ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ), false ) )
pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue();
}
}
@@ -486,7 +488,7 @@ void EscherPropertyContainer::CreateGrad
}
//Not transparency gradient
else if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ), sal_False ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ), false ) )
{
pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue();
}
@@ -555,7 +557,7 @@ void EscherPropertyContainer::CreateGrad
//Transparency gradient
if (bTransparentGradient && EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparenceGradient" ) ), sal_False ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparenceGradient" ) ), false ) )
{
pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue();
if ( pGradient )
@@ -570,7 +572,7 @@ void EscherPropertyContainer::CreateGrad
void EscherPropertyContainer::CreateFillProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
- sal_Bool bEdge , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
+ bool bEdge , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
{
if ( rXShape.is() )
{
@@ -579,7 +581,7 @@ void EscherPropertyContainer::CreateFill
{
SfxItemSet aAttr( pObj->GetMergedItemSet() );
//tranparency with gradient. Means the third setting in transparency page is set
- sal_Bool bTransparentGradient = ( aAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
+ bool bTransparentGradient = ( aAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
( (const XFillFloatTransparenceItem&) aAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled();
CreateFillProperties( rXPropSet, bEdge, bTransparentGradient );
}
@@ -588,7 +590,7 @@ void EscherPropertyContainer::CreateFill
void EscherPropertyContainer::CreateFillProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
- sal_Bool bEdge , sal_Bool bTransparentGradient)
+ bool bEdge , bool bTransparentGradient)
{
::com::sun::star::uno::Any aAny;
@@ -599,7 +601,7 @@ void EscherPropertyContainer::CreateFill
const rtl::OUString aPropName( String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) );
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, aPropName, sal_False ) )
+ aAny, rXPropSet, aPropName, false ) )
{
::com::sun::star::drawing::FillStyle eFS;
if ( ! ( aAny >>= eFS ) )
@@ -615,14 +617,14 @@ void EscherPropertyContainer::CreateFill
case ::com::sun::star::drawing::FillStyle_BITMAP :
{
- CreateGraphicProperties( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapURL" ) ), sal_True );
+ CreateGraphicProperties( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapURL" ) ), true );
AddOpt( ESCHER_Prop_fNoFillHitTest, 0x140014 );
AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor );
}
break;
case ::com::sun::star::drawing::FillStyle_HATCH :
{
- CreateGraphicProperties( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" ) ), sal_True );
+ CreateGraphicProperties( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" ) ), true );
}
break;
case ::com::sun::star::drawing::FillStyle_SOLID :
@@ -638,7 +640,7 @@ void EscherPropertyContainer::CreateFill
AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid );
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ), sal_False ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ), false ) )
{
sal_uInt32 nFillColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()) );
nFillBackColor = nFillColor ^ 0xffffff;
@@ -656,7 +658,7 @@ void EscherPropertyContainer::CreateFill
if ( eFS != ::com::sun::star::drawing::FillStyle_NONE )
{
sal_uInt16 nTransparency = ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparence" ) ), sal_True ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparence" ) ), true ) )
? *((sal_Int16*)aAny.getValue() )
: 0;
if ( nTransparency )
@@ -668,7 +670,7 @@ void EscherPropertyContainer::CreateFill
void EscherPropertyContainer::CreateTextProperties(
const uno::Reference< beans::XPropertySet > & rXPropSet, sal_uInt32 nTextId,
- const sal_Bool bIsCustomShape, const sal_Bool bIsTextFrame )
+ const bool bIsCustomShape, const bool bIsTextFrame )
{
uno::Any aAny;
text::WritingMode eWM( text::WritingMode_LR_TB );
@@ -681,34 +683,34 @@ void EscherPropertyContainer::CreateText
sal_Int32 nBottom ( 0 );
// used with normal shapes:
- sal_Bool bAutoGrowWidth ( sal_False );
- sal_Bool bAutoGrowHeight ( sal_False );
+ bool bAutoGrowWidth(false);
+ bool bAutoGrowHeight(false);
// used with ashapes:
- sal_Bool bWordWrap ( sal_False );
- sal_Bool bAutoGrowSize ( sal_False );
+ bool bWordWrap(false);
+ bool bAutoGrowSize(false);
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextWritingMode" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextWritingMode" ) ), true ) )
aAny >>= eWM;
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextVerticalAdjust" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextVerticalAdjust" ) ), true ) )
aAny >>= eVA;
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) ), true ) )
aAny >>= eHA;
if ( bIsCustomShape )
{
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextWordWrap" ) ), sal_False ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextWordWrap" ) ), false ) )
aAny >>= bWordWrap;
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowHeight" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowHeight" ) ), true ) )
aAny >>= bAutoGrowSize;
}
else if ( bIsTextFrame )
{
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowWidth" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowWidth" ) ), true ) )
aAny >>= bAutoGrowWidth;
// i63936 not setting autogrowheight, because otherwise
// the minframeheight of the text will be ignored
//
-// if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowHeight" ) ), sal_True ) )
+// if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowHeight" ) ), true ) )
// aAny >>= bAutoGrowHeight;
}
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextLeftDistance" ) ) ) )
@@ -861,7 +863,7 @@ void EscherPropertyContainer::CreateText
AddOpt( ESCHER_Prop_lTxid, nTextId );
}
-sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
+bool EscherPropertyContainer::GetLineArrow( const bool bLineStart,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
ESCHER_LineEnd& reLineEnd, sal_Int32& rnArrowLength, sal_Int32& rnArrowWidth )
{
@@ -873,30 +875,30 @@ sal_Bool EscherPropertyContainer::GetLin
const String sLine ( bLineStart ? sLineStart : sLineEnd );
const String sLineName ( bLineStart ? sLineStartName : sLineEndName );
- sal_Bool bIsArrow = sal_False;
+ bool bIsArrow(false);
::com::sun::star::uno::Any aAny;
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, sLine, sal_False ) )
+ aAny, rXPropSet, sLine, false ) )
{
PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aAny ) );
if ( aPolyPoly.Count() && aPolyPoly[ 0 ].GetSize() )
{
- bIsArrow = sal_True;
+ bIsArrow = true;
reLineEnd = ESCHER_LineArrowEnd;
rnArrowLength = 1;
rnArrowWidth = 1;
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, sLineName, sal_False ) )
+ aAny, rXPropSet, sLineName, false ) )
{
String aArrowStartName = *(::rtl::OUString*)aAny.getValue();
rtl::OUString aApiName;
sal_Int16 nWhich = bLineStart ? XATTR_LINESTART : XATTR_LINEEND;
SvxUnogetApiNameForItem( nWhich, aArrowStartName, aApiName );
- sal_Bool bIsMapped = sal_True;
+ bool bIsMapped(true);
if ( aApiName.getLength() )
{
@@ -932,12 +934,12 @@ sal_Bool EscherPropertyContainer::GetLin
else if ( aApiName.equalsAscii( "Arrow" ) )
reLineEnd = ESCHER_LineArrowEnd;
else
- bIsMapped = sal_False;
+ bIsMapped = false;
}
if ( !bIsMapped && aArrowStartName.GetTokenCount( ' ' ) == 2 )
{
- sal_Bool b = sal_True;
+ bool b(true);
String aArrowName( aArrowStartName.GetToken( 0, ' ' ) );
if ( aArrowName.EqualsAscii( "msArrowEnd" ) )
reLineEnd = ESCHER_LineArrowEnd;
@@ -950,7 +952,7 @@ sal_Bool EscherPropertyContainer::GetLin
else if ( aArrowName.EqualsAscii( "msArrowOvalEnd" ) )
reLineEnd = ESCHER_LineArrowOvalEnd;
else
- b = sal_False;
+ b = false;
// now we have the arrow, and try to determine the arrow size;
if ( b )
@@ -969,7 +971,7 @@ sal_Bool EscherPropertyContainer::GetLin
void EscherPropertyContainer::CreateLineProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
- sal_Bool bEdge )
+ bool bEdge )
{
::com::sun::star::uno::Any aAny;
sal_uInt32 nLineFlags = 0x80008;
@@ -978,24 +980,24 @@ void EscherPropertyContainer::CreateLine
sal_Int32 nArrowLength;
sal_Int32 nArrowWidth;
- sal_Bool bSwapLineEnds = sal_False;
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" ) ), sal_True ) )
+ bool bSwapLineEnds(false);
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" ) ), true ) )
{
::com::sun::star::drawing::CircleKind eCircleKind;
if ( aAny >>= eCircleKind )
{
if ( eCircleKind == ::com::sun::star::drawing::CircleKind_ARC )
- bSwapLineEnds = sal_True;
+ bSwapLineEnds = true;
}
}
- if ( GetLineArrow( bSwapLineEnds ? sal_False : sal_True, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) )
+ if ( GetLineArrow( bSwapLineEnds ? false : true, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) )
{
AddOpt( ESCHER_Prop_lineStartArrowLength, nArrowLength );
AddOpt( ESCHER_Prop_lineStartArrowWidth, nArrowWidth );
AddOpt( ESCHER_Prop_lineStartArrowhead, eLineEnd );
nLineFlags |= 0x100010;
}
- if ( GetLineArrow( bSwapLineEnds ? sal_True : sal_False, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) )
+ if ( GetLineArrow( bSwapLineEnds ? true : false, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) )
{
AddOpt( ESCHER_Prop_lineEndArrowLength, nArrowLength );
AddOpt( ESCHER_Prop_lineEndArrowWidth, nArrowWidth );
@@ -1004,7 +1006,7 @@ void EscherPropertyContainer::CreateLine
}
// support LineCaps
- if(EscherPropertyValueHelper::GetPropertyValue(aAny, rXPropSet, String(RTL_CONSTASCII_USTRINGPARAM("LineCap")), sal_False))
+ if(EscherPropertyValueHelper::GetPropertyValue(aAny, rXPropSet, String(RTL_CONSTASCII_USTRINGPARAM("LineCap")), false))
{
::com::sun::star::drawing::LineCap aLineCap(com::sun::star::drawing::LineCap_BUTT);
@@ -1032,7 +1034,7 @@ void EscherPropertyContainer::CreateLine
}
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineStyle" ) ), sal_False ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineStyle" ) ), false ) )
{
::com::sun::star::drawing::LineStyle eLS;
if ( aAny >>= eLS )
@@ -1046,7 +1048,7 @@ void EscherPropertyContainer::CreateLine
case ::com::sun::star::drawing::LineStyle_DASH :
{
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineDash" ) ), sal_False ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineDash" ) ), false ) )
{
ESCHER_LineDashing eDash = ESCHER_LineSolid;
::com::sun::star::drawing::LineDash* pLineDash = (::com::sun::star::drawing::LineDash*)aAny.getValue();
@@ -1102,7 +1104,7 @@ void EscherPropertyContainer::CreateLine
}
}
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineColor" ) ), sal_False ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineColor" ) ), false ) )
{
sal_uInt32 nLineColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()) );
AddOpt( ESCHER_Prop_lineColor, nLineColor );
@@ -1111,7 +1113,7 @@ void EscherPropertyContainer::CreateLine
}
sal_uInt32 nLineSize = ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" ) ), sal_False ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" ) ), false ) )
? *((sal_uInt32*)aAny.getValue())
: 0;
if ( nLineSize > 1 )
@@ -1119,7 +1121,7 @@ void EscherPropertyContainer::CreateLine
ESCHER_LineJoin eLineJoin = ESCHER_LineJoinMiter;
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineJoint" ) ), sal_True ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineJoint" ) ), true ) )
{
::com::sun::star::drawing::LineJoint eLJ;
if ( aAny >>= eLJ )
@@ -1144,7 +1146,7 @@ void EscherPropertyContainer::CreateLine
AddOpt( ESCHER_Prop_lineJoinStyle, eLineJoin );
if ( EscherPropertyValueHelper::GetPropertyValue(
- aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineTransparence" ) ), sal_True ) )
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineTransparence" ) ), true ) )
{
sal_Int16 nTransparency = 0;
if ( aAny >>= nTransparency )
@@ -1152,7 +1154,7 @@ void EscherPropertyContainer::CreateLine
}
- if ( bEdge == sal_False )
+ if ( bEdge == false )
{
AddOpt( ESCHER_Prop_fFillOK, 0x1001 );
AddOpt( ESCHER_Prop_fNoFillHitTest, 0x100000 );
@@ -1170,7 +1172,7 @@ static Size lcl_SizeToEmu(Size aPrefSize
}
void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
- sal_uInt32 nBlibId, sal_Bool bCreateCroppingAttributes )
+ sal_uInt32 nBlibId, bool bCreateCroppingAttributes )
{
::com::sun::star::uno::Any aAny;
@@ -1226,11 +1228,11 @@ void EscherPropertyContainer::ImplCreate
if ( nPicFlags )
AddOpt( ESCHER_Prop_pictureActive, nPicFlags );
- if ( bCreateCroppingAttributes && pGraphicProvider )
+ if ( bCreateCroppingAttributes && mpGraphicProvider )
{
Size aPrefSize;
MapMode aPrefMapMode;
- if ( pGraphicProvider->GetPrefSize( nBlibId, aPrefSize, aPrefMapMode ) )
+ if ( mpGraphicProvider->GetPrefSize( nBlibId, aPrefSize, aPrefMapMode ) )
{
Size aCropSize(lcl_SizeToEmu(aPrefSize, aPrefMapMode));
if ( aCropSize.Width() && aCropSize.Height() )
@@ -1267,21 +1269,21 @@ void EscherPropertyContainer::ImplCreate
}
}
-sal_Bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
+bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
{
uno::Reference< beans::XPropertySet > aXPropSet( rXShape, uno::UNO_QUERY );
if ( aXPropSet.is() )
{
- sal_Bool bVal = false;
+ bool bVal(false);
::com::sun::star::uno::Any aAny;
sal_uInt32 nShapeAttr = 0;
- EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ), sal_True );
+ EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ), true );
if ( aAny >>= bVal )
{
if ( !bVal )
nShapeAttr |= 0x20002; // set fHidden = true
}
- EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Printable" ) ), sal_True );
+ EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Printable" ) ), true );
if ( aAny >>= bVal )
{
if ( !bVal )
@@ -1290,13 +1292,13 @@ sal_Bool EscherPropertyContainer::Create
if ( nShapeAttr )
AddOpt( ESCHER_Prop_fPrint, nShapeAttr );
}
- return sal_True;
+ return true;
}
-sal_Bool EscherPropertyContainer::CreateOLEGraphicProperties(
+bool EscherPropertyContainer::CreateOLEGraphicProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
{
- sal_Bool bRetValue = sal_False;
+ bool bRetValue(false);
if ( rXShape.is() )
{
@@ -1318,16 +1320,16 @@ sal_Bool EscherPropertyContainer::Create
return bRetValue;
}
-sal_Bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ,const GraphicObject& rGraphicObj )
+bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ,const GraphicObject& rGraphicObj )
{
- sal_Bool bRetValue = sal_False;
+ bool bRetValue(false);
ByteString aUniqueId( rGraphicObj.GetUniqueID() );
if ( aUniqueId.Len() )
{
AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
uno::Reference< beans::XPropertySet > aXPropSet( rXShape, uno::UNO_QUERY );
- if ( pGraphicProvider && pPicOutStrm && mpObjectRange && aXPropSet.is() )
+ if ( mpGraphicProvider && mpPicOutStrm && mpObjectRange && aXPropSet.is() )
{
::com::sun::star::uno::Any aAny;
::com::sun::star::awt::Rectangle* pVisArea = NULL;
@@ -1338,13 +1340,13 @@ sal_Bool EscherPropertyContainer::Create
}
const basegfx::B2DRange aRange(0.0, 0.0, mpObjectRange->getWidth(), mpObjectRange->getHeight());
- const sal_uInt32 nBlibId(pGraphicProvider->GetBlibID(*pPicOutStrm, aUniqueId, aRange, pVisArea, NULL));
+ const sal_uInt32 nBlibId(mpGraphicProvider->GetBlibID(*mpPicOutStrm, aUniqueId, aRange, pVisArea, NULL));
if ( nBlibId )
{
- AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
- ImplCreateGraphicAttributes( aXPropSet, nBlibId, sal_False );
- bRetValue = sal_True;
+ AddOpt( ESCHER_Prop_pib, nBlibId, true );
+ ImplCreateGraphicAttributes( aXPropSet, nBlibId, false );
+ bRetValue = true;
}
delete pVisArea;
}
@@ -1352,7 +1354,7 @@ sal_Bool EscherPropertyContainer::Create
// TTTT: Check if this works; not sure if this is correct and on the correct place
// pShapeBoundRect -> mpObjectRange
//
- //if ( pGraphicProvider && pPicOutStrm && pShapeBoundRect && aXPropSet.is() )
+ //if ( mpGraphicProvider && mpPicOutStrm && pShapeBoundRect && aXPropSet.is() )
//{
// ::com::sun::star::uno::Any aAny;
// ::com::sun::star::awt::Rectangle* pVisArea = NULL;
@@ -1362,12 +1364,12 @@ sal_Bool EscherPropertyContainer::Create
// aAny >>= (*pVisArea);
// }
// Rectangle aRect( Point( 0, 0 ), pShapeBoundRect->GetSize() );
- // sal_uInt32 nBlibId = pGraphicProvider->GetBlibID( *pPicOutStrm, aUniqueId, aRect, pVisArea, NULL );
+ // sal_uInt32 nBlibId = mpGraphicProvider->GetBlibID( *mpPicOutStrm, aUniqueId, aRect, pVisArea, NULL );
// if ( nBlibId )
// {
- // AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
- // ImplCreateGraphicAttributes( aXPropSet, nBlibId, sal_False );
- // bRetValue = sal_True;
+ // AddOpt( ESCHER_Prop_pib, nBlibId, true );
+ // ImplCreateGraphicAttributes( aXPropSet, nBlibId, false );
+ // bRetValue = true;
// }
// delete pVisArea;
//}
@@ -1375,10 +1377,10 @@ sal_Bool EscherPropertyContainer::Create
return bRetValue;
}
-sal_Bool EscherPropertyContainer::CreateMediaGraphicProperties(
+bool EscherPropertyContainer::CreateMediaGraphicProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
{
- sal_Bool bRetValue = sal_False;
+ bool bRetValue(false);
if ( rXShape.is() )
{
// SJ: leaving unoapi, because currently there is no access to the native graphic object
@@ -1393,7 +1395,7 @@ sal_Bool EscherPropertyContainer::Create
return bRetValue;
}
-sal_Bool EscherPropertyContainer::ImplCreateEmbeddedBmp( const ByteString& rUniqueId )
+bool EscherPropertyContainer::ImplCreateEmbeddedBmp( const ByteString& rUniqueId )
{
if( rUniqueId.Len() > 0 )
{
@@ -1405,20 +1407,20 @@ sal_Bool EscherPropertyContainer::ImplCr
{
// grab BLIP from stream and insert directly as complex property
// ownership of stream memory goes to complex property
- aMemStrm.ObjectOwnsMemory( sal_False );
+ aMemStrm.ObjectOwnsMemory( false );
sal_uInt8* pBuf = (sal_uInt8*) aMemStrm.GetData();
sal_uInt32 nSize = aMemStrm.Seek( STREAM_SEEK_TO_END );
- AddOpt( ESCHER_Prop_fillBlip, sal_True, nSize, pBuf, nSize );
- return sal_True;
+ AddOpt( ESCHER_Prop_fillBlip, true, nSize, pBuf, nSize );
+ return true;
}
}
- return sal_False;
+ return false;
}
-sal_Bool EscherPropertyContainer::CreateEmbeddedBitmapProperties(
+bool EscherPropertyContainer::CreateEmbeddedBitmapProperties(
const ::rtl::OUString& rBitmapUrl, ::com::sun::star::drawing::BitmapMode eBitmapMode )
{
- sal_Bool bRetValue = sal_False;
+ bool bRetValue(false);
String aVndUrl( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) );
String aBmpUrl( rBitmapUrl );
xub_StrLen nIndex = aBmpUrl.Search( aVndUrl, 0 );
@@ -1499,28 +1501,27 @@ GraphicObject lclDrawHatch(
} // namespace
-sal_Bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::sun::star::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground )
+bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::sun::star::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground )
{
const basegfx::B2DRange aRange(mpObjectRange ? *mpObjectRange : basegfx::B2DRange(0.0, 0.0, 28000.0, 21000.0));
GraphicObject aGraphicObject = lclDrawHatch(rHatch, rBackColor, bFillBackground, aRange);
ByteString aUniqueId = aGraphicObject.GetUniqueID();
- sal_Bool bRetValue = ImplCreateEmbeddedBmp( aUniqueId );
+ bool bRetValue = ImplCreateEmbeddedBmp( aUniqueId );
if ( bRetValue )
AddOpt( ESCHER_Prop_fillType, ESCHER_FillTexture );
return bRetValue;
}
-sal_Bool EscherPropertyContainer::CreateGraphicProperties(
+bool EscherPropertyContainer::CreateGraphicProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
- const String& rSource, const sal_Bool bCreateFillBitmap, const sal_Bool bCreateCroppingAttributes,
- const sal_Bool bFillBitmapModeAllowed )
+ const String& rSource, const bool bCreateFillBitmap, const bool bCreateCroppingAttributes,
+ const bool bFillBitmapModeAllowed )
{
- sal_Bool bRetValue = sal_False;
- sal_Bool bCreateFillStyles = sal_False;
-
- sal_Bool bMirrored = sal_False;
- sal_Bool bRotate = sal_True;
+ bool bRetValue(false);
+ bool bCreateFillStyles(false);
+ bool bMirrored(false);
+ bool bRotate(true);
sal_uInt16 nAngle = 0;
GraphicAttr* pGraphicAttr = NULL;
GraphicObject aGraphicObject;
@@ -1546,7 +1547,7 @@ sal_Bool EscherPropertyContainer::Create
sal_uInt32 nAryLen = aSeq.getLength();
// the metafile is already rotated
- bRotate = sal_False;
+ bRotate = false;
if ( pAry && nAryLen )
{
@@ -1584,7 +1585,7 @@ sal_Bool EscherPropertyContainer::Create
else if ( rSource == String( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ) )
{
aGraphicUrl = *(::rtl::OUString*)aAny.getValue();
- bCreateFillStyles = sal_True;
+ bCreateFillStyles = true;
}
else if ( rSource == String( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" ) ) )
{
@@ -1593,13 +1594,13 @@ sal_Bool EscherPropertyContainer::Create
{
Color aBackColor;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ), sal_False ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ), false ) )
{
- aBackColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()), sal_False );
+ aBackColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()), false );
}
bool bFillBackground = false;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "FillBackground" ) ), sal_True ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "FillBackground" ) ), true ) )
{
aAny >>= bFillBackground;
}
@@ -1614,7 +1615,7 @@ sal_Bool EscherPropertyContainer::Create
}
}
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsMirrored" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsMirrored" ) ), true ) )
aAny >>= bMirrored;
// #121074# transparency of graphic is not supported in MS formats, get and apply it
@@ -1646,13 +1647,13 @@ sal_Bool EscherPropertyContainer::Create
if ( bCreateFillBitmap && bFillBitmapModeAllowed )
{
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapMode" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapMode" ) ), true ) )
aAny >>= eBitmapMode;
}
else
{
nAngle = bRotate && EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) ), sal_True )
+ String( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) ), true )
? (sal_uInt16)( ( *((sal_Int32*)aAny.getValue() ) ) + 5 ) / 10
: 0;
}
@@ -1710,9 +1711,9 @@ sal_Bool EscherPropertyContainer::Create
}
if ( !aUniqueId.Len() )
{
- if ( pGraphicProvider )
+ if ( mpGraphicProvider )
{
- const rtl::OUString& rBaseURI( pGraphicProvider->GetBaseURI() );
+ const rtl::OUString& rBaseURI( mpGraphicProvider->GetBaseURI() );
INetURLObject aBaseURI( rBaseURI );
if( aBaseURI.GetProtocol() == aTmp.GetProtocol() )
{
@@ -1773,32 +1774,32 @@ sal_Bool EscherPropertyContainer::Create
{
sal_Int32 nSizeX = 0,nSizeY = 0,nOffsetX = 0,nOffsetY = 0,nPosOffsetX = 0,nPosOffsetY = 0;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapSizeX" ) ), sal_True ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapSizeX" ) ), true ) )
{
aAny >>= nSizeX;
}
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapSizeY" ) ), sal_True ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapSizeY" ) ), true ) )
{
aAny >>= nSizeY;
}
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapOffsetX" ) ), sal_True ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapOffsetX" ) ), true ) )
{
aAny >>= nOffsetX;
}
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapOffsetY" ) ), sal_True ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapOffsetY" ) ), true ) )
{
aAny >>= nOffsetY;
}
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapPositionOffsetX" ) ), sal_True ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapPositionOffsetX" ) ), true ) )
{
aAny >>= nPosOffsetX;
}
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapPositionOffsetY" ) ), sal_True ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapPositionOffsetY" ) ), true ) )
{
aAny >>= nPosOffsetY;
}
@@ -1813,24 +1814,24 @@ sal_Bool EscherPropertyContainer::Create
if(aUniqueId.Len() && mpObjectRange)
{
// write out embedded graphic
- if(pGraphicProvider && pPicOutStrm)
+ if(mpGraphicProvider && mpPicOutStrm)
{
const basegfx::B2DRange aRange(0.0, 0.0, mpObjectRange->getWidth(), mpObjectRange->getHeight());
- const sal_uInt32 nBlibId(pGraphicProvider->GetBlibID(*pPicOutStrm, aUniqueId, aRange, NULL, pGraphicAttr));
+ const sal_uInt32 nBlibId(mpGraphicProvider->GetBlibID(*mpPicOutStrm, aUniqueId, aRange, NULL, pGraphicAttr));
if ( nBlibId )
{
if(bCreateFillBitmap)
{
- AddOpt(ESCHER_Prop_fillBlip, nBlibId, sal_True);
+ AddOpt(ESCHER_Prop_fillBlip, nBlibId, true);
}
else
{
- AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
+ AddOpt( ESCHER_Prop_pib, nBlibId, true );
ImplCreateGraphicAttributes( rXPropSet, nBlibId, bCreateCroppingAttributes );
}
- bRetValue = sal_True;
+ bRetValue = true;
}
}
else
@@ -1843,11 +1844,11 @@ sal_Bool EscherPropertyContainer::Create
{
// grab BLIP from stream and insert directly as complex property
// ownership of stream memory goes to complex property
- aMemStrm.ObjectOwnsMemory( sal_False );
+ aMemStrm.ObjectOwnsMemory( false );
sal_uInt8* pBuf = (sal_uInt8*) aMemStrm.GetData();
sal_uInt32 nSize = aMemStrm.Seek( STREAM_SEEK_TO_END );
- AddOpt( ESCHER_Prop_fillBlip, sal_True, nSize, pBuf, nSize );
- bRetValue = sal_True;
+ AddOpt( ESCHER_Prop_fillBlip, true, nSize, pBuf, nSize );
+ bRetValue = true;
}
}
}
@@ -1866,7 +1867,7 @@ sal_Bool EscherPropertyContainer::Create
}
delete pGraphicAttr;
if ( bCreateFillStyles )
- CreateFillProperties( rXPropSet, sal_True );
+ CreateFillProperties( rXPropSet, true );
return bRetValue;
}
@@ -1884,11 +1885,11 @@ PolyPolygon EscherPropertyContainer::Get
if ( aAny >>= aXPropSet )
{
- sal_Bool bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygonBezier, sal_True );
+ bool bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygonBezier, true );
if ( !bHasProperty )
- bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygon, sal_True );
+ bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygon, true );
if ( !bHasProperty )
- bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolygon, sal_True );
+ bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolygon, true );
if ( bHasProperty )
aRetPolyPoly = GetPolyPolygon( aAny );
}
@@ -1897,7 +1898,7 @@ PolyPolygon EscherPropertyContainer::Get
PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno::Any& rAny )
{
- sal_Bool bNoError = sal_True;
+ bool bNoError(true);
Polygon aPolygon;
PolyPolygon aPolyPolygon;
@@ -2017,18 +2018,18 @@ PolyPolygon EscherPropertyContainer::Get
return aPolyPolygon;
}
-sal_Bool EscherPropertyContainer::CreatePolygonProperties(
+bool EscherPropertyContainer::CreatePolygonProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
sal_uInt32 nFlags,
- sal_Bool bBezier,
+ bool bBezier,
::com::sun::star::awt::Rectangle& rGeoRect,
Polygon* pPolygon )
{
static String sPolyPolygonBezier( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygonBezier" ) );
static String sPolyPolygon ( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygon" ) );
- sal_Bool bRetValue = sal_True;
- sal_Bool bLine = ( nFlags & ESCHER_CREATEPOLYGON_LINE ) != 0;
+ bool bRetValue(true);
+ bool bLine(nFlags & ESCHER_CREATEPOLYGON_LINE);
PolyPolygon aPolyPolygon;
@@ -2038,7 +2039,7 @@ sal_Bool EscherPropertyContainer::Create
{
::com::sun::star::uno::Any aAny;
bRetValue = EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- ( bBezier ) ? sPolyPolygonBezier : sPolyPolygon, sal_True );
+ ( bBezier ) ? sPolyPolygonBezier : sPolyPolygon, true );
if ( bRetValue )
{
aPolyPolygon = GetPolyPolygon( aAny );
@@ -2059,7 +2060,7 @@ sal_Bool EscherPropertyContainer::Create
rPoly[ 1 ].Y() - rPoly[ 0 ].Y() );
}
else
- bRetValue = sal_False;
+ bRetValue = false;
}
else
{
@@ -2159,8 +2160,8 @@ sal_Bool EscherPropertyContainer::Create
AddOpt( ESCHER_Prop_geoBottom, rGeoRect.Height );
AddOpt( ESCHER_Prop_shapePath, ESCHER_ShapeComplex );
- AddOpt( ESCHER_Prop_pVertices, sal_True, nVerticesBufSize - 6, (sal_uInt8*)pVerticesBuf, nVerticesBufSize );
- AddOpt( ESCHER_Prop_pSegmentInfo, sal_True, nSegmentBufSize, (sal_uInt8*)pSegmentBuf, nSegmentBufSize );
+ AddOpt( ESCHER_Prop_pVertices, true, nVerticesBufSize - 6, (sal_uInt8*)pVerticesBuf, nVerticesBufSize );
+ AddOpt( ESCHER_Prop_pSegmentInfo, true, nSegmentBufSize, (sal_uInt8*)pSegmentBuf, nSegmentBufSize );
}
}
return bRetValue;
@@ -2216,7 +2217,7 @@ sal_Int32 lcl_GetConnectorAdjustValue (
if ( aEnd.X() == aStart.X() )
aEnd.X() = aStart.X() +4;
- sal_Bool bVertical = ( rPoly[1].X()-aStart.X() ) == 0 ;
+ bool bVertical((0 == rPoly[1].X() - aStart.X()));
//vertical and horizon alternate
if ( nIndex%2 == 1 ) bVertical = !bVertical;
aPt = rPoly[ nIndex + 1];
@@ -2271,7 +2272,7 @@ void lcl_Rotate(sal_Int32 nAngle, Point
Generally, draw the connector from top to bottom, from left to right when meet the adjust value,
but when (X1>X2 or Y1>Y2),the draw director must be reverse, FlipV or FlipH should be set to true.
*/
-sal_Bool lcl_GetAngle(Polygon &rPoly,sal_uInt16& rShapeFlags,sal_Int32& nAngle )
+bool lcl_GetAngle(Polygon &rPoly,sal_uInt16& rShapeFlags,sal_Int32& nAngle )
{
Point aStart = rPoly[0];
Point aEnd = rPoly[rPoly.GetSize()-1];
@@ -2312,11 +2313,11 @@ sal_Bool lcl_GetAngle(Polygon &rPoly,sal
nAngle *= 655;
nAngle += 0x8000;
nAngle &=~0xffff; // nAngle auf volle Gradzahl runden
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-sal_Bool EscherPropertyContainer::CreateConnectorProperties(
+bool EscherPropertyContainer::CreateConnectorProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape,
EscherSolverContainer& rSolverContainer, ::com::sun::star::awt::Rectangle& rGeoRect,
sal_uInt16& rShapeType, sal_uInt16& rShapeFlags )
@@ -2327,7 +2328,7 @@ sal_Bool EscherPropertyContainer::Create
static String sEdgeStartConnection ( RTL_CONSTASCII_USTRINGPARAM( "EdgeStartConnection" ) );
static String sEdgeEndConnection ( RTL_CONSTASCII_USTRINGPARAM( "EdgeEndConnection" ) );
static String sEdgePath ( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygonBezier") );
- sal_Bool bRetValue = sal_False;
+ bool bRetValue(false);
rShapeType = rShapeFlags = 0;
if ( rXShape.is() )
@@ -2338,7 +2339,7 @@ sal_Bool EscherPropertyContainer::Create
::com::sun::star::uno::Any aAny( rXShape->queryInterface( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >*) 0 ) ));
if ( aAny >>= aXPropSet )
{
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeKind, sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeKind, true ) )
{
::com::sun::star::drawing::ConnectorType eCt;
aAny >>= eCt;
@@ -2424,7 +2425,7 @@ sal_Bool EscherPropertyContainer::Create
rShapeType = ( sal_uInt16 )( ESCHER_ShpInst_BentConnector2 + nAdjCount);
for ( sal_Int32 i = 0 ; i < nAdjCount; ++ i)
AddOpt( (sal_uInt16) ( ESCHER_Prop_adjustValue+i) , lcl_GetConnectorAdjustValue( aPoly, i ) );
- bRetValue = sal_True;
+ bRetValue = true;
}
sal_Int32 nAngle=0;
if (lcl_GetAngle(aPoly,rShapeFlags,nAngle ))
@@ -2448,8 +2449,8 @@ sal_Bool EscherPropertyContainer::Create
}
break;
}
- CreateLineProperties( aXPropSet, sal_False );
- bRetValue = sal_True;
+ CreateLineProperties( aXPropSet, false );
+ bRetValue = true;
}
}
}
@@ -2458,12 +2459,12 @@ sal_Bool EscherPropertyContainer::Create
return bRetValue;
}
-sal_Bool EscherPropertyContainer::CreateShadowProperties(
+bool EscherPropertyContainer::CreateShadowProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet )
{
::com::sun::star::uno::Any aAny;
- sal_Bool bHasShadow = sal_False; // shadow is possible only if at least a fillcolor, linecolor or graphic is set
+ bool bHasShadow(false); // shadow is possible only if at least a fillcolor, linecolor or graphic is set
sal_uInt32 nLineFlags = 0; // default : shape has no line
sal_uInt32 nFillFlags = 0x10; // shape is filled
@@ -2477,7 +2478,7 @@ sal_Bool EscherPropertyContainer::Create
if ( ( nLineFlags & 8 ) || ( nFillFlags & 0x10 ) || bGraphic )
{
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "Shadow" ) ), sal_True ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "Shadow" ) ), true ) )
{
if ( aAny >>= bHasShadow )
{
@@ -2485,16 +2486,16 @@ sal_Bool EscherPropertyContainer::Create
{
nShadowFlags |= 2;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "ShadowColor" ) ), sal_False ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "ShadowColor" ) ), false ) )
AddOpt( ESCHER_Prop_shadowColor, ImplGetColor( *((sal_uInt32*)aAny.getValue()) ) );
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "ShadowXDistance" ) ), sal_False ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "ShadowXDistance" ) ), false ) )
AddOpt( ESCHER_Prop_shadowOffsetX, *((sal_Int32*)aAny.getValue()) * 360 );
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "ShadowYDistance" ) ), sal_False ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "ShadowYDistance" ) ), false ) )
AddOpt( ESCHER_Prop_shadowOffsetY, *((sal_Int32*)aAny.getValue()) * 360 );
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "ShadowTransparence" ) ), sal_False ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "ShadowTransparence" ) ), false ) )
AddOpt( ESCHER_Prop_shadowOpacity, 0x10000 - (((sal_uInt32)*((sal_uInt16*)aAny.getValue())) * 655 ) );
}
}
@@ -2507,7 +2508,7 @@ sal_Bool EscherPropertyContainer::Create
// ---------------------------------------------------------------------------------------------
sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( const ::com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter,
- const std::vector< sal_Int32 >& rEquationOrder, sal_Bool bAdjustTrans )
+ const std::vector< sal_Int32 >& rEquationOrder, bool bAdjustTrans )
{
sal_Int32 nValue = 0;
if ( rParameter.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
@@ -2536,7 +2537,7 @@ sal_Int32 EscherPropertyContainer::GetVa
if(bAdjustTrans)
{
sal_uInt32 nAdjustValue = 0;
- sal_Bool bGot = GetOpt((sal_uInt16)( DFF_Prop_adjustValue + nValue ), nAdjustValue);
+ bool bGot = GetOpt((sal_uInt16)( DFF_Prop_adjustValue + nValue ), nAdjustValue);
if(bGot) nValue = (sal_Int32)nAdjustValue;
}
}
@@ -2555,9 +2556,9 @@ sal_Int32 EscherPropertyContainer::GetVa
return nValue;
}
-sal_Bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter )
+bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter )
{
- sal_Bool bSpecial = sal_False;
+ bool bSpecial(false);
nRetValue = 0;
if ( rParameter.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
{
@@ -2573,27 +2574,27 @@ sal_Bool GetValueForEnhancedCustomShapeH
case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION :
{
nRetValue += 3;
- bSpecial = sal_True;
+ bSpecial = true;
}
break;
case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT :
{
nRetValue += 0x100;
- bSpecial = sal_True;
+ bSpecial = true;
}
break;
case com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP :
case com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT :
{
nRetValue = 0;
- bSpecial = sal_True;
+ bSpecial = true;
}
break;
case com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT :
case com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM :
{
nRetValue = 1;
- bSpecial = sal_True;
+ bSpecial = true;
}
break;
case com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL :
@@ -2674,9 +2675,9 @@ void ConvertEnhancedCustomShapeEquation(
}
}
-sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape , const MSO_SPT eShapeType )
+bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape , const MSO_SPT eShapeType )
{
- sal_Bool bIsDefaultObject = sal_False;
+ bool bIsDefaultObject(false);
switch(eShapeType)
{
//if the custom shape is not default shape of ppt, return sal_Fasle;
@@ -2698,7 +2699,7 @@ sal_Bool EscherPropertyContainer::IsDefa
&& pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_STRETCHY )
// && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_HANDLES )
&& pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_TEXTFRAMES ) )
- bIsDefaultObject = sal_True;
+ bIsDefaultObject = true;
}
return bIsDefaultObject;
@@ -2722,12 +2723,12 @@ void EscherPropertyContainer::LookForPol
}
}
-sal_Bool EscherPropertyContainer::GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue )
+bool EscherPropertyContainer::GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue )
{
if ( rkProp.State != beans::PropertyState_DIRECT_VALUE )
- return sal_False;
+ return false;
- sal_Bool bUseFixedFloat = ( nAdjustmentsWhichNeedsToBeConverted & ( 1 << nIndex ) ) != 0;
+ bool bUseFixedFloat(nAdjustmentsWhichNeedsToBeConverted & (1 << nIndex));
if ( rkProp.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
{
double fValue(0.0);
@@ -2743,7 +2744,7 @@ sal_Bool EscherPropertyContainer::GetAdj
nValue <<= 16;
}
- return sal_True;
+ return true;
}
void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeType, const uno::Reference< drawing::XShape > & rXShape )
@@ -2771,8 +2772,8 @@ void EscherPropertyContainer::CreateCust
const beans::PropertyValue* pPathCoordinatesProp = NULL;
sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
uno::Sequence< beans::PropertyValues > aHandlesPropSeq;
- sal_Bool bPredefinedHandlesUsed = sal_True;
- sal_Bool bIsDefaultObject = IsDefaultObject( pCustoShape , eShapeType);
+ bool bPredefinedHandlesUsed(true);
+ bool bIsDefaultObject(IsDefaultObject(pCustoShape, eShapeType));
// convert property "Equations" into std::vector< EnhancedCustomShapeEquationEquation >
std::vector< EnhancedCustomShapeEquation > aEquations;
@@ -3101,7 +3102,7 @@ void EscherPropertyContainer::CreateCust
nLightFaceFlags |= 2;
uno::Any aFillColor2;
if ( EscherPropertyValueHelper::GetPropertyValue( aFillColor2, aXPropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "FillColor2" ) ), sal_True ) )
+ String( RTL_CONSTASCII_USTRINGPARAM( "FillColor2" ) ), true ) )
{
sal_uInt32 nFillColor = ImplGetColor( *((sal_uInt32*)aFillColor2.getValue()) );
AddOpt( DFF_Prop_c3DExtrusionColor, nFillColor );
@@ -3144,12 +3145,12 @@ void EscherPropertyContainer::CreateCust
}
sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
memcpy( pBuf, aOut.GetData(), nStreamSize );
- AddOpt( DFF_Prop_pFormulas, sal_True, nStreamSize - 6, pBuf, nStreamSize );
+ AddOpt( DFF_Prop_pFormulas, true, nStreamSize - 6, pBuf, nStreamSize );
}
else
{
sal_uInt8* pBuf = new sal_uInt8[ 1 ];
- AddOpt( DFF_Prop_pFormulas, sal_True, 0, pBuf, 0 );
+ AddOpt( DFF_Prop_pFormulas, true, 0, pBuf, 0 );
}
}
}
@@ -3245,12 +3246,12 @@ void EscherPropertyContainer::CreateCust
}
sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
memcpy( pBuf, aOut.GetData(), nStreamSize );
- AddOpt( DFF_Prop_connectorPoints, sal_True, nStreamSize - 6, pBuf, nStreamSize ); // -6
+ AddOpt( DFF_Prop_connectorPoints, true, nStreamSize - 6, pBuf, nStreamSize ); // -6
}
else
{
sal_uInt8* pBuf = new sal_uInt8[ 1 ];
- AddOpt( DFF_Prop_connectorPoints, sal_True, 0, pBuf, 0 );
+ AddOpt( DFF_Prop_connectorPoints, true, 0, pBuf, 0 );
}
}
}
@@ -3366,12 +3367,12 @@ void EscherPropertyContainer::CreateCust
}
sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
memcpy( pBuf, aOut.GetData(), nStreamSize );
- AddOpt( DFF_Prop_pSegmentInfo, sal_False, nStreamSize - 6, pBuf, nStreamSize );
+ AddOpt( DFF_Prop_pSegmentInfo, false, nStreamSize - 6, pBuf, nStreamSize );
}
else
{
sal_uInt8* pBuf = new sal_uInt8[ 1 ];
- AddOpt( DFF_Prop_pSegmentInfo, sal_True, 0, pBuf, 0 );
+ AddOpt( DFF_Prop_pSegmentInfo, true, 0, pBuf, 0 );
}
}
}
@@ -3424,12 +3425,12 @@ void EscherPropertyContainer::CreateCust
}
sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
memcpy( pBuf, aOut.GetData(), nStreamSize );
- AddOpt( DFF_Prop_textRectangles, sal_True, nStreamSize - 6, pBuf, nStreamSize );
+ AddOpt( DFF_Prop_textRectangles, true, nStreamSize - 6, pBuf, nStreamSize );
}
else
{
sal_uInt8* pBuf = new sal_uInt8[ 1 ];
- AddOpt( DFF_Prop_textRectangles, sal_True, 0, pBuf, 0 );
+ AddOpt( DFF_Prop_textRectangles, true, 0, pBuf, 0 );
}
}
}
@@ -3535,7 +3536,7 @@ void EscherPropertyContainer::CreateCust
AddOpt( DFF_Prop_gtextFont, aFontName );
sal_Int16 nCharScaleWidth = 100;
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharScaleWidth" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharScaleWidth" ) ), true ) )
{
if ( aAny >>= nCharScaleWidth )
{
@@ -3546,7 +3547,7 @@ void EscherPropertyContainer::CreateCust
}
}
}
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ), true ) )
{
float fCharHeight = 0.0;
if ( aAny >>= fCharHeight )
@@ -3555,7 +3556,7 @@ void EscherPropertyContainer::CreateCust
AddOpt(ESCHER_Prop_gtextSize, nTextSize);
}
}
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharKerning" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharKerning" ) ), true ) )
{
sal_Int16 nCharKerning = sal_Int16();
if ( aAny >>= nCharKerning )
@@ -3567,7 +3568,7 @@ void EscherPropertyContainer::CreateCust
nTextPathFlags &=~0x1000;
}
}
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ), true ) )
{
awt::FontSlant eFontSlant;
if ( aAny >>= eFontSlant )
@@ -3579,7 +3580,7 @@ void EscherPropertyContainer::CreateCust
nTextPathFlags &=~0x10;
}
}
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ), true ) )
{
float fFontWidth = 0;
if ( aAny >>= fFontWidth )
@@ -3592,7 +3593,7 @@ void EscherPropertyContainer::CreateCust
}
}
//export gTextAlign attr
- if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) ), sal_True ) )
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) ), true ) )
{
MSO_GeoTextAlign gTextAlign = mso_alignTextCenter;
// SdrFitToSizeType eFTS( ((SdrTextFitToSizeTypeItem&)pCustoShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE )).GetValue() );
@@ -3642,7 +3643,7 @@ void EscherPropertyContainer::CreateCust
{
if ( !bIsDefaultObject )
{
- bPredefinedHandlesUsed = sal_False;
+ bPredefinedHandlesUsed = false;
if ( rProp.Value >>= aHandlesPropSeq )
{
sal_uInt16 nElements = (sal_uInt16)aHandlesPropSeq.getLength();
@@ -3831,12 +3832,12 @@ void EscherPropertyContainer::CreateCust
}
sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
memcpy( pBuf, aOut.GetData(), nStreamSize );
- AddOpt( DFF_Prop_Handles, sal_True, nStreamSize - 6, pBuf, nStreamSize );
+ AddOpt( DFF_Prop_Handles, true, nStreamSize - 6, pBuf, nStreamSize );
}
else
{
sal_uInt8* pBuf = new sal_uInt8[ 1 ];
- AddOpt( DFF_Prop_Handles, sal_True, 0, pBuf, 0 );
+ AddOpt( DFF_Prop_Handles, true, 0, pBuf, 0 );
}
}
}
@@ -3879,19 +3880,19 @@ void EscherPropertyContainer::CreateCust
<< nElementSize;
for( j = 0; j < nElements; j++ )
{
- sal_Int32 X = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].First, aEquationOrder, sal_True );
- sal_Int32 Y = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].Second, aEquationOrder, sal_True );
+ sal_Int32 X = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].First, aEquationOrder, true );
+ sal_Int32 Y = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].Second, aEquationOrder, true );
aOut << X
<< Y;
}
sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
memcpy( pBuf, aOut.GetData(), nStreamSize );
- AddOpt( DFF_Prop_pVertices, sal_True, nStreamSize - 6, pBuf, nStreamSize ); // -6
+ AddOpt( DFF_Prop_pVertices, true, nStreamSize - 6, pBuf, nStreamSize ); // -6
}
else
{
sal_uInt8* pBuf = new sal_uInt8[ 1 ];
- AddOpt( DFF_Prop_pVertices, sal_True, 0, pBuf, 0 );
+ AddOpt( DFF_Prop_pVertices, true, 0, pBuf, 0 );
}
}
}
@@ -3950,7 +3951,7 @@ MSO_SPT EscherPropertyContainer::GetCust
// ---------------------------------------------------------------------------------------------
//Implement for form control export
-sal_Bool EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape)
+bool EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape)
{
SdrObject* pShape = GetSdrObjectFromXShape( rXShape );
if ( pShape )
@@ -3960,22 +3961,22 @@ sal_Bool EscherPropertyContainer::Crea
ByteString aUniqueId = aGraphicObject.GetUniqueID();
if ( aUniqueId.Len() )
{
- if(pGraphicProvider && pPicOutStrm && mpObjectRange)
+ if(mpGraphicProvider && mpPicOutStrm && mpObjectRange)
{
const basegfx::B2DRange aRange(0.0, 0.0, mpObjectRange->getWidth(), mpObjectRange->getHeight());
- const sal_uInt32 nBlibId(pGraphicProvider->GetBlibID(*pPicOutStrm, aUniqueId, aRange, NULL));
+ const sal_uInt32 nBlibId(mpGraphicProvider->GetBlibID(*mpPicOutStrm, aUniqueId, aRange, NULL));
if ( nBlibId )
{
- AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
- ImplCreateGraphicAttributes( rXPropSet, nBlibId, sal_False );
- return sal_True;
+ AddOpt( ESCHER_Prop_pib, nBlibId, true );
+ ImplCreateGraphicAttributes( rXPropSet, nBlibId, false );
+ return true;
}
}
}
}
- return sal_False;
+ return false;
}
@@ -3993,14 +3994,14 @@ EscherPersistTable::~EscherPersistTable(
// ---------------------------------------------------------------------------------------------
-sal_Bool EscherPersistTable::PtIsID( sal_uInt32 nID )
+bool EscherPersistTable::PtIsID( sal_uInt32 nID )
{
for ( void* pPtr = maPersistTable.First(); pPtr; pPtr = maPersistTable.Next() )
{
if ( ((EscherPersistEntry*)pPtr)->mnID == nID )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// ---------------------------------------------------------------------------------------------
@@ -4070,16 +4071,16 @@ sal_uInt32 EscherPersistTable::PtReplace
return 0;
}
-sal_Bool EscherPropertyValueHelper::GetPropertyValue(
+bool EscherPropertyValueHelper::GetPropertyValue(
::com::sun::star::uno::Any& rAny,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
const String& rString,
- sal_Bool bTestPropertyAvailability )
+ bool bTestPropertyAvailability )
{
- sal_Bool bRetValue = sal_True;
+ bool bRetValue(true);
if ( bTestPropertyAvailability )
{
- bRetValue = sal_False;
+ bRetValue = false;
try
{
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
@@ -4089,7 +4090,7 @@ sal_Bool EscherPropertyValueHelper::GetP
}
catch( ::com::sun::star::uno::Exception& )
{
- bRetValue = sal_False;
+ bRetValue = false;
}
}
if ( bRetValue )
@@ -4098,11 +4099,11 @@ sal_Bool EscherPropertyValueHelper::GetP
{
rAny = rXPropSet->getPropertyValue( rString );
if ( !rAny.hasValue() )
- bRetValue = sal_False;
+ bRetValue = false;
}
catch( ::com::sun::star::uno::Exception& )
{
- bRetValue = sal_False;
+ bRetValue = false;
}
}
return bRetValue;
@@ -4140,7 +4141,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uI
mnSizeExtra ( 0 ),
maPrefSize ( rObject.GetPrefSize() ),
maPrefMapMode ( rObject.GetPrefMapMode() ),
- mbIsEmpty ( sal_True )
+ mbIsEmpty ( true )
{
mbIsNativeGraphicPossible = ( pGraphicAttr == NULL );
meBlibType = UNKNOWN;
@@ -4177,12 +4178,12 @@ EscherBlibEntry::EscherBlibEntry( sal_uI
<< pGraphicAttr->GetChannelG()
<< pGraphicAttr->GetChannelB()
<< pGraphicAttr->GetGamma()
- << (sal_Bool)( pGraphicAttr->IsInvert() == sal_True )
+ << static_cast< sal_Bool >(pGraphicAttr->IsInvert())
<< pGraphicAttr->GetTransparency();
mnIdentifier[ 1 ] = rtl_crc32( 0, aSt.GetData(), aSt.Tell() );
}
else
- mbIsNativeGraphicPossible = sal_True;
+ mbIsNativeGraphicPossible = true;
}
sal_uInt32 i, nTmp, n1, n2;
n1 = n2 = 0;
@@ -4197,13 +4198,13 @@ EscherBlibEntry::EscherBlibEntry( sal_uI
}
mnIdentifier[ 2 ] = n1;
mnIdentifier[ 3 ] = n2;
- mbIsEmpty = sal_False;
+ mbIsEmpty = false;
}
};
// ---------------------------------------------------------------------------------------------
-void EscherBlibEntry::WriteBlibEntry( SvStream& rSt, sal_Bool bWritePictureOffset, sal_uInt32 nResize )
+void EscherBlibEntry::WriteBlibEntry( SvStream& rSt, bool bWritePictureOffset, sal_uInt32 nResize )
{
sal_uInt32 nPictureOffset = ( bWritePictureOffset ) ? mnPictureOffset : 0;
@@ -4237,14 +4238,14 @@ EscherBlibEntry::~EscherBlibEntry()
// ---------------------------------------------------------------------------------------------
-sal_Bool EscherBlibEntry::operator==( const EscherBlibEntry& rEscherBlibEntry ) const
+bool EscherBlibEntry::operator==( const EscherBlibEntry& rEscherBlibEntry ) const
{
for ( int i = 0; i < 3; i++ )
{
if ( mnIdentifier[ i ] != rEscherBlibEntry.mnIdentifier[ i ] )
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
// ---------------------------------------------------------------------------------------------
@@ -4302,13 +4303,13 @@ sal_uInt32 EscherGraphicProvider::GetBli
return nSize;
}
-sal_Bool EscherGraphicProvider::WriteBlibStoreEntry(SvStream& rSt,
- sal_uInt32 nBlipId, sal_Bool bWritePictureOffSet, sal_uInt32 nResize)
+bool EscherGraphicProvider::WriteBlibStoreEntry(SvStream& rSt,
+ sal_uInt32 nBlipId, bool bWritePictureOffSet, sal_uInt32 nResize)
{
if (nBlipId > mnBlibEntrys || nBlipId == 0)
- return sal_False;
+ return false;
mpBlibEntrys[nBlipId-1]->WriteBlibEntry(rSt, bWritePictureOffSet, nResize);
- return sal_True;
+ return true;
}
void EscherGraphicProvider::WriteBlibStoreContainer( SvStream& rSt, SvStream* pMergePicStreamBSE )
@@ -4331,7 +4332,7 @@ void EscherGraphicProvider::WriteBlibSto
ESCHER_BlibType nBlibType = pBlibEntry->meBlibType;
nBlipSize = pBlibEntry->mnSize + pBlibEntry->mnSizeExtra;
- pBlibEntry->WriteBlibEntry( rSt, sal_False, nBlipSize );
+ pBlibEntry->WriteBlibEntry( rSt, false, nBlipSize );
// BLIP
pMergePicStreamBSE->Seek( pBlibEntry->mnPictureOffset );
@@ -4364,14 +4365,14 @@ void EscherGraphicProvider::WriteBlibSto
else
{
for ( sal_uInt32 i = 0; i < mnBlibEntrys; i++ )
- mpBlibEntrys[ i ]->WriteBlibEntry( rSt, sal_True );
+ mpBlibEntrys[ i ]->WriteBlibEntry( rSt, true );
}
}
}
-sal_Bool EscherGraphicProvider::GetPrefSize( const sal_uInt32 nBlibId, Size& rPrefSize, MapMode& rPrefMapMode )
+bool EscherGraphicProvider::GetPrefSize( const sal_uInt32 nBlibId, Size& rPrefSize, MapMode& rPrefMapMode )
{
- sal_Bool bInRange = nBlibId && ( ( nBlibId - 1 ) < mnBlibEntrys );
+ bool bInRange = nBlibId && ( ( nBlibId - 1 ) < mnBlibEntrys );
if ( bInRange )
{
EscherBlibEntry* pEntry = mpBlibEntrys[ nBlibId - 1 ];
@@ -4404,7 +4405,7 @@ sal_uInt32 EscherGraphicProvider::GetBli
}
}
- sal_Bool bUseNativeGraphic( sal_False );
+ bool bUseNativeGraphic( false );
Graphic aGraphic( aGraphicObject.GetTransformedGraphic( pGraphicAttr ) );
GfxLink aGraphicLink;
@@ -4450,7 +4451,7 @@ sal_uInt32 EscherGraphicProvider::GetBli
default: break;
}
if ( p_EscherBlibEntry->meBlibType != UNKNOWN )
- bUseNativeGraphic = sal_True;
+ bUseNativeGraphic = true;
}
}
if ( !bUseNativeGraphic )
@@ -4656,7 +4657,7 @@ sal_uInt32 EscherConnectorListEntry::Get
// 2 ->Bottom 4 ->Bottom
// 3 ->Right 6 ->Right
-sal_uInt32 EscherConnectorListEntry::GetConnectorRule( sal_Bool bFirst )
+sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst )
{
sal_uInt32 nRule = 0;
@@ -4868,7 +4869,7 @@ sal_uInt32 EscherConnectorListEntry::Get
aPoly[ 3 ] = Point( aRect.Right(), aCenter.Y() );
sal_Int32 nAngle = ( EscherPropertyValueHelper::GetPropertyValue( aAny,
- aPropertySet, String( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) ), sal_True ) )
+ aPropertySet, String( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) ), true ) )
? *((sal_Int32*)aAny.getValue() )
: 0;
if ( nAngle )
@@ -4942,9 +4943,9 @@ void EscherSolverContainer::WriteSolver(
if ( aConnectorRule.nShapeC )
{
if ( aConnectorRule.nShapeA )
- aConnectorRule.ncptiA = pPtr->GetConnectorRule( sal_True );
+ aConnectorRule.ncptiA = pPtr->GetConnectorRule( true );
if ( aConnectorRule.nShapeB )
- aConnectorRule.ncptiB = pPtr->GetConnectorRule( sal_False );
+ aConnectorRule.ncptiB = pPtr->GetConnectorRule( false );
}
rStrm << (sal_uInt32)( ( ESCHER_ConnectorRule << 16 ) | 1 ) // atom hd
<< (sal_uInt32)24 //
@@ -5099,8 +5100,8 @@ EscherEx::EscherEx( const EscherExGlobal
mnGroupLevel ( 0 ),
mnHellLayerId ( USHRT_MAX ),
- mbEscherSpgr ( sal_False ),
- mbEscherDg ( sal_False )
+ mbEscherSpgr ( false ),
+ mbEscherDg ( false )
{
mnStrmStartOfs = mpOutStrm->Tell();
mpImplEscherExSdr.reset( new ImplEscherExSdr( *this ) );
@@ -5210,7 +5211,7 @@ void EscherEx::InsertAtCurrentPos( sal_u
// ---------------------------------------------------------------------------------------------
-sal_Bool EscherEx::SeekBehindRecHeader( sal_uInt16 nRecType )
+bool EscherEx::SeekBehindRecHeader( sal_uInt16 nRecType )
{
sal_uInt32 nOldPos, nStreamEnd, nType, nSize;
@@ -5221,12 +5222,12 @@ sal_Bool EscherEx::SeekBehindRecHeader(
{
*mpOutStrm >> nType >> nSize;
if ( ( nType >> 16 ) == nRecType )
- return sal_True;
+ return true;
if ( ( nType & 0xf ) != 0xf )
mpOutStrm->SeekRel( nSize );
}
mpOutStrm->Seek( nOldPos );
- return sal_False;
+ return false;
}
// ---------------------------------------------------------------------------------------------
@@ -5248,7 +5249,7 @@ sal_uInt32 EscherEx::GetPersistOffset( s
// ---------------------------------------------------------------------------------------------
-sal_Bool EscherEx::DoSeek( sal_uInt32 nKey )
+bool EscherEx::DoSeek( sal_uInt32 nKey )
{
sal_uInt32 nPos = PtGetOffsetByID( nKey );
if ( nPos )
@@ -5256,25 +5257,25 @@ sal_Bool EscherEx::DoSeek( sal_uInt32 nK
else
{
if (! PtIsID( nKey ) )
- return sal_False;
+ return false;
mpOutStrm->Seek( 0 );
}
- return sal_True;
+ return true;
}
// ---------------------------------------------------------------------------------------------
-sal_Bool EscherEx::SeekToPersistOffset( sal_uInt32 nKey )
+bool EscherEx::SeekToPersistOffset( sal_uInt32 nKey )
{
return DoSeek( ESCHER_Persist_PrivateEntry | nKey );
}
// ---------------------------------------------------------------------------------------------
-sal_Bool EscherEx::InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue )
+bool EscherEx::InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue )
{
sal_uInt32 nOldPos = mpOutStrm->Tell();
- sal_Bool bRetValue = SeekToPersistOffset( nKey );
+ bool bRetValue(SeekToPersistOffset(nKey));
if ( bRetValue )
{
*mpOutStrm << nValue;
@@ -5311,7 +5312,7 @@ void EscherEx::OpenContainer( sal_uInt16
{
if ( !mbEscherDg )
{
- mbEscherDg = sal_True;
+ mbEscherDg = true;
mnCurrentDg = mxGlobal->GenerateDrawingId();
AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg );
PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() );
@@ -5326,7 +5327,7 @@ void EscherEx::OpenContainer( sal_uInt16
{
if ( mbEscherDg )
{
- mbEscherSpgr = sal_True;
+ mbEscherSpgr = true;
}
}
break;
@@ -5356,7 +5357,7 @@ void EscherEx::CloseContainer()
{
if ( mbEscherDg )
{
- mbEscherDg = sal_False;
+ mbEscherDg = false;
if ( DoSeek( ESCHER_Persist_Dg | mnCurrentDg ) )
*mpOutStrm << mxGlobal->GetDrawingShapeCount( mnCurrentDg ) << mxGlobal->GetLastShapeId( mnCurrentDg );
}
@@ -5367,7 +5368,7 @@ void EscherEx::CloseContainer()
{
if ( mbEscherSpgr )
{
- mbEscherSpgr = sal_False;
+ mbEscherSpgr = false;
}
}
@@ -5503,11 +5504,11 @@ sal_uInt32 EscherEx::EnterGroup(
// ---------------------------------------------------------------------------------------------
-sal_Bool EscherEx::SetGroupSnapPositionAndScale(
+bool EscherEx::SetGroupSnapPositionAndScale(
sal_uInt32 nGroupLevel,
const basegfx::B2DRange& rObjectRange)
{
- sal_Bool bRetValue = sal_False;
+ bool bRetValue(false);
if ( nGroupLevel )
{
sal_uInt32 nCurrentPos = mpOutStrm->Tell();
@@ -5525,11 +5526,11 @@ sal_Bool EscherEx::SetGroupSnapPositionA
// ---------------------------------------------------------------------------------------------
-sal_Bool EscherEx::SetGroupLogicPositionAndScale(
+bool EscherEx::SetGroupLogicPositionAndScale(
sal_uInt32 nGroupLevel,
const basegfx::B2DRange& rObjectRange)
{
- sal_Bool bRetValue = sal_False;
+ bool bRetValue(false);
if ( nGroupLevel )
{
sal_uInt32 nCurrentPos = mpOutStrm->Tell();
@@ -5583,7 +5584,7 @@ void EscherEx::Commit(
// ---------------------------------------------------------------------------------------------
-sal_uInt32 EscherEx::GetColor( const sal_uInt32 nSOColor, sal_Bool bSwap )
+sal_uInt32 EscherEx::GetColor( const sal_uInt32 nSOColor, bool bSwap )
{
if ( bSwap )
{
@@ -5598,14 +5599,14 @@ sal_uInt32 EscherEx::GetColor( const sal
// ---------------------------------------------------------------------------------------------
-sal_uInt32 EscherEx::GetColor( const Color& rSOColor, sal_Bool bSwap )
+sal_uInt32 EscherEx::GetColor( const Color& rSOColor, bool bSwap )
{
sal_uInt32 nColor = ( rSOColor.GetRed() << 16 );
nColor |= ( rSOColor.GetGreen() << 8 );
nColor |= rSOColor.GetBlue();
if ( !bSwap )
- nColor = GetColor( nColor, sal_True );
+ nColor = GetColor( nColor, true );
return nColor;
}