diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/pch/precompiled_svxcore.hxx | 5 | ||||
| -rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 12 | ||||
| -rw-r--r-- | svx/source/dialog/_contdlg.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 14 |
4 files changed, 16 insertions, 17 deletions
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 979ee4ce7b00..afa38f9c8175 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2022-06-27 18:59:31 using: + Generated on 2022-08-13 18:01:20 using: ./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -71,7 +71,6 @@ #include <osl/mutex.h> #include <osl/mutex.hxx> #include <osl/process.h> -#include <osl/thread.h> #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/character.hxx> @@ -109,7 +108,7 @@ #include <vcl/WindowPosSize.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> -#include <vcl/animate/AnimationBitmap.hxx> +#include <vcl/animate/AnimationFrame.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmap/BitmapTypes.hxx> #include <vcl/bitmapex.hxx> diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 8a727909fb81..847ddaf4efbd 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -635,9 +635,9 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation ) for( sal_uInt16 i = 0; i < nAnimationCount; i++ ) { - AnimationBitmap aAnimationBitmap( aAnimation.Get( i ) ); - aAnimationBitmap.maBitmapEx = Mask(aAnimationBitmap.maBitmapEx).GetBitmapEx(); - aAnimation.Replace(aAnimationBitmap, i); + AnimationFrame aAnimationFrame( aAnimation.Get( i ) ); + aAnimationFrame.maBitmapEx = Mask(aAnimationFrame.maBitmapEx).GetBitmapEx(); + aAnimation.Replace(aAnimationFrame, i); } return aAnimation; @@ -892,9 +892,9 @@ Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Colo for( sal_uInt16 i = 0; i < nAnimationCount; i++ ) { - AnimationBitmap aAnimationBitmap(aAnimation.Get(i)); - aAnimationBitmap.maBitmapEx.ReplaceTransparency(rColor); - aAnimation.Replace(aAnimationBitmap, i); + AnimationFrame aAnimationFrame(aAnimation.Get(i)); + aAnimationFrame.maBitmapEx.ReplaceTransparency(rColor); + aAnimation.Replace(aAnimationFrame, i); } return aAnimation; diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index fbd6f40bc547..3ae8cba852e0 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -99,7 +99,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, for( sal_uInt16 i = 0; i < nCount; i++ ) { - const AnimationBitmap& rStepBmp = aAnim.Get( i ); + const AnimationFrame& rStepBmp = aAnim.Get( i ); // Push Polygon output to the right place; this is the // offset of the sub-image within the total animation diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index cb690df32623..7241fedfe043 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -55,21 +55,21 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, bool bHMirr, for( sal_uInt16 i = 0, nCount = aNewAnim.Count(); i < nCount; i++ ) { - AnimationBitmap aAnimationBitmap( aNewAnim.Get( i ) ); + AnimationFrame aAnimationFrame( aNewAnim.Get( i ) ); // mirror the BitmapEx - aAnimationBitmap.maBitmapEx.Mirror( nMirrorFlags ); + aAnimationFrame.maBitmapEx.Mirror( nMirrorFlags ); // Adjust the positions inside the whole bitmap if( bHMirr ) - aAnimationBitmap.maPositionPixel.setX(rGlobalSize.Width() - aAnimationBitmap.maPositionPixel.X() - - aAnimationBitmap.maSizePixel.Width()); + aAnimationFrame.maPositionPixel.setX(rGlobalSize.Width() - aAnimationFrame.maPositionPixel.X() - + aAnimationFrame.maSizePixel.Width()); if( bVMirr ) - aAnimationBitmap.maPositionPixel.setY(rGlobalSize.Height() - aAnimationBitmap.maPositionPixel.Y() - - aAnimationBitmap.maSizePixel.Height()); + aAnimationFrame.maPositionPixel.setY(rGlobalSize.Height() - aAnimationFrame.maPositionPixel.Y() - + aAnimationFrame.maSizePixel.Height()); - aNewAnim.Replace(aAnimationBitmap, i); + aNewAnim.Replace(aAnimationFrame, i); } } |