summaryrefslogtreecommitdiff
path: root/sd/source/ui/animations
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/animations')
-rw-r--r--sd/source/ui/animations/CustomAnimation.hrc11
-rw-r--r--sd/source/ui/animations/CustomAnimation.src50
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx47
-rw-r--r--sd/source/ui/animations/CustomAnimationList.hxx4
4 files changed, 18 insertions, 94 deletions
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
index 2dfbb26f5d51..5f47546f238c 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -26,17 +26,6 @@
// attention, we have 200 ids free after RID_CUSTOMANIMATION_START
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#define BMP_CUSTOMANIMATION_ON_CLICK RID_CUSTOMANIMATION_START+0
-#define BMP_CUSTOMANIMATION_AFTER_PREVIOUS RID_CUSTOMANIMATION_START+1
-#define BMP_CUSTOMANIMATION_ENTRANCE_EFFECT RID_CUSTOMANIMATION_START+2
-#define BMP_CUSTOMANIMATION_EMPHASIS_EFFECT RID_CUSTOMANIMATION_START+3
-#define BMP_CUSTOMANIMATION_EXIT_EFFECT RID_CUSTOMANIMATION_START+4
-#define BMP_CUSTOMANIMATION_MOTION_PATH RID_CUSTOMANIMATION_START+5
-#define BMP_CUSTOMANIMATION_OLE RID_CUSTOMANIMATION_START+6
-#define BMP_CUSTOMANIMATION_MEDIA_PLAY RID_CUSTOMANIMATION_START+7
-#define BMP_CUSTOMANIMATION_MEDIA_PAUSE RID_CUSTOMANIMATION_START+8
-#define BMP_CUSTOMANIMATION_MEDIA_STOP RID_CUSTOMANIMATION_START+9
-
#define STR_CUSTOMANIMATION_REPEAT_NONE RID_CUSTOMANIMATION_START+5
#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK RID_CUSTOMANIMATION_START+6
#define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE RID_CUSTOMANIMATION_START+7
diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src
index f9d8cfaed76c..e18c16da87cc 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -174,54 +174,4 @@ String STR_SLIDETRANSITION_NONE
Text [ en-US ] = "None";
};
-Bitmap BMP_CUSTOMANIMATION_ON_CLICK
-{
- File = "click_16.png";
-};
-
-Bitmap BMP_CUSTOMANIMATION_AFTER_PREVIOUS
-{
- File = "time_16.png";
-};
-
-Bitmap BMP_CUSTOMANIMATION_ENTRANCE_EFFECT
-{
- File = "effect_16.png";
-};
-
-Bitmap BMP_CUSTOMANIMATION_EMPHASIS_EFFECT
-{
- File = "effectshape_16.png";
-};
-
-Bitmap BMP_CUSTOMANIMATION_EXIT_EFFECT
-{
- File = "effectfade_16.png";
-};
-
-Bitmap BMP_CUSTOMANIMATION_MOTION_PATH
-{
- File = "effectpath_16.png";
-};
-
-Bitmap BMP_CUSTOMANIMATION_OLE
-{
- File = "effectole_16.png";
-};
-
-Bitmap BMP_CUSTOMANIMATION_MEDIA_PLAY
-{
- File = "playblue_16.png";
-};
-
-Bitmap BMP_CUSTOMANIMATION_MEDIA_PAUSE
-{
- File = "breakplayingblue_16.png";
-};
-
-Bitmap BMP_CUSTOMANIMATION_MEDIA_STOP
-{
- File = "stopplayingblue_16.png";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 0477f54114d3..96bf05f32ccd 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -44,6 +44,7 @@
#include "res_bmp.hrc"
#include "glob.hrc"
+#include "bitmaps.hlst"
#include <algorithm>
#include <memory>
@@ -268,11 +269,11 @@ void CustomAnimationListEntryItem::Paint(const Point& rPos, SvTreeListBox& rDev,
sal_Int16 nNodeType = mpEffect->getNodeType();
if (nNodeType == EffectNodeType::ON_CLICK )
{
- rRenderContext.DrawImage( aPos, mpParent->getImage(BMP_CUSTOMANIMATION_ON_CLICK));
+ rRenderContext.DrawImage(aPos, Image(BitmapEx(BMP_CUSTOMANIMATION_ON_CLICK)));
}
else if (nNodeType == EffectNodeType::AFTER_PREVIOUS)
{
- rRenderContext.DrawImage(aPos, mpParent->getImage(BMP_CUSTOMANIMATION_AFTER_PREVIOUS));
+ rRenderContext.DrawImage(aPos, Image(BitmapEx(BMP_CUSTOMANIMATION_AFTER_PREVIOUS)));
}
else if (nNodeType == EffectNodeType::WITH_PREVIOUS)
{
@@ -286,41 +287,42 @@ void CustomAnimationListEntryItem::Paint(const Point& rPos, SvTreeListBox& rDev,
aPos.Y() += nIconWidth;
- sal_uInt16 nImage;
+ OUString sImage;
switch (mpEffect->getPresetClass())
{
case EffectPresetClass::ENTRANCE:
- nImage = BMP_CUSTOMANIMATION_ENTRANCE_EFFECT; break;
+ sImage = BMP_CUSTOMANIMATION_ENTRANCE_EFFECT; break;
case EffectPresetClass::EXIT:
- nImage = BMP_CUSTOMANIMATION_EXIT_EFFECT; break;
+ sImage = BMP_CUSTOMANIMATION_EXIT_EFFECT; break;
case EffectPresetClass::EMPHASIS:
- nImage = BMP_CUSTOMANIMATION_EMPHASIS_EFFECT; break;
+ sImage = BMP_CUSTOMANIMATION_EMPHASIS_EFFECT; break;
case EffectPresetClass::MOTIONPATH:
- nImage = BMP_CUSTOMANIMATION_MOTION_PATH; break;
+ sImage = BMP_CUSTOMANIMATION_MOTION_PATH; break;
case EffectPresetClass::OLEACTION:
- nImage = BMP_CUSTOMANIMATION_OLE; break;
+ sImage = BMP_CUSTOMANIMATION_OLE; break;
case EffectPresetClass::MEDIACALL:
switch (mpEffect->getCommand())
{
case EffectCommands::TOGGLEPAUSE:
- nImage = BMP_CUSTOMANIMATION_MEDIA_PAUSE; break;
+ sImage = BMP_CUSTOMANIMATION_MEDIA_PAUSE; break;
case EffectCommands::STOP:
- nImage = BMP_CUSTOMANIMATION_MEDIA_STOP; break;
+ sImage = BMP_CUSTOMANIMATION_MEDIA_STOP; break;
case EffectCommands::PLAY:
default:
- nImage = BMP_CUSTOMANIMATION_MEDIA_PLAY; break;
+ sImage = BMP_CUSTOMANIMATION_MEDIA_PLAY; break;
}
break;
default:
- nImage = 0xffff;
+ break;
}
- if (nImage != 0xffff)
+ if (!sImage.isEmpty())
{
- const Image& rImage = mpParent->getImage(nImage);
+ BitmapEx aBitmap(sImage);
+ Image aImage(aBitmap);
Point aImagePos(aPos);
- aImagePos.Y() += (aSize.Height()/2 - rImage.GetSizePixel().Height()) >> 1;
- rRenderContext.DrawImage(aImagePos, rImage);
+ aImagePos.Y() += (aSize.Height()/2 - aImage.GetSizePixel().Height()) >> 1;
+ rRenderContext.DrawImage(aImagePos, aImage);
}
aPos.X() += nIconWidth;
@@ -453,19 +455,6 @@ CustomAnimationList::CustomAnimationList( vcl::Window* pParent )
VCL_BUILDER_FACTORY(CustomAnimationList)
-const Image& CustomAnimationList::getImage( sal_uInt16 nId )
-{
- DBG_ASSERT( (nId >= BMP_CUSTOMANIMATION_ON_CLICK) && (nId <= BMP_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" );
-
- Image& rImage = maImages[nId - BMP_CUSTOMANIMATION_ON_CLICK];
-
- // load on demand
- if( rImage.GetSizePixel().Width() == 0 )
- rImage = Image(BitmapEx(SdResId(nId)));
-
- return rImage;
-}
-
CustomAnimationList::~CustomAnimationList()
{
disposeOnce();
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 6f8cf8d78fea..a029cd3e5b39 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -83,8 +83,6 @@ public:
virtual void notify_change() override;
- const Image& getImage( sal_uInt16 nId );
-
bool isExpanded( const CustomAnimationEffectPtr& pEffect ) const;
/// clears all entries from the listbox
@@ -108,8 +106,6 @@ private:
MainSequencePtr mpMainSequence;
- Image maImages[ BMP_CUSTOMANIMATION_MEDIA_STOP - BMP_CUSTOMANIMATION_ON_CLICK + 1];
-
css::uno::Reference< css::drawing::XShape > mxLastTargetShape;
sal_Int32 mnLastGroupId;
SvTreeListEntry* mpLastParentEntry;
generated by cgit (git 2.34.1) at 2024-07-10 09:50:47 +0000