diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-13 16:49:46 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-13 16:49:46 +0100 |
| commit | ec8fbbb7419ebbe6f6206442508e3e3943cee972 (patch) | |
| tree | b5f9dd29a6ae5644cab021502db9a111bf40751b /slideshow/source/engine/shapes/gdimtftools.cxx | |
| parent | removetooltypes01: rebase to DEV300_m96 (diff) | |
| download | core-ec8fbbb7419ebbe6f6206442508e3e3943cee972.tar.gz core-ec8fbbb7419ebbe6f6206442508e3e3943cee972.zip | |
removetooltypes01: #i112600# remove tooltypes from slideshow and forms
Diffstat (limited to 'slideshow/source/engine/shapes/gdimtftools.cxx')
| -rw-r--r-- | slideshow/source/engine/shapes/gdimtftools.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index ea58ec2af9d7..35daf49863d8 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -307,19 +307,19 @@ sal_Int32 getNextActionOffset( MetaAction * pCurrAct ) switch (pCurrAct->GetType()) { case META_TEXT_ACTION: { MetaTextAction * pAct = static_cast<MetaTextAction *>(pCurrAct); - return (pAct->GetLen() == (USHORT)STRING_LEN + return (pAct->GetLen() == (sal_uInt16)STRING_LEN ? pAct->GetText().Len() - pAct->GetIndex() : pAct->GetLen()); } case META_TEXTARRAY_ACTION: { MetaTextArrayAction * pAct = static_cast<MetaTextArrayAction *>(pCurrAct); - return (pAct->GetLen() == (USHORT)STRING_LEN + return (pAct->GetLen() == (sal_uInt16)STRING_LEN ? pAct->GetText().Len() - pAct->GetIndex() : pAct->GetLen()); } case META_STRETCHTEXT_ACTION: { MetaStretchTextAction * pAct = static_cast<MetaStretchTextAction *>(pCurrAct); - return (pAct->GetLen() == (USHORT)STRING_LEN + return (pAct->GetLen() == (sal_uInt16)STRING_LEN ? pAct->GetText().Len() - pAct->GetIndex() : pAct->GetLen()); } case META_FLOATTRANSPARENT_ACTION: { @@ -357,12 +357,12 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, // update modes) VirtualDevice aVDev; aVDev.SetOutputSizePixel( aAnimSize ); - aVDev.EnableMapMode( FALSE ); + aVDev.EnableMapMode( sal_False ); // setup mask VDev (alpha VDev is currently rather slow) VirtualDevice aVDevMask; aVDevMask.SetOutputSizePixel( aAnimSize ); - aVDevMask.EnableMapMode( FALSE ); + aVDevMask.EnableMapMode( sal_False ); switch( aAnimation.GetCycleMode() ) { @@ -391,7 +391,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, break; } - for( USHORT i=0, nCount=aAnimation.Count(); i<nCount; ++i ) + for( sal_uInt16 i=0, nCount=aAnimation.Count(); i<nCount; ++i ) { const AnimationBitmap& rAnimBmp( aAnimation.Get(i) ); switch(rAnimBmp.eDisposal) |