diff options
Diffstat (limited to 'sd/source/ui')
25 files changed, 163 insertions, 1216 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; diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index ff5be0a4ed86..88b5e9e33fe4 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -22,251 +22,6 @@ #include "glob.hrc" #include "res_bmp.hrc" -// preview bitmaps for layouts -Bitmap BMP_LAYOUT_EMPTY -{ - File = "layout_empty.png"; -}; -Bitmap BMP_LAYOUT_HEAD01 -{ - File = "layout_head01.png"; -}; -Bitmap BMP_LAYOUT_HEAD02 -{ - File = "layout_head02.png"; -}; -Bitmap BMP_LAYOUT_HEAD02A -{ - File = "layout_head02a.png"; -}; -Bitmap BMP_LAYOUT_HEAD02B -{ - File = "layout_head02b.png"; -}; -Bitmap BMP_LAYOUT_HEAD03 -{ - File = "layout_head03.png"; -}; -Bitmap BMP_LAYOUT_HEAD03A -{ - File = "layout_head03a.png"; -}; -Bitmap BMP_LAYOUT_HEAD03B -{ - File = "layout_head03b.png"; -}; -Bitmap BMP_LAYOUT_HEAD03C -{ - File = "layout_head03c.png"; -}; -Bitmap BMP_LAYOUT_HEAD04 -{ - File = "layout_head04.png"; -}; -Bitmap BMP_LAYOUT_HEAD06 -{ - File = "layout_head06.png"; -}; -Bitmap BMP_LAYOUT_TEXTONLY -{ - File = "layout_textonly.png"; -}; -Bitmap BMP_LAYOUT_VERTICAL01 -{ - File = "layout_vertical01.png"; -}; -Bitmap BMP_LAYOUT_VERTICAL02 -{ - File = "layout_vertical02.png"; -}; -Bitmap BMP_FOILH_01 -{ - File = "foilh01.png"; -}; -Bitmap BMP_FOILH_02 -{ - File = "foilh02.png"; -}; -Bitmap BMP_FOILH_03 -{ - File = "foilh03.png"; -}; -Bitmap BMP_FOILH_04 -{ - File = "foilh04.png"; -}; -Bitmap BMP_FOILH_06 -{ - File = "foilh06.png"; -}; -Bitmap BMP_FOILH_09 -{ - File = "foilh09.png"; -}; -Bitmap BMP_DISPLAYMODE_SLIDE -{ - File = "displaymode_slide.png"; -}; -Bitmap BMP_DISPLAYMODE_OUTLINE -{ - File = "displaymode_outline.png"; -}; -Bitmap BMP_DISPLAYMODE_NOTES -{ - File = "displaymode_notes.png"; -}; -Bitmap BMP_DISPLAYMODE_SLIDE_SORTER -{ - File = "displaymode_slidesorter.png"; -}; -Bitmap BMP_DISPLAYMODE_SLIDE_MASTER -{ - File = "displaymode_slidemaster.png"; -}; -Bitmap BMP_DISPLAYMODE_NOTES_MASTER -{ - File = "displaymode_notesmaster.png"; -}; -Bitmap BMP_DISPLAYMODE_HANDOUT_MASTER -{ - File = "displaymode_handoutmaster.png"; -}; -Bitmap BMP_PLACEHOLDER_CHART_SMALL -{ - File = "placeholder_chart_small.png"; -}; -Bitmap BMP_PLACEHOLDER_CHART_SMALL_HOVER -{ - File = "placeholder_chart_small_hover.png"; -}; -Bitmap BMP_PLACEHOLDER_IMAGE_SMALL -{ - File = "placeholder_image_small.png"; -}; -Bitmap BMP_PLACEHOLDER_IMAGE_SMALL_HOVER -{ - File = "placeholder_image_small_hover.png"; -}; -Bitmap BMP_PLACEHOLDER_MOVIE_SMALL -{ - File = "placeholder_movie_small.png"; -}; -Bitmap BMP_PLACEHOLDER_MOVIE_SMALL_HOVER -{ - File = "placeholder_movie_small_hover.png"; -}; -Bitmap BMP_PLACEHOLDER_TABLE_SMALL -{ - File = "placeholder_table_small.png"; -}; -Bitmap BMP_PLACEHOLDER_TABLE_SMALL_HOVER -{ - File = "placeholder_table_small_hover.png"; -}; - -Bitmap BMP_PLACEHOLDER_CHART_LARGE -{ - File = "placeholder_chart_large.png"; -}; -Bitmap BMP_PLACEHOLDER_CHART_LARGE_HOVER -{ - File = "placeholder_chart_large_hover.png"; -}; -Bitmap BMP_PLACEHOLDER_IMAGE_LARGE -{ - File = "placeholder_image_large.png"; -}; -Bitmap BMP_PLACEHOLDER_IMAGE_LARGE_HOVER -{ - File = "placeholder_image_large_hover.png"; -}; -Bitmap BMP_PLACEHOLDER_MOVIE_LARGE -{ - File = "placeholder_movie_large.png"; -}; -Bitmap BMP_PLACEHOLDER_MOVIE_LARGE_HOVER -{ - File = "placeholder_movie_large_hover.png"; -}; -Bitmap BMP_PLACEHOLDER_TABLE_LARGE -{ - File = "placeholder_table_large.png"; -}; -Bitmap BMP_PLACEHOLDER_TABLE_LARGE_HOVER -{ - File = "placeholder_table_large_hover.png"; -}; - -Bitmap BMP_FOILN_01 -{ - File = "foiln01.png" ; -}; - -Bitmap BMP_PAGE -{ - File = "page.png" ; -}; - -Bitmap BMP_PAGE_EXCLUDED -{ - File = "pageexcl.png" ; -}; - -Bitmap BMP_PAGEOBJS_EXCLUDED -{ - File = "pagobjex.png" ; -}; - -Bitmap BMP_PAGEOBJS -{ - File = "pageobjs.png" ; -}; - -Bitmap BMP_OBJECTS -{ - File = "objects.png" ; -}; - -Bitmap BMP_OLE -{ - File = "ole.png" ; -}; - -Bitmap BMP_GROUP -{ - File = "group.png" ; -}; - -Bitmap BMP_DOC_OPEN -{ - File = "docopen.png" ; -}; - -Bitmap BMP_DOC_CLOSED -{ - File = "docclose.png" ; -}; - -Bitmap BMP_DOC_TEXT -{ - File = "doctext.png" ; -}; - -Bitmap BMP_EXPAND -{ - File = "plus.png" ; -}; - -Bitmap BMP_COLLAPSE -{ - File = "minus.png" ; -}; - -Bitmap BMP_GRAPHIC -{ - File = "graphic.png" ; -}; - StringArray RID_GRAPHICSTYLEFAMILY { ItemList [ en-US ] = @@ -287,559 +42,4 @@ StringArray RID_PRESENTATIONSTYLEFAMILY }; }; -Bitmap BMP_STYLES_FAMILY_GRAPHICS -{ - File = "sf01.png" ; -}; - -Bitmap BMP_STYLES_FAMILY_PRESENTATIONS -{ - File = "sf02.png" ; -}; - -Bitmap BMP_PRESOBJ_GRAPHIC -{ - File = "image.png" ; -}; - -Bitmap BMP_PRESOBJ_OBJECT -{ - File = "object.png" ; -}; - -Bitmap BMP_PRESOBJ_CHART -{ - File = "chart.png" ; -}; - -Bitmap BMP_PRESOBJ_ORGCHART -{ - File = "orgchart.png" ; -}; - -Bitmap BMP_PRESOBJ_TABLE -{ - File = "table.png" ; -}; - -Bitmap BMP_POINTER_ICON -{ - File = "pointericon.png"; -}; - -Bitmap BMP_WAIT_ICON -{ - File = "waiticon.png"; -}; - -Bitmap BMP_FADE_EFFECT_INDICATOR -{ - File = "fade_effect_indicator.png"; -}; - -Bitmap BMP_CUSTOM_ANIMATION_INDICATOR -{ - File = "click_16.png"; -}; - -// Presenter Screen bitmaps: - -Bitmap BMP_PRESENTERSCREEN_BORDER_LEFT -{ - File = "presenterscreen-BorderLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED -{ - File = "presenterscreen-ButtonSlideNextDisabled.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED -{ - File = "presenterscreen-ButtonSlidePreviousSelected.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP -{ - File = "presenterscreen-BorderCurrentSlideTop.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED -{ - File = "presenterscreen-ButtonNotesSelected.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED -{ - File = "presenterscreen-ScrollbarArrowDownSelected.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BACKGROUND -{ - File = "presenterscreen-Background.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_ANIMATION -{ - File = "presenterscreen-Animation.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_TRANSITION -{ - File = "presenterscreen-Transition.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_RIGHT -{ - File = "presenterscreen-BorderRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP -{ - File = "presenterscreen-BorderActiveTop.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED -{ - File = "presenterscreen-ButtonHelpDisabled.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT -{ - File = "presenterscreen-BorderActiveRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL -{ - File = "presenterscreen-ButtonFrameCenterNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER -{ - File = "presenterscreen-ScrollbarThumbMiddleMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT -{ - File = "presenterscreen-BorderCurrentSlideBottomRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_TOP_LEFT -{ - File = "presenterscreen-BorderTopLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM -{ - File = "presenterscreen-BorderActiveBottom.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT -{ - File = "presenterscreen-BorderBottomLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP -{ - File = "presenterscreen-BorderToolbarTop.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT -{ - File = "presenterscreen-BorderActiveLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL -{ - File = "presenterscreen-ButtonHelpNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT -{ - File = "presenterscreen-BorderActiveBottomCallout.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT -{ - File = "presenterscreen-BorderToolbarLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL -{ - File = "presenterscreen-ButtonSlideSorterNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL -{ - File = "presenterscreen-ScrollbarPagerMiddleNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL -{ - File = "presenterscreen-ButtonFrameRightNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER -{ - File = "presenterscreen-ButtonEffectNextMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER -{ - File = "presenterscreen-ScrollbarThumbTopMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED -{ - File = "presenterscreen-ButtonEffectNextDisabled.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER -{ - File = "presenterscreen-ButtonFrameCenterMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT -{ - File = "presenterscreen-BorderCurrentSlideLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER -{ - File = "presenterscreen-ButtonFrameLeftMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED -{ - File = "presenterscreen-ButtonHelpSelected.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_VIEW_BACKGROUND -{ - File = "presenterscreen-ViewBackground.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER -{ - File = "presenterscreen-ButtonNotesMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER -{ - File = "presenterscreen-ButtonPlusMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED -{ - File = "presenterscreen-ButtonSlideSorterSelected.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT -{ - File = "presenterscreen-LabelMouseOverRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL -{ - File = "presenterscreen-ButtonSwitchMonitorNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_NORMAL -{ - File = "presenterscreen-ButtonRestartTimerNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT -{ - File = "presenterscreen-BorderToolbarRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL -{ - File = "presenterscreen-ScrollbarThumbMiddleNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED -{ - File = "presenterscreen-ButtonEffectNextSelected.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL -{ - File = "presenterscreen-ScrollbarArrowDownNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT -{ - File = "presenterscreen-BorderCurrentSlideTopRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL -{ - File = "presenterscreen-ButtonPlusNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT -{ - File = "presenterscreen-BorderToolbarTopRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED -{ - File = "presenterscreen-ButtonMinusDisabled.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED -{ - File = "presenterscreen-ScrollbarArrowDownDisabled.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER -{ - File = "presenterscreen-ButtonFrameRightMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER -{ - File = "presenterscreen-ButtonSwitchMonitorMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_MOUSE_OVER -{ - File = "presenterscreen-ButtonRestartTimerMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED -{ - File = "presenterscreen-ButtonSlidePreviousDisabled.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED -{ - File = "presenterscreen-ButtonMinusSelected.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER -{ - File = "presenterscreen-LabelMouseOverCenter.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER -{ - File = "presenterscreen-ButtonSlideNextMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL -{ - File = "presenterscreen-ButtonSlideNextNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER -{ - File = "presenterscreen-ButtonSlidePreviousMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_TOP -{ - File = "presenterscreen-BorderTop.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL -{ - File = "presenterscreen-ButtonFrameLeftNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER -{ - File = "presenterscreen-ScrollbarArrowUpMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL -{ - File = "presenterscreen-ButtonNotesNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED -{ - File = "presenterscreen-ButtonSlideSorterDisabled.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL -{ - File = "presenterscreen-ButtonEffectNextNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT -{ - File = "presenterscreen-BorderToolbarTopLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT -{ - File = "presenterscreen-BorderActiveBottomRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_BOTTOM -{ - File = "presenterscreen-BorderBottom.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT -{ - File = "presenterscreen-BorderActiveBottomLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER -{ - File = "presenterscreen-ScrollbarArrowDownMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED -{ - File = "presenterscreen-ButtonPlusSelected.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT -{ - File = "presenterscreen-BorderActiveTopRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL -{ - File = "presenterscreen-ButtonSlidePreviousNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER -{ - File = "presenterscreen-ButtonSlideSorterMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER -{ - File = "presenterscreen-ButtonMinusMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED -{ - File = "presenterscreen-ButtonNotesDisabled.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT -{ - File = "presenterscreen-BorderCurrentSlideBottomLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT -{ - File = "presenterscreen-BorderTopRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER -{ - File = "presenterscreen-ButtonHelpMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL -{ - File = "presenterscreen-ScrollbarThumbTopNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED -{ - File = "presenterscreen-ScrollbarArrowUpSelected.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED -{ - File = "presenterscreen-ScrollbarArrowUpDisabled.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL -{ - File = "presenterscreen-ScrollbarArrowUpNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM -{ - File = "presenterscreen-BorderToolbarBottom.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT -{ - File = "presenterscreen-BorderCurrentSlideTopLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL -{ - File = "presenterscreen-ButtonMinusNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER -{ - File = "presenterscreen-ScrollbarThumbBottomMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT -{ - File = "presenterscreen-BorderActiveTopLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM -{ - File = "presenterscreen-BorderCurrentSlideBottom.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER -{ - File = "presenterscreen-ScrollbarPagerMiddleMouseOver.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT -{ - File = "presenterscreen-LabelMouseOverLeft.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT -{ - File = "presenterscreen-BorderCurrentSlideRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT -{ - File = "presenterscreen-BorderBottomRight.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL -{ - File = "presenterscreen-ScrollbarThumbBottomNormal.png"; -}; - -Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED -{ - File = "presenterscreen-ButtonPlusDisabled.png"; -}; - -// This definition is not used directly. -// It is only here to be shipped in images.zip. -// The bitmap itself is used from sdext/source/minimizer. -Bitmap BMP_PRESENTATION_MINIMIZER -{ - File = "minimize_presi_80.png"; -}; - -Bitmap BMP_EMBEDDED -{ - File = "nv08.png" ; -}; - -Bitmap BMP_LINK -{ - File = "nv09.png" ; -}; - -Bitmap BMP_HYPERLINK -{ - File = "nv010.png" ; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index f6e25fc72c94..ce4dd0dfdc9f 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -49,6 +49,7 @@ #include "glob.hrc" #include "strings.hrc" #include "res_bmp.hrc" +#include "bitmaps.hlst" #include "ViewShell.hxx" #include "FrameView.hxx" #include "sdattr.hxx" @@ -806,12 +807,12 @@ SfxStyleFamilies* SdModule::CreateStyleFamilies() pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SD_RESSTR(STR_GRAPHICS_STYLE_FAMILY), - Image(BitmapEx(SdResId(BMP_STYLES_FAMILY_GRAPHICS))), + Image(BitmapEx(BMP_STYLES_FAMILY_GRAPHICS)), SdResId(RID_GRAPHICSTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, SD_RESSTR(STR_PRESENTATIONS_STYLE_FAMILY), - Image(BitmapEx(SdResId(BMP_STYLES_FAMILY_PRESENTATIONS))), + Image(BitmapEx(BMP_STYLES_FAMILY_PRESENTATIONS)), SdResId(RID_PRESENTATIONSTYLEFAMILY))); return pStyleFamilies; diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index c6e695ed9ada..725e2332a2b0 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -15,6 +15,7 @@ #include "strings.hrc" #include "res_bmp.hrc" +#include "bitmaps.hlst" #include "sdresid.hxx" using namespace ::com::sun::star; @@ -43,7 +44,7 @@ public: virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - void setToolboxItemImage( sal_uInt16 nImage ); + void setToolboxItemImage(const OUString& rImage); using svt::PopupWindowController::createPopupWindow; }; @@ -68,10 +69,10 @@ private: struct snewfoil_value_info { - sal_uInt16 mnId; - sal_uInt16 mnBmpResId; - sal_uInt16 mnStrResId; - OUString msUnoCommand; + sal_uInt16 mnId; + const char* msBmpResId; + sal_uInt16 mnStrResId; + const char* msUnoCommand; }; static const snewfoil_value_info editmodes[] = @@ -79,20 +80,20 @@ static const snewfoil_value_info editmodes[] = {1, BMP_DISPLAYMODE_SLIDE, STR_NORMAL_MODE, - OUString(".uno:NormalMultiPaneGUI") }, + ".uno:NormalMultiPaneGUI" }, {2, BMP_DISPLAYMODE_NOTES, STR_NOTES_MODE, - OUString(".uno:NotesMode") }, + ".uno:NotesMode" }, {3, BMP_DISPLAYMODE_OUTLINE, STR_OUTLINE_MODE, - OUString(".uno:OutlineMode") }, + ".uno:OutlineMode" }, {4, BMP_DISPLAYMODE_SLIDE_SORTER, STR_SLIDE_SORTER_MODE, - OUString(".uno:DiaMode") }, - {0, 0, 0, OUString() } + ".uno:DiaMode" }, + {0, "", 0, "" } }; static const snewfoil_value_info mastermodes[] = @@ -100,16 +101,16 @@ static const snewfoil_value_info mastermodes[] = {5, BMP_DISPLAYMODE_SLIDE_MASTER, STR_SLIDE_MASTER_MODE, - OUString(".uno:SlideMasterPage") }, + ".uno:SlideMasterPage" }, {6, BMP_DISPLAYMODE_NOTES_MASTER, STR_NOTES_MASTER_MODE, - OUString(".uno:NotesMasterPage") }, + ".uno:NotesMasterPage" }, {7, BMP_DISPLAYMODE_HANDOUT_MASTER, STR_HANDOUT_MASTER_MODE, - OUString(".uno:HandoutMode") }, - {0, 0, 0, OUString() } + ".uno:HandoutMode" }, + {0, "", 0, "" } }; @@ -119,7 +120,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn for( ; pInfo->mnId; pInfo++ ) { OUString aText( SD_RESSTR( pInfo->mnStrResId ) ); - BitmapEx aBmp( SdResId( pInfo->mnBmpResId ) ); + BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId)); pValue->InsertItem(pInfo->mnId, Image(aBmp), aText); @@ -204,21 +205,21 @@ void DisplayModeToolbarMenu::SelectHdl(void * pControl) EndPopupMode(); OUString sCommandURL; - sal_uInt16 nImage = 0; + OUString sImage; if( pControl == mpDisplayModeSet1 ) { - sCommandURL = editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].msUnoCommand; - nImage = editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].mnBmpResId; + sCommandURL = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].msUnoCommand); + sImage = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].msBmpResId); } else if( pControl == mpDisplayModeSet2 ) { - sCommandURL = mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].msUnoCommand; - nImage = mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].mnBmpResId; + sCommandURL = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].msUnoCommand); + sImage = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].msBmpResId); } if (!sCommandURL.isEmpty()) mrController.dispatchCommand( sCommandURL, Sequence< PropertyValue >() ); - mrController.setToolboxItemImage( nImage ); + mrController.setToolboxItemImage(sImage); } DisplayModeController::DisplayModeController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) @@ -233,7 +234,7 @@ void SAL_CALL DisplayModeController::initialize( const css::uno::Sequence< css:: sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY ); - setToolboxItemImage( BMP_DISPLAYMODE_SLIDE ); + setToolboxItemImage(BMP_DISPLAYMODE_SLIDE); } VclPtr<vcl::Window> DisplayModeController::createPopupWindow( vcl::Window* pParent ) @@ -241,13 +242,12 @@ VclPtr<vcl::Window> DisplayModeController::createPopupWindow( vcl::Window* pPare return VclPtr<sd::DisplayModeToolbarMenu>::Create( *this, pParent ); } -void DisplayModeController::setToolboxItemImage( sal_uInt16 nImage ) +void DisplayModeController::setToolboxItemImage(const OUString& rImage) { sal_uInt16 nId; ToolBox* pToolBox = nullptr; if (getToolboxId( nId, &pToolBox )) { - SdResId resId( nImage ); - BitmapEx aBmp( resId ); + BitmapEx aBmp(rImage); int targetSize = (pToolBox->GetToolboxButtonSize() == ToolBoxButtonSize::Large) ? 32 : 16; double scale = 1.0f; Size size = aBmp.GetSizePixel(); diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 95b34206e9d2..759c9eacd8da 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -47,6 +47,7 @@ #include "glob.hrc" #include "strings.hrc" #include "res_bmp.hrc" +#include "bitmaps.hlst" #include "sdresid.hxx" #include "pres.hxx" #include "slidelayoutcontroller.hxx" @@ -83,7 +84,7 @@ private: struct snewfoil_value_info_layout { - sal_uInt16 mnBmpResId; + const char* msBmpResId; sal_uInt16 mnStrResId; AutoLayout maAutoLayout; }; @@ -91,7 +92,7 @@ struct snewfoil_value_info_layout static const snewfoil_value_info_layout notes[] = { {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES}, - {0, 0, AUTOLAYOUT_NONE}, + {"", 0, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info_layout handout[] = @@ -102,7 +103,7 @@ static const snewfoil_value_info_layout handout[] = {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4}, {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9}, - {0, 0, AUTOLAYOUT_NONE}, + {"", 0, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info_layout standard[] = @@ -119,7 +120,7 @@ static const snewfoil_value_info_layout standard[] = {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT }, {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_TITLE_4CONTENT }, {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_TITLE_6CONTENT }, - {0, 0, AUTOLAYOUT_NONE} + {"", 0, AUTOLAYOUT_NONE} }; static const snewfoil_value_info_layout v_standard[] = @@ -129,16 +130,16 @@ static const snewfoil_value_info_layout v_standard[] = {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, AUTOLAYOUT_VTITLE_VCONTENT }, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VCONTENT }, {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_2VTEXT }, - {0, 0, AUTOLAYOUT_NONE} + {"", 0, AUTOLAYOUT_NONE} }; static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layout* pInfo ) { Size aLayoutItemSize; - for( ; pInfo->mnBmpResId; pInfo++ ) + for( ; pInfo->mnStrResId; pInfo++ ) { OUString aText( SD_RESSTR( pInfo->mnStrResId ) ); - BitmapEx aBmp( SdResId( pInfo->mnBmpResId ) ); + BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId)); pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, Image(aBmp), aText); diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 537865b6146a..2afd2d54bca8 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -21,6 +21,7 @@ #include "strings.hrc" #include "res_bmp.hrc" +#include "bitmaps.hlst" #include "sdresid.hxx" #include "drawdoc.hxx" #include "DrawDocShell.hxx" @@ -82,8 +83,9 @@ void SdInsertPagesObjsDlg::Reset() else { Color aColor( COL_WHITE ); - Bitmap aBmpText( SdResId( BMP_DOC_TEXT ) ); - Image aImgText(BitmapEx(aBmpText, aColor)); + BitmapEx aBmpText(BMP_DOC_TEXT); + //to-do, check if this is already transparent and remove intermedia bitmapex if it is + Image aImgText(BitmapEx(aBmpText.GetBitmap(), aColor)); m_pLbTree->InsertEntry( rName, aImgText, aImgText ); } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 4d22b91e365c..76fa5140872b 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -44,6 +44,7 @@ #include "app.hrc" #include "strings.hrc" #include "res_bmp.hrc" +#include "bitmaps.hlst" #include "drawdoc.hxx" #include "DrawDocShell.hxx" #include "sdresid.hxx" @@ -266,7 +267,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) for (sal_uInt16 nID = NAVIGATOR_DRAGTYPE_URL; nID < NAVIGATOR_DRAGTYPE_COUNT; ++nID) { - sal_uInt16 nRId = GetDragTypeSdResId( (NavigatorDragType)nID, false ); + sal_uInt16 nRId = GetDragTypeSdStrId((NavigatorDragType)nID); if( nRId > 0 ) { DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!"); @@ -616,23 +617,40 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) maLbDocs->SelectEntryPos( nPos ); } -sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, bool bImage ) +sal_uInt16 SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT) { switch( eDT ) { case NAVIGATOR_DRAGTYPE_NONE: - return( bImage ? 0 : STR_NONE ); + return STR_NONE; case NAVIGATOR_DRAGTYPE_URL: - return( bImage ? BMP_HYPERLINK : STR_DRAGTYPE_URL ); + return STR_DRAGTYPE_URL; case NAVIGATOR_DRAGTYPE_EMBEDDED: - return( bImage ? BMP_EMBEDDED : STR_DRAGTYPE_EMBEDDED ); + return STR_DRAGTYPE_EMBEDDED; case NAVIGATOR_DRAGTYPE_LINK: - return( bImage ? BMP_LINK : STR_DRAGTYPE_LINK ); + return STR_DRAGTYPE_LINK; default: OSL_FAIL( "No resource for DragType available!" ); } return 0; } +OUString SdNavigatorWin::GetDragTypeSdBmpId(NavigatorDragType eDT) +{ + switch( eDT ) + { + case NAVIGATOR_DRAGTYPE_NONE: + return OUString(); + case NAVIGATOR_DRAGTYPE_URL: + return OUString(BMP_HYPERLINK); + case NAVIGATOR_DRAGTYPE_EMBEDDED: + return OUString(BMP_EMBEDDED); + case NAVIGATOR_DRAGTYPE_LINK: + return OUString(BMP_LINK); + default: OSL_FAIL( "No resource for DragType available!" ); + } + return OUString(); +} + NavDocInfo* SdNavigatorWin::GetDocInfo() { sal_uInt32 nPos = maLbDocs->GetSelectEntryPos(); @@ -721,7 +739,7 @@ void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt ) void SdNavigatorWin::SetDragImage() { const sal_uInt16 nDragTypeId = maToolbox->GetItemId("dragmode"); - maToolbox->SetItemImage(nDragTypeId, Image(BitmapEx(SdResId(GetDragTypeSdResId(meDragType, true))))); + maToolbox->SetItemImage(nDragTypeId, Image(BitmapEx(GetDragTypeSdBmpId(meDragType)))); } /** diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index e406177a91ec..7746eb90f0d6 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -23,6 +23,7 @@ #include "strings.hrc" #include "res_bmp.hrc" +#include "bitmaps.hlst" #include "sdpreslt.hxx" #include "sdattr.hxx" #include "sdresid.hxx" @@ -272,7 +273,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void) // empty layout maLayoutNames.push_back(maStrNone); m_pVS->InsertItem( (sal_uInt16) maLayoutNames.size(), - Image(Bitmap(SdResId(BMP_FOIL_NONE))), maStrNone ); + Image(BMP_FOIL_NONE), maStrNone ); } if (!bCancel) diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 2e0f718e81cd..073185fbecda 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -41,6 +41,7 @@ #include "navigatr.hxx" #include "strings.hrc" #include "res_bmp.hrc" +#include "bitmaps.hlst" #include "customshowlist.hxx" #include "ViewShell.hxx" #include "DrawController.hxx" @@ -196,8 +197,8 @@ SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, WinBits nStyle ) , mpBookmarkDoc ( nullptr ) , mpMedium ( nullptr ) , mpOwnMedium ( nullptr ) -, maImgOle ( BitmapEx( SdResId( BMP_OLE ) ) ) -, maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) ) +, maImgOle ( BitmapEx(BMP_OLE) ) +, maImgGraphic ( BitmapEx(BMP_GRAPHIC) ) , mbLinkableSelected ( false ) , mpDropNavWin ( nullptr ) , mpFrame ( nullptr ) @@ -211,8 +212,7 @@ SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, WinBits nStyle ) WB_HSCROLL | WB_HASBUTTONSATROOT | WB_QUICK_SEARCH /* i31275 */ ); - SetNodeBitmaps( Image(Bitmap( SdResId(BMP_EXPAND) )), - Image(Bitmap( SdResId(BMP_COLLAPSE) ))); + SetNodeBitmaps(Image(BitmapEx(BMP_EXPAND)), Image(BitmapEx(BMP_COLLAPSE))); SetDragDropMode( DragDropMode::CTRL_MOVE | DragDropMode::CTRL_COPY | @@ -538,8 +538,8 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium, mpMedium = pInMedium; maDocName = rDocName; - Image aImgDocOpen=Image( BitmapEx( SdResId( BMP_DOC_OPEN ) ) ); - Image aImgDocClosed=Image( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) ); + Image aImgDocOpen=Image(BitmapEx(BMP_DOC_OPEN)); + Image aImgDocClosed=Image(BitmapEx(BMP_DOC_CLOSED)); // insert document name InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, nullptr, true, TREELIST_APPEND, @@ -882,9 +882,9 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry ) SdrObject* pObj = nullptr; SvTreeListEntry* pPageEntry = nullptr; - Image aImgPage = Image( BitmapEx( SdResId( BMP_PAGE ) ) ); - Image aImgPageObjs = Image( BitmapEx( SdResId( BMP_PAGEOBJS ) ) ); - Image aImgObjects = Image( BitmapEx( SdResId( BMP_OBJECTS ) ) ); + Image aImgPage = Image(BitmapEx(BMP_PAGE)); + Image aImgPageObjs = Image(BitmapEx(BMP_PAGEOBJS)); + Image aImgObjects = Image(BitmapEx(BMP_OBJECTS)); // document name already inserted @@ -1580,12 +1580,12 @@ void SdPageObjsTLB::AddShapeToTransferable ( //===== IconProvider ========================================================== SdPageObjsTLB::IconProvider::IconProvider() - : maImgPage( BitmapEx( SdResId( BMP_PAGE ) ) ), - maImgPageExcl( BitmapEx( SdResId( BMP_PAGE_EXCLUDED ) ) ), - maImgPageObjsExcl( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED ) ) ), - maImgPageObjs( BitmapEx( SdResId( BMP_PAGEOBJS ) ) ), - maImgObjects( BitmapEx( SdResId( BMP_OBJECTS ) ) ), - maImgGroup( BitmapEx( SdResId( BMP_GROUP ) ) ) + : maImgPage(BitmapEx(BMP_PAGE)), + maImgPageExcl(BitmapEx(BMP_PAGE_EXCLUDED)), + maImgPageObjsExcl(BitmapEx(BMP_PAGEOBJS_EXCLUDED)), + maImgPageObjs(BitmapEx(BMP_PAGEOBJS)), + maImgObjects(BitmapEx(BMP_OBJECTS)), + maImgGroup(BitmapEx(BMP_GROUP)) { } diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 93c950962a12..f8e2590a06db 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -127,7 +127,8 @@ private: */ // bool mbShowAllShapes; - static sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage ); + static sal_uInt16 GetDragTypeSdStrId(NavigatorDragType eDT); + static OUString GetDragTypeSdBmpId(NavigatorDragType eDT); NavDocInfo* GetDocInfo(); DECL_LINK( SelectToolboxHdl, ToolBox *, void ); diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 39706b03e44a..724c976c5f3f 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -19,190 +19,7 @@ #include "sfx2/sfx.hrc" #include "cfgids.hxx" -// Bitmaps for Tree-ListBox in Effects-TabDialog -#define BMP_PAGE RID_APP_START+42 -#define BMP_PAGEOBJS RID_APP_START+43 -#define BMP_OBJECTS RID_APP_START+44 -#define BMP_DOC_OPEN RID_APP_START+45 -#define BMP_DOC_CLOSED RID_APP_START+46 -#define BMP_DOC_TEXT RID_APP_START+47 -#define BMP_OLE RID_APP_START+48 -#define BMP_PAGE_EXCLUDED RID_APP_START+49 -#define BMP_PAGEOBJS_EXCLUDED RID_APP_START+50 -#define BMP_EXPAND RID_APP_START+51 -#define BMP_COLLAPSE RID_APP_START+52 -#define BMP_GRAPHIC RID_APP_START+53 - -// Bitmaps for ValueSet in EffectWindow - -#define BMP_FOIL_NONE RID_APP_START+120 -#define BMP_GROUP RID_APP_START+121 -#define BMP_WAIT_ICON RID_APP_START+124 -#define BMP_POINTER_ICON RID_APP_START+126 - -// additional effects - -#define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331 -#define BMP_CUSTOM_ANIMATION_INDICATOR RID_SD_START+332 - -#define BMP_LAYOUT_EMPTY RID_SD_START+340 -#define BMP_LAYOUT_HEAD01 RID_SD_START+342 -#define BMP_LAYOUT_HEAD02 RID_SD_START+344 -#define BMP_LAYOUT_HEAD02A RID_SD_START+346 -#define BMP_LAYOUT_HEAD02B RID_SD_START+348 -#define BMP_LAYOUT_HEAD03 RID_SD_START+350 -#define BMP_LAYOUT_HEAD03A RID_SD_START+352 -#define BMP_LAYOUT_HEAD03B RID_SD_START+354 -#define BMP_LAYOUT_HEAD03C RID_SD_START+356 -#define BMP_LAYOUT_HEAD04 RID_SD_START+358 -#define BMP_LAYOUT_HEAD06 RID_SD_START+360 -#define BMP_LAYOUT_TEXTONLY RID_SD_START+362 -#define BMP_LAYOUT_VERTICAL01 RID_SD_START+364 -#define BMP_LAYOUT_VERTICAL02 RID_SD_START+366 - -#define BMP_DISPLAYMODE_SLIDE (RID_SD_START+367) -#define BMP_DISPLAYMODE_OUTLINE (RID_SD_START+368) -#define BMP_DISPLAYMODE_NOTES (RID_SD_START+369) -#define BMP_DISPLAYMODE_SLIDE_SORTER (RID_SD_START+370) -#define BMP_DISPLAYMODE_SLIDE_MASTER (RID_SD_START+371) -#define BMP_DISPLAYMODE_NOTES_MASTER (RID_SD_START+372) -#define BMP_DISPLAYMODE_HANDOUT_MASTER (RID_SD_START+373) - // FREE -#define BMP_FOILH_01 RID_SD_START+388 -#define BMP_FOILH_02 RID_SD_START+390 -#define BMP_FOILH_03 RID_SD_START+392 -#define BMP_FOILH_04 RID_SD_START+394 -#define BMP_FOILH_06 RID_SD_START+396 -#define BMP_FOILH_09 RID_SD_START+398 - -#define BMP_FOILN_01 RID_SD_START+400 - -#define BMP_PLACEHOLDER_SMALL_START (RID_SD_START+402) // these ids must stay in order! -#define BMP_PLACEHOLDER_TABLE_SMALL (RID_SD_START+402) -#define BMP_PLACEHOLDER_CHART_SMALL (RID_SD_START+403) -#define BMP_PLACEHOLDER_IMAGE_SMALL (RID_SD_START+404) -#define BMP_PLACEHOLDER_MOVIE_SMALL (RID_SD_START+405) -#define BMP_PLACEHOLDER_TABLE_SMALL_HOVER (RID_SD_START+406) -#define BMP_PLACEHOLDER_CHART_SMALL_HOVER (RID_SD_START+407) -#define BMP_PLACEHOLDER_IMAGE_SMALL_HOVER (RID_SD_START+408) -#define BMP_PLACEHOLDER_MOVIE_SMALL_HOVER (RID_SD_START+409) -#define BMP_PLACEHOLDER_SMALL_END (RID_SD_START+410) -#define BMP_PLACEHOLDER_LARGE_START (RID_SD_START+410) -#define BMP_PLACEHOLDER_TABLE_LARGE (RID_SD_START+410) -#define BMP_PLACEHOLDER_CHART_LARGE (RID_SD_START+411) -#define BMP_PLACEHOLDER_IMAGE_LARGE (RID_SD_START+412) -#define BMP_PLACEHOLDER_MOVIE_LARGE (RID_SD_START+413) -#define BMP_PLACEHOLDER_TABLE_LARGE_HOVER (RID_SD_START+414) -#define BMP_PLACEHOLDER_CHART_LARGE_HOVER (RID_SD_START+415) -#define BMP_PLACEHOLDER_IMAGE_LARGE_HOVER (RID_SD_START+416) -#define BMP_PLACEHOLDER_MOVIE_LARGE_HOVER (RID_SD_START+417) -#define BMP_PLACEHOLDER_LARGE_END (RID_SD_START+418) // until here! - -// Presenter Screen bitmaps: -#define BMP_PRESENTERSCREEN_BACKGROUND (RID_SD_START+500) -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM (RID_SD_START+501) -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT (RID_SD_START+502) -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT (RID_SD_START+503) -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT (RID_SD_START+504) -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT (RID_SD_START+505) -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT (RID_SD_START+506) -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP (RID_SD_START+507) -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT (RID_SD_START+508) -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT (RID_SD_START+509) -#define BMP_PRESENTERSCREEN_BORDER_BOTTOM (RID_SD_START+510) -#define BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT (RID_SD_START+511) -#define BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT (RID_SD_START+512) -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM (RID_SD_START+513) -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT (RID_SD_START+514) -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT (RID_SD_START+515) -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT (RID_SD_START+516) -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT (RID_SD_START+517) -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP (RID_SD_START+518) -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT (RID_SD_START+519) -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT (RID_SD_START+520) -#define BMP_PRESENTERSCREEN_BORDER_LEFT (RID_SD_START+521) -#define BMP_PRESENTERSCREEN_BORDER_RIGHT (RID_SD_START+522) -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM (RID_SD_START+523) -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT (RID_SD_START+524) -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT (RID_SD_START+525) -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP (RID_SD_START+526) -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT (RID_SD_START+527) -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT (RID_SD_START+528) -#define BMP_PRESENTERSCREEN_BORDER_TOP (RID_SD_START+529) -#define BMP_PRESENTERSCREEN_BORDER_TOP_LEFT (RID_SD_START+530) -#define BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT (RID_SD_START+531) -#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED (RID_SD_START+532) -#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER (RID_SD_START+533) -#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL (RID_SD_START+534) -#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED (RID_SD_START+535) -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER (RID_SD_START+536) -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL (RID_SD_START+537) -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER (RID_SD_START+538) -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL (RID_SD_START+539) -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER (RID_SD_START+540) -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL (RID_SD_START+541) -#define BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED (RID_SD_START+542) -#define BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER (RID_SD_START+543) -#define BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL (RID_SD_START+544) -#define BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED (RID_SD_START+545) -#define BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED (RID_SD_START+546) -#define BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER (RID_SD_START+547) -#define BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL (RID_SD_START+548) -#define BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED (RID_SD_START+549) -#define BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED (RID_SD_START+550) -#define BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER (RID_SD_START+551) -#define BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL (RID_SD_START+552) -#define BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED (RID_SD_START+553) -#define BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED (RID_SD_START+554) -#define BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER (RID_SD_START+555) -#define BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL (RID_SD_START+556) -#define BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED (RID_SD_START+557) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED (RID_SD_START+558) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER (RID_SD_START+559) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL (RID_SD_START+560) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED (RID_SD_START+561) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER (RID_SD_START+562) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL (RID_SD_START+563) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED (RID_SD_START+564) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED (RID_SD_START+565) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER (RID_SD_START+566) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL (RID_SD_START+567) -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED (RID_SD_START+568) -#define BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER (RID_SD_START+569) -#define BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL (RID_SD_START+570) -#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER (RID_SD_START+571) -#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT (RID_SD_START+572) -#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT (RID_SD_START+573) -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED (RID_SD_START+574) -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER (RID_SD_START+575) -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL (RID_SD_START+576) -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED (RID_SD_START+577) -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED (RID_SD_START+578) -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER (RID_SD_START+579) -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL (RID_SD_START+580) -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED (RID_SD_START+581) -#define BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER (RID_SD_START+582) -#define BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL (RID_SD_START+583) -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER (RID_SD_START+584) -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL (RID_SD_START+585) -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER (RID_SD_START+586) -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL (RID_SD_START+587) -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER (RID_SD_START+588) -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL (RID_SD_START+589) -#define BMP_PRESENTERSCREEN_VIEW_BACKGROUND (RID_SD_START+590) -#define BMP_PRESENTERSCREEN_ANIMATION (RID_SD_START+591) -#define BMP_PRESENTERSCREEN_TRANSITION (RID_SD_START+592) -#define BMP_PRESENTATION_MINIMIZER (RID_SD_START+593) -#define BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_MOUSE_OVER (RID_SD_START+594) -#define BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_NORMAL (RID_SD_START+595) - #define RID_GRAPHICSTYLEFAMILY RID_APP_START+395 #define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396 -#define BMP_STYLES_FAMILY_GRAPHICS RID_APP_START+397 -#define BMP_STYLES_FAMILY_PRESENTATIONS RID_APP_START+398 - -#define BMP_EMBEDDED RID_APP_START+399 -#define BMP_LINK RID_APP_START+400 -#define BMP_HYPERLINK RID_APP_START+401 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/tools/IconCache.hxx b/sd/source/ui/inc/tools/IconCache.hxx index 696751a5d4e5..3d08778b9fb8 100644 --- a/sd/source/ui/inc/tools/IconCache.hxx +++ b/sd/source/ui/inc/tools/IconCache.hxx @@ -50,7 +50,7 @@ public: given id or an error occurred. Should not happen under normal circumstances. */ - Image GetIcon (sal_uInt16 nResourceId); + Image GetIcon(const OUString& rResourceId); private: class Implementation; diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 5a2990cb01fb..a909ea619a02 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -35,6 +35,7 @@ #include <vcl/wrkwin.hxx> #include "res_bmp.hrc" +#include "bitmaps.hlst" #include "sdresid.hxx" using namespace ::com::sun::star; @@ -186,7 +187,7 @@ namespace { struct IdMapEntry { char const * sid; - sal_uInt32 nid; + const char* bmpid; }; } @@ -382,14 +383,14 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL }, { "bitmaps/ViewBackground.png", BMP_PRESENTERSCREEN_VIEW_BACKGROUND } }; - sal_uInt32 nid = 0; + OUString bmpid; for (std::size_t i = 0; i != SAL_N_ELEMENTS(map); ++i) { if (id.equalsAscii(map[i].sid)) { - nid = map[i].nid; + bmpid = OUString::createFromAscii(map[i].bmpid); break; } } - if (nid == 0) { + if (bmpid.isEmpty()) { return nullptr; } @@ -401,7 +402,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( if (pCanvas.get() != nullptr) { - BitmapEx aBitmapEx = SdResId(nid); + BitmapEx aBitmapEx(bmpid); cppcanvas::BitmapSharedPtr xBitmap( cppcanvas::VCLFactory::createBitmap(pCanvas, aBitmapEx)); diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 2a621b0fa554..9bcc3d6f1229 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -30,6 +30,7 @@ #include "sdpage.hxx" #include "sdresid.hxx" #include "strings.hrc" +#include "bitmaps.hlst" #include "tools/SlotStateListener.hxx" #include "DrawController.hxx" #include "DrawDocShell.hxx" @@ -68,7 +69,7 @@ namespace sd { namespace sidebar { struct snewfoil_value_info { - sal_uInt16 mnBmpResId; + const char* msBmpResId; sal_uInt16 mnStrResId; WritingMode meWritingMode; AutoLayout maAutoLayout; @@ -78,7 +79,7 @@ static const snewfoil_value_info notes[] = { {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, AUTOLAYOUT_NOTES}, - {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info handout[] = @@ -95,7 +96,7 @@ static const snewfoil_value_info handout[] = AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT9}, - {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info standard[] = @@ -118,7 +119,7 @@ static const snewfoil_value_info standard[] = {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VTITLE_VCONTENT}, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VCONTENT}, {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_2VTEXT}, - {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} + {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; LayoutMenu::LayoutMenu ( @@ -538,11 +539,11 @@ void LayoutMenu::Fill() } Clear(); - for (sal_uInt16 i=1; pInfo!=nullptr&&pInfo->mnBmpResId!=0; i++,pInfo++) + for (sal_uInt16 i=1; pInfo!=nullptr && pInfo->mnStrResId !=0; i++, pInfo++) { if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical) { - BitmapEx aBmp(SdResId(pInfo->mnBmpResId)); + BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId)); if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode)) aBmp.Mirror (BmpMirrorFlags::Horizontal); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 888e49fdd367..3c48479037c3 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -62,6 +62,7 @@ #include "glob.hrc" #include "res_bmp.hrc" +#include "bitmaps.hlst" #include "sdresid.hxx" #include <vcl/canvastools.hxx> #include <vcl/commandinfoprovider.hxx> @@ -1072,7 +1073,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp mxView->getCanvas() ); if (xSpriteCanvas.is()) { - BitmapEx waitSymbolBitmap( SdResId(BMP_WAIT_ICON) ); + BitmapEx waitSymbolBitmap(BMP_WAIT_ICON); const Reference<rendering::XBitmap> xBitmap( vcl::unotools::xBitmapFromBitmapEx( xSpriteCanvas->getDevice(), waitSymbolBitmap ) ); @@ -1085,7 +1086,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp beans::PropertyState_DIRECT_VALUE ) ); } - BitmapEx pointerSymbolBitmap( SdResId(BMP_POINTER_ICON) ); + BitmapEx pointerSymbolBitmap(BMP_POINTER_ICON); const Reference<rendering::XBitmap> xPointerBitmap( vcl::unotools::xBitmapFromBitmapEx( xSpriteCanvas->getDevice(), pointerSymbolBitmap ) ); diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index f86a452f1cdd..75d49df5d0df 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -143,7 +143,7 @@ private: /** Guarded initialization of the specified icon in the maIcons container. */ - void InitializeIcon (const IconType eType, sal_uInt16 nResourceId); + void InitializeIcon(const IconType eType, const OUString& rResourceId); }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 49dfc8ec1f36..b4d41cc4ddff 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -25,6 +25,7 @@ #include "tools/IconCache.hxx" #include "Window.hxx" #include "res_bmp.hrc" +#include "bitmaps.hlst" namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/slidesorter/view/SlsResource.src b/sd/source/ui/slidesorter/view/SlsResource.src deleted file mode 100644 index 20134d804a2a..000000000000 --- a/sd/source/ui/slidesorter/view/SlsResource.src +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "glob.hrc" - -Bitmap IMAGE_SHADOW -{ - File = "slide_sorter_shadow.png"; -}; - -Bitmap IMAGE_INSERT_SHADOW -{ - File = "slide_sorter_insert_shadow.png"; -}; - -Bitmap IMAGE_HIDE_SLIDE_OVERLAY -{ - File = "slide_sorter_hide_slide_overlay.png"; -}; - -Bitmap IMAGE_FOCUS_BORDER -{ - File = "slide_sorter_focus_border.png"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 7bc1b983b2a2..c204140ab45f 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -18,6 +18,7 @@ */ #include "glob.hrc" +#include "bitmaps.hlst" #include "view/SlsTheme.hxx" #include "controller/SlsProperties.hxx" #include "sdresid.hxx" @@ -238,11 +239,11 @@ Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType) } } -void Theme::InitializeIcon (const IconType eType, sal_uInt16 nResourceId) +void Theme::InitializeIcon(const IconType eType, const OUString& rResourceId) { if (eType>=0 && size_t(eType)<maIcons.size()) { - const BitmapEx aIcon((SdResId(nResourceId))); + const BitmapEx aIcon(rResourceId); maIcons[eType] = aIcon; } else diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index 1c520d1d305c..6e05720b6b4c 100644 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx @@ -40,23 +40,23 @@ private: */ static IconCache* s_pIconCache; - typedef std::unordered_map<sal_uInt16,Image> ImageContainer; + typedef std::unordered_map<OUString, Image, OUStringHash> ImageContainer; ImageContainer maContainer; - Image GetIcon (sal_uInt16 nResourceId); + Image GetIcon(const OUString& rResourceId); }; IconCache* IconCache::Implementation::s_pIconCache = nullptr; -Image IconCache::Implementation::GetIcon (sal_uInt16 nResourceId) +Image IconCache::Implementation::GetIcon(const OUString& rResourceId) { Image aResult; ImageContainer::iterator iImage; - iImage = maContainer.find (nResourceId); + iImage = maContainer.find(rResourceId); if (iImage == maContainer.end()) { - aResult = Image(BitmapEx(SdResId(nResourceId))); - maContainer[nResourceId] = aResult; + aResult = Image(BitmapEx(rResourceId)); + maContainer[rResourceId] = aResult; } else aResult = iImage->second; @@ -91,9 +91,9 @@ IconCache& IconCache::Instance() return *Implementation::s_pIconCache; } -Image IconCache::GetIcon (sal_uInt16 nResourceId) +Image IconCache::GetIcon(const OUString& rResourceId) { - return mpImpl->GetIcon (nResourceId); + return mpImpl->GetIcon(rResourceId); } IconCache::IconCache() diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 70f0ec899ee1..11ec2247db07 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -69,6 +69,7 @@ #include "DrawViewShell.hxx" #include "unoobj.hxx" #include "res_bmp.hrc" +#include "bitmaps.hlst" #include "unokywds.hxx" #include "unopback.hxx" #include <vcl/dibtools.hxx> @@ -1094,8 +1095,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) } case WID_PAGE_LDBITMAP: { - Reference< awt::XBitmap > xBitmap( - VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( BMP_PAGE ) ) ) ); + Reference< awt::XBitmap > xBitmap(VCLUnoHelper::CreateBitmap(BitmapEx(BMP_PAGE))); aAny <<= xBitmap; } break; diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 19254e201c9c..60a396e2d865 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -46,6 +46,7 @@ #include "DrawController.hxx" #include "glob.hrc" #include "strings.hrc" +#include "bitmaps.hlst" #include "sdresid.hxx" #include "EventMultiplexer.hxx" #include "ViewShellManager.hxx" @@ -64,25 +65,43 @@ class ImageButtonHdl; static const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; static const sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; -static BitmapEx loadImageResource( sal_uInt16 nId ) +static const OUStringLiteral aSmallPlaceHolders[] = { - SdResId aResId( nId ); - aResId.SetRT( RSC_BITMAP ); + BMP_PLACEHOLDER_TABLE_SMALL, + BMP_PLACEHOLDER_CHART_SMALL, + BMP_PLACEHOLDER_IMAGE_SMALL, + BMP_PLACEHOLDER_MOVIE_SMALL, + BMP_PLACEHOLDER_TABLE_SMALL_HOVER, + BMP_PLACEHOLDER_CHART_SMALL_HOVER, + BMP_PLACEHOLDER_IMAGE_SMALL_HOVER, + BMP_PLACEHOLDER_MOVIE_SMALL_HOVER +}; - return BitmapEx( aResId ); -} +static const OUStringLiteral aBigPlaceHolders[] = +{ + BMP_PLACEHOLDER_TABLE_LARGE, + BMP_PLACEHOLDER_CHART_LARGE, + BMP_PLACEHOLDER_IMAGE_LARGE, + BMP_PLACEHOLDER_MOVIE_LARGE, + BMP_PLACEHOLDER_TABLE_LARGE_HOVER, + BMP_PLACEHOLDER_CHART_LARGE_HOVER, + BMP_PLACEHOLDER_IMAGE_LARGE_HOVER, + BMP_PLACEHOLDER_MOVIE_LARGE_HOVER +}; static BitmapEx* getButtonImage( int index, bool large ) { - static vcl::DeleteOnDeinit< BitmapEx > gSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; - static vcl::DeleteOnDeinit< BitmapEx > gLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; + static vcl::DeleteOnDeinit< BitmapEx > gSmallButtonImages[SAL_N_ELEMENTS(aSmallPlaceHolders)] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; + static vcl::DeleteOnDeinit< BitmapEx > gLargeButtonImages[SAL_N_ELEMENTS(aBigPlaceHolders)] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; + + assert(SAL_N_ELEMENTS(aSmallPlaceHolders) == SAL_N_ELEMENTS(aBigPlaceHolders)); if( !gSmallButtonImages[0].get() ) { - for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ ) + for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aSmallPlaceHolders); i++ ) { - gSmallButtonImages[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ) ) ); - gLargeButtonImages[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ) ) ); + gSmallButtonImages[i].set(new BitmapEx(aSmallPlaceHolders[i])); + gLargeButtonImages[i].set(new BitmapEx(aBigPlaceHolders[i])); } } |