From ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 21 Nov 2012 17:19:28 +0100 Subject: [PATCH] Turn presenter screen from bundled extension to plain code The immediate trigger was 5e5c11c664f67ff9fd1120905b09a32bea3b2f6c "fdo#42070 Fix RTL support in presenter console" causing build failures on Mac OS X when linking the extension against vcl, but there should be more benefits of going from a bundled-anyway extension to plain code. (Not the least to get rid of the com.sun.star.drawing.XPresenterHelper hack.) To avoid unnecessary confusion between the newly plain code and any instance of the old extension still installed (per-user or shared), I renamed all relevant identifiers as follows: * UNO implementation com.sun.star.comp.Draw.framework.PresenterScreenJob -> org.libreoffice.comp.PresenterScreenJob * UNO implementation com.sun.star.sdext.presenter.PresenterProtocolHandler -> org.libreoffice.comp.PresenterScreenProtocolHandler * protocol handler schema vnd.com.sun.star.comp.PresenterScreen -> vnd.org.libreoffice.presenterscreen * configuration schema /org.openoffice.Office.extension.PresenterScreen -> /org.openoffice.Office.PresenterScreen (it appears this contains little to no user-changeable data anyway, so not migrating it to a new user profile due to the schema name change should not be problematic) * job ID onDocumentOpenedJob -> org.libreoffice.PresenterScreen Even with these precautions, having the presenter screen installed both as plain code and as a (per-user or shared) extension still leads to a crash when activating presentation mode (likely due to how both codes want to take control of the screen). To mitigate this, existing installations of the extension are explicitly not migrated to new user profiles. The sdext/source/presenter/bitmaps/*.png files were moved to icon-themes/galaxy/sd/res/presenterscreen-*.png and are now accessed via SdResId (adding the relevant data to sd/source/ui/inc/res_bmp.hrc and sd/source/ui/app/res_bmp.src; not sure whether these locations are already ideal). The code itself has been left mostly unchanged in sdext/source/presenter/, and it still clumsily communicates with sd core code via XPresenterHelper. There is a lot of room for improvement here. The help data is left untouched at sdext/source/presenter/help/ and needs to be incorporated properly into helpcontent2 in a follow-up commit. The --disable-ext-presenter-console configure switch is gone. Change-Id: I71adb7ae6dcdbd1802151fce6e3871d8a2026332 --- Repository.mk | 2 +- config_host.mk.in | 1 - configure.ac | 22 - .../sd/res/presenterscreen-Background.png | Bin .../presenterscreen-BorderActiveBottom.png | Bin ...senterscreen-BorderActiveBottomCallout.png | Bin ...presenterscreen-BorderActiveBottomLeft.png | Bin ...resenterscreen-BorderActiveBottomRight.png | Bin .../res/presenterscreen-BorderActiveLeft.png | Bin .../res/presenterscreen-BorderActiveRight.png | Bin .../res/presenterscreen-BorderActiveTop.png | Bin .../presenterscreen-BorderActiveTopLeft.png | Bin .../presenterscreen-BorderActiveTopRight.png | Bin .../sd/res/presenterscreen-BorderBottom.png | Bin .../res/presenterscreen-BorderBottomLeft.png | Bin .../res/presenterscreen-BorderBottomRight.png | Bin ...esenterscreen-BorderCurrentSlideBottom.png | Bin ...terscreen-BorderCurrentSlideBottomLeft.png | Bin ...erscreen-BorderCurrentSlideBottomRight.png | Bin ...presenterscreen-BorderCurrentSlideLeft.png | Bin ...resenterscreen-BorderCurrentSlideRight.png | Bin .../presenterscreen-BorderCurrentSlideTop.png | Bin ...senterscreen-BorderCurrentSlideTopLeft.png | Bin ...enterscreen-BorderCurrentSlideTopRight.png | Bin .../sd/res/presenterscreen-BorderLeft.png | Bin .../sd/res/presenterscreen-BorderRight.png | Bin .../presenterscreen-BorderToolbarBottom.png | Bin .../res/presenterscreen-BorderToolbarLeft.png | Bin .../presenterscreen-BorderToolbarRight.png | Bin .../res/presenterscreen-BorderToolbarTop.png | Bin .../presenterscreen-BorderToolbarTopLeft.png | Bin .../presenterscreen-BorderToolbarTopRight.png | Bin .../sd/res/presenterscreen-BorderTop.png | Bin .../sd/res/presenterscreen-BorderTopLeft.png | Bin .../sd/res/presenterscreen-BorderTopRight.png | Bin ...esenterscreen-ButtonEffectNextDisabled.png | Bin ...senterscreen-ButtonEffectNextMouseOver.png | Bin ...presenterscreen-ButtonEffectNextNormal.png | Bin ...esenterscreen-ButtonEffectNextSelected.png | Bin ...enterscreen-ButtonFrameCenterMouseOver.png | Bin ...resenterscreen-ButtonFrameCenterNormal.png | Bin ...esenterscreen-ButtonFrameLeftMouseOver.png | Bin .../presenterscreen-ButtonFrameLeftNormal.png | Bin ...senterscreen-ButtonFrameRightMouseOver.png | Bin ...presenterscreen-ButtonFrameRightNormal.png | Bin .../presenterscreen-ButtonHelpDisabled.png | Bin .../presenterscreen-ButtonHelpMouseOver.png | Bin .../res/presenterscreen-ButtonHelpNormal.png | Bin .../presenterscreen-ButtonHelpSelected.png | Bin .../presenterscreen-ButtonMinusDisabled.png | Bin .../presenterscreen-ButtonMinusMouseOver.png | Bin .../res/presenterscreen-ButtonMinusNormal.png | Bin .../presenterscreen-ButtonMinusSelected.png | Bin .../presenterscreen-ButtonNotesDisabled.png | Bin .../presenterscreen-ButtonNotesMouseOver.png | Bin .../res/presenterscreen-ButtonNotesNormal.png | Bin .../presenterscreen-ButtonNotesSelected.png | Bin .../presenterscreen-ButtonPlusDisabled.png | Bin .../presenterscreen-ButtonPlusMouseOver.png | Bin .../res/presenterscreen-ButtonPlusNormal.png | Bin .../presenterscreen-ButtonPlusSelected.png | Bin ...resenterscreen-ButtonSlideNextDisabled.png | Bin ...esenterscreen-ButtonSlideNextMouseOver.png | Bin .../presenterscreen-ButtonSlideNextNormal.png | Bin ...nterscreen-ButtonSlidePreviousDisabled.png | Bin ...terscreen-ButtonSlidePreviousMouseOver.png | Bin ...senterscreen-ButtonSlidePreviousNormal.png | Bin ...nterscreen-ButtonSlidePreviousSelected.png | Bin ...senterscreen-ButtonSlideSorterDisabled.png | Bin ...enterscreen-ButtonSlideSorterMouseOver.png | Bin ...resenterscreen-ButtonSlideSorterNormal.png | Bin ...senterscreen-ButtonSlideSorterSelected.png | Bin ...terscreen-ButtonSwitchMonitorMouseOver.png | Bin ...senterscreen-ButtonSwitchMonitorNormal.png | Bin .../presenterscreen-LabelMouseOverCenter.png | Bin .../presenterscreen-LabelMouseOverLeft.png | Bin .../presenterscreen-LabelMouseOverRight.png | Bin ...enterscreen-ScrollbarArrowDownDisabled.png | Bin ...nterscreen-ScrollbarArrowDownMouseOver.png | Bin ...esenterscreen-ScrollbarArrowDownNormal.png | Bin ...enterscreen-ScrollbarArrowDownSelected.png | Bin ...esenterscreen-ScrollbarArrowUpDisabled.png | Bin ...senterscreen-ScrollbarArrowUpMouseOver.png | Bin ...presenterscreen-ScrollbarArrowUpNormal.png | Bin ...esenterscreen-ScrollbarArrowUpSelected.png | Bin ...erscreen-ScrollbarPagerMiddleMouseOver.png | Bin ...enterscreen-ScrollbarPagerMiddleNormal.png | Bin ...erscreen-ScrollbarThumbBottomMouseOver.png | Bin ...enterscreen-ScrollbarThumbBottomNormal.png | Bin ...erscreen-ScrollbarThumbMiddleMouseOver.png | Bin ...enterscreen-ScrollbarThumbMiddleNormal.png | Bin ...enterscreen-ScrollbarThumbTopMouseOver.png | Bin ...resenterscreen-ScrollbarThumbTopNormal.png | Bin .../sd/res/presenterscreen-ViewBackground.png | Bin .../com/sun/star/drawing/XPresenterHelper.idl | 20 +- officecfg/Configuration_officecfg.mk | 3 + .../data/org/openoffice/Office/Jobs.xcu | 18 +- .../openoffice/Office}/PresenterScreen.xcu | 30 +- .../org/openoffice/Office/ProtocolHandler.xcu | 11 +- .../registry/data/org/openoffice/Setup.xcu | 5 + officecfg/registry/files.mk | 1 + .../openoffice/Office}/PresenterScreen.xcs | 7 +- postprocess/packcomponents/makefile.mk | 1 + postprocess/packregistry/makefile.mk | 4 + .../extensions/directory_extensions.scp | 11 - scp2/source/extensions/file_extensions.scp | 13 - scp2/source/extensions/module_extensions.scp | 15 - scp2/source/extensions/module_extensions.ulf | 6 - scp2/source/impress/file_impress.scp | 11 + sd/source/ui/app/res_bmp.src | 457 ++++++++++++++++++ sd/source/ui/inc/res_bmp.hrc | 93 ++++ sd/source/ui/presenter/PresenterHelper.cxx | 225 ++++++++- sd/source/ui/presenter/PresenterHelper.hxx | 3 - sdext/Configuration_presenter.mk | 43 -- sdext/CustomTarget_presenter.mk | 39 -- sdext/Extension_presenter.mk | 146 ------ sdext/Library_presenter.mk | 4 - sdext/Module_sdext.mk | 14 +- sdext/Rdb_presenter.mk | 34 -- sdext/source/presenter/META-INF/manifest.xml | 33 -- .../presenter/PresenterAccessibility.cxx | 6 +- .../presenter/PresenterBitmapContainer.cxx | 21 +- .../presenter/PresenterBitmapContainer.hxx | 5 - sdext/source/presenter/PresenterComponent.cxx | 39 -- sdext/source/presenter/PresenterComponent.hxx | 48 -- .../PresenterConfigurationAccess.cxx | 2 +- .../PresenterExtensionIdentifier.hxx | 29 -- sdext/source/presenter/PresenterHelpView.cxx | 2 +- .../presenter/PresenterProtocolHandler.cxx | 8 +- sdext/source/presenter/PresenterScreen.cxx | 10 +- sdext/source/presenter/PresenterScrollBar.cxx | 4 +- .../source/presenter/PresenterSlideSorter.cxx | 6 +- sdext/source/presenter/PresenterTheme.cxx | 40 +- sdext/source/presenter/PresenterToolBar.cxx | 8 +- .../presenter/PresenterWindowManager.cxx | 4 +- sdext/source/presenter/description-en-US.txt | 2 - sdext/source/presenter/description.xml | 51 -- sdext/source/presenter/presenter.component | 9 +- .../data/org/openoffice/Office/Jobs.xcu | 37 -- .../org/openoffice/Office/ProtocolHandler.xcu | 27 -- 140 files changed, 869 insertions(+), 761 deletions(-) rename sdext/source/presenter/bitmaps/Background.png => icon-themes/galaxy/sd/res/presenterscreen-Background.png (100%) rename sdext/source/presenter/bitmaps/BorderActiveBottom.png => icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottom.png (100%) rename sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png => icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomCallout.png (100%) rename sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderActiveBottomRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomRight.png (100%) rename sdext/source/presenter/bitmaps/BorderActiveLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderActiveLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderActiveRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderActiveRight.png (100%) rename sdext/source/presenter/bitmaps/BorderActiveTop.png => icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTop.png (100%) rename sdext/source/presenter/bitmaps/BorderActiveTopLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderActiveTopRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopRight.png (100%) rename sdext/source/presenter/bitmaps/BorderBottom.png => icon-themes/galaxy/sd/res/presenterscreen-BorderBottom.png (100%) rename sdext/source/presenter/bitmaps/BorderBottomLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderBottomLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderBottomRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderBottomRight.png (100%) rename sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png => icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottom.png (100%) rename sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomRight.png (100%) rename sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideRight.png (100%) rename sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png => icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTop.png (100%) rename sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopRight.png (100%) rename sdext/source/presenter/bitmaps/BorderLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderRight.png (100%) rename sdext/source/presenter/bitmaps/BorderToolbarBottom.png => icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarBottom.png (100%) rename sdext/source/presenter/bitmaps/BorderToolbarLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderToolbarRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarRight.png (100%) rename sdext/source/presenter/bitmaps/BorderToolbarTop.png => icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTop.png (100%) rename sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderToolbarTopRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopRight.png (100%) rename sdext/source/presenter/bitmaps/BorderTop.png => icon-themes/galaxy/sd/res/presenterscreen-BorderTop.png (100%) rename sdext/source/presenter/bitmaps/BorderTopLeft.png => icon-themes/galaxy/sd/res/presenterscreen-BorderTopLeft.png (100%) rename sdext/source/presenter/bitmaps/BorderTopRight.png => icon-themes/galaxy/sd/res/presenterscreen-BorderTopRight.png (100%) rename sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextDisabled.png (100%) rename sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextSelected.png (100%) rename sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonHelpDisabled.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpDisabled.png (100%) rename sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonHelpNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonHelpSelected.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpSelected.png (100%) rename sdext/source/presenter/bitmaps/ButtonMinusDisabled.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusDisabled.png (100%) rename sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonMinusNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonMinusSelected.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusSelected.png (100%) rename sdext/source/presenter/bitmaps/ButtonNotesDisabled.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesDisabled.png (100%) rename sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonNotesNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonNotesSelected.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesSelected.png (100%) rename sdext/source/presenter/bitmaps/ButtonPlusDisabled.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusDisabled.png (100%) rename sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonPlusNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonPlusSelected.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusSelected.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextDisabled.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousDisabled.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousSelected.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterDisabled.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterNormal.png (100%) rename sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterSelected.png (100%) rename sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorNormal.png (100%) rename sdext/source/presenter/bitmaps/LabelMouseOverCenter.png => icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverCenter.png (100%) rename sdext/source/presenter/bitmaps/LabelMouseOverLeft.png => icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverLeft.png (100%) rename sdext/source/presenter/bitmaps/LabelMouseOverRight.png => icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverRight.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownDisabled.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownNormal.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownSelected.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpDisabled.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpNormal.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpSelected.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomNormal.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png (100%) rename sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png => icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopNormal.png (100%) rename sdext/source/presenter/bitmaps/ViewBackground.png => icon-themes/galaxy/sd/res/presenterscreen-ViewBackground.png (100%) rename {sdext/source/presenter/registry/data/org/openoffice/Office/extension => officecfg/registry/data/org/openoffice/Office}/PresenterScreen.xcu (97%) rename {sdext/source/presenter/registry/schema/org/openoffice/Office/extension => officecfg/registry/schema/org/openoffice/Office}/PresenterScreen.xcs (98%) delete mode 100644 sdext/Configuration_presenter.mk delete mode 100644 sdext/CustomTarget_presenter.mk delete mode 100644 sdext/Extension_presenter.mk delete mode 100644 sdext/Rdb_presenter.mk delete mode 100644 sdext/source/presenter/META-INF/manifest.xml delete mode 100644 sdext/source/presenter/PresenterComponent.hxx delete mode 100644 sdext/source/presenter/PresenterExtensionIdentifier.hxx delete mode 100644 sdext/source/presenter/description-en-US.txt delete mode 100644 sdext/source/presenter/description.xml delete mode 100644 sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu delete mode 100644 sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu diff --git a/Repository.mk b/Repository.mk index dd5a93c65067..7592b50d4e17 100755 --- a/Repository.mk +++ b/Repository.mk @@ -535,6 +535,7 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ + PresenterScreen \ basprov \ cairocanvas \ canvasfactory \ @@ -637,7 +638,6 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ pdfimport \ - PresenterScreen \ SunPresentationMinimizer \ )) diff --git a/config_host.mk.in b/config_host.mk.in index a68918222ec0..0e5faf5e0334 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -164,7 +164,6 @@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@ export ENABLE_OPENGL=@ENABLE_OPENGL@ export ENABLE_OXYGENOFFICE=@ENABLE_OXYGENOFFICE@ export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@ -export ENABLE_PRESENTER_SCREEN=@ENABLE_PRESENTER_SCREEN@ export ENABLE_QUICKSTART_LIBPNG=@ENABLE_QUICKSTART_LIBPNG@ export ENABLE_RANDR=@ENABLE_RANDR@ export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@ diff --git a/configure.ac b/configure.ac index 024a2b397810..b9ac3018b23f 100644 --- a/configure.ac +++ b/configure.ac @@ -626,11 +626,6 @@ AC_ARG_ENABLE(ext-pdfimport, [Disable the PDF Import extension.]) ) -AC_ARG_ENABLE(ext-presenter-console, - AS_HELP_STRING([--disable-ext-presenter-console], - [Disable the Presenter Console extension.]) -) - AC_ARG_ENABLE(ext-presenter-minimizer, AS_HELP_STRING([--disable-ext-presenter-minimizer], [Disable the Presentation Minimizer extension.]) @@ -9748,18 +9743,6 @@ else fi AC_SUBST(ENABLE_MINIMIZER) -# presenter console extension? -AC_MSG_CHECKING([whether to build the Presenter Console extension]) -if test "x$enable_ext_presenter_console" != "xno" -a "x$enable_extension_integration" != "xno"; then - AC_MSG_RESULT([yes]) - ENABLE_PRESENTER_SCREEN=YES -else - AC_MSG_RESULT([no]) - ENABLE_PRESENTER_SCREEN=NO - SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PRESENTER_SCREEN" -fi -AC_SUBST(ENABLE_PRESENTER_SCREEN) - # pdf import extension? AC_MSG_CHECKING([whether to build the PDF Import extension]) if test "x$enable_ext_pdfimport" != "xno" -a "x$enable_extension_integration" != "xno"; then @@ -9801,11 +9784,6 @@ AC_SUBST(POPPLER_CFLAGS) AC_SUBST(POPPLER_LIBS) AC_SUBST(XPDF_TARBALL) - -if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then - BUILD_TYPE="$BUILD_TYPE SDEXT" -fi - AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then AC_MSG_RESULT([yes]) diff --git a/sdext/source/presenter/bitmaps/Background.png b/icon-themes/galaxy/sd/res/presenterscreen-Background.png similarity index 100% rename from sdext/source/presenter/bitmaps/Background.png rename to icon-themes/galaxy/sd/res/presenterscreen-Background.png diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottom.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottom.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderActiveBottom.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottom.png diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomCallout.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomCallout.png diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderActiveBottomRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomRight.png diff --git a/sdext/source/presenter/bitmaps/BorderActiveLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderActiveLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderActiveLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderActiveRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderActiveRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderActiveRight.png diff --git a/sdext/source/presenter/bitmaps/BorderActiveTop.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTop.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderActiveTop.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTop.png diff --git a/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderActiveTopLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderActiveTopRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderActiveTopRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopRight.png diff --git a/sdext/source/presenter/bitmaps/BorderBottom.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderBottom.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderBottom.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderBottom.png diff --git a/sdext/source/presenter/bitmaps/BorderBottomLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderBottomLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderBottomLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderBottomLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderBottomRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderBottomRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderBottomRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderBottomRight.png diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottom.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottom.png diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomRight.png diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideRight.png diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTop.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTop.png diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopRight.png diff --git a/sdext/source/presenter/bitmaps/BorderLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderRight.png diff --git a/sdext/source/presenter/bitmaps/BorderToolbarBottom.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarBottom.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderToolbarBottom.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarBottom.png diff --git a/sdext/source/presenter/bitmaps/BorderToolbarLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderToolbarLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderToolbarRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderToolbarRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarRight.png diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTop.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTop.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderToolbarTop.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTop.png diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderToolbarTopRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopRight.png diff --git a/sdext/source/presenter/bitmaps/BorderTop.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderTop.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderTop.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderTop.png diff --git a/sdext/source/presenter/bitmaps/BorderTopLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderTopLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderTopLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderTopLeft.png diff --git a/sdext/source/presenter/bitmaps/BorderTopRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderTopRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/BorderTopRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-BorderTopRight.png diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextDisabled.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextDisabled.png diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextSelected.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextSelected.png diff --git a/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpDisabled.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonHelpDisabled.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpDisabled.png diff --git a/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonHelpNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonHelpNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonHelpSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpSelected.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonHelpSelected.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpSelected.png diff --git a/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusDisabled.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonMinusDisabled.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusDisabled.png diff --git a/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonMinusNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonMinusNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonMinusSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusSelected.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonMinusSelected.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusSelected.png diff --git a/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesDisabled.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonNotesDisabled.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesDisabled.png diff --git a/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonNotesNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonNotesNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonNotesSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesSelected.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonNotesSelected.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesSelected.png diff --git a/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusDisabled.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonPlusDisabled.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusDisabled.png diff --git a/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonPlusNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonPlusNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonPlusSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusSelected.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonPlusSelected.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusSelected.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextDisabled.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextDisabled.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousDisabled.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousDisabled.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousSelected.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousSelected.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterDisabled.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterDisabled.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterNormal.png diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterSelected.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterSelected.png diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorNormal.png diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png b/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverCenter.png similarity index 100% rename from sdext/source/presenter/bitmaps/LabelMouseOverCenter.png rename to icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverCenter.png diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverLeft.png similarity index 100% rename from sdext/source/presenter/bitmaps/LabelMouseOverLeft.png rename to icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverLeft.png diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverRight.png b/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverRight.png similarity index 100% rename from sdext/source/presenter/bitmaps/LabelMouseOverRight.png rename to icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverRight.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownDisabled.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownDisabled.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownNormal.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownSelected.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownSelected.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpDisabled.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpDisabled.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpNormal.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpSelected.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpSelected.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomNormal.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopNormal.png similarity index 100% rename from sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png rename to icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopNormal.png diff --git a/sdext/source/presenter/bitmaps/ViewBackground.png b/icon-themes/galaxy/sd/res/presenterscreen-ViewBackground.png similarity index 100% rename from sdext/source/presenter/bitmaps/ViewBackground.png rename to icon-themes/galaxy/sd/res/presenterscreen-ViewBackground.png diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl index 003b6c1b5e75..6d40c6af3c9b 100644 --- a/offapi/com/sun/star/drawing/XPresenterHelper.idl +++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl @@ -28,13 +28,13 @@ module com { module sun { module star { module drawing { -/** This interface is a collection of functions that are necessary to +/** This interface is a collection of functions that were necessary to implement larger parts of the presenter screen as extension. The - methods of this interface give access to services that can, at the - moment, only implemented in the Office core, not in an extension. + methods of this interface give access to services that could only be + implemented in the Office core, not in an extension. -

With time some, maybe all, methods can moved to other, better suited, - interfaces.

+

As the presenter screen is no extension any more, this hack can go again; + it just needs clean-up.

*/ interface XPresenterHelper { @@ -114,17 +114,15 @@ interface XPresenterHelper void toTop ( [in] ::com::sun::star::awt::XWindow xWindow); - /** Load a bitmap from a file or other accessible resource that can be - located via a URL. - @param sURL - The URL of the bitmap. For a file URL the bitmap is loaded from - the specified file. + /** Load a bitmap with a given ID. + @param id + The ID of the bitmap. @param xCanvas The bitmap is created to be compatible, and possibly optimized, for this canvas. */ ::com::sun::star::rendering::XBitmap loadBitmap ( - [in] string sURL, + [in] string id, [in] ::com::sun::star::rendering::XCanvas xCanvas); /** Capture the mouse so that no other window will receive mouse events. diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 7b03616a48b5..df9b30aa97a4 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -82,7 +82,9 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Common-macosx.xcu \ org/openoffice/Office/Common-wnt.xcu \ org/openoffice/Office/Common-UseOOoFileDialogs.xcu \ + org/openoffice/Office/Jobs-impress.xcu \ org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \ + org/openoffice/Office/ProtocolHandler-impress.xcu \ org/openoffice/Office/Scripting-python.xcu \ org/openoffice/Office/Common-cjk.xcu \ org/openoffice/Office/Common-ctl.xcu \ @@ -124,6 +126,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/Common.xcu \ org/openoffice/Office/SFX.xcu \ org/openoffice/Office/DataAccess.xcu \ + org/openoffice/Office/PresenterScreen.xcu \ org/openoffice/Office/TableWizard.xcu \ org/openoffice/Office/UI.xcu \ org/openoffice/Office/Embedding.xcu \ diff --git a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu index 7dea57841d32..dffb3f84f5e4 100644 --- a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu @@ -17,9 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + + + + org.libreoffice.comp.PresenterScreenJob + + + com.sun.star.presentation.PresentationDocument + + + + + + + diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu similarity index 97% rename from sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu rename to officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu index 837805794dc3..fe2c78c46dce 100644 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu +++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -30,7 +30,7 @@ bitmaps/ButtonSlidePreviousNormal.png - vnd.com.sun.star.comp.PresenterScreen:PrevSlide + vnd.org.libreoffice.presenterscreen:PrevSlide 12 Bold @@ -60,7 +60,7 @@ bitmaps/ButtonEffectNextNormal.png - vnd.com.sun.star.comp.PresenterScreen:NextEffect + vnd.org.libreoffice.presenterscreen:NextEffect 12 Bold @@ -90,7 +90,7 @@ bitmaps/ButtonNotesNormal.png - vnd.com.sun.star.comp.PresenterScreen:ShowNotes + vnd.org.libreoffice.presenterscreen:ShowNotes 12 Bold @@ -113,7 +113,7 @@ FFFFFF - vnd.com.sun.star.comp.PresenterScreen:CloseNotes + vnd.org.libreoffice.presenterscreen:CloseNotes @@ -129,7 +129,7 @@ bitmaps/ButtonSlideSorterNormal.png - vnd.com.sun.star.comp.PresenterScreen:ShowSlideSorter + vnd.org.libreoffice.presenterscreen:ShowSlideSorter 12 Bold @@ -152,7 +152,7 @@ FFFFFF - vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter + vnd.org.libreoffice.presenterscreen:CloseSlideSorter @@ -220,7 +220,7 @@ bitmaps/ButtonSwitchMonitorNormal.png - vnd.com.sun.star.comp.PresenterScreen:SwitchMonitor + vnd.org.libreoffice.presenterscreen:SwitchMonitor 12 Bold @@ -258,7 +258,7 @@ bitmaps/ButtonHelpNormal.png - vnd.com.sun.star.comp.PresenterScreen:ShowHelp + vnd.org.libreoffice.presenterscreen:ShowHelp 12 Bold @@ -281,7 +281,7 @@ FFFFFF - vnd.com.sun.star.comp.PresenterScreen:CloseHelp + vnd.org.libreoffice.presenterscreen:CloseHelp @@ -312,7 +312,7 @@ bitmaps/ButtonPlusNormal.png - vnd.com.sun.star.comp.PresenterScreen:GrowNotesFont + vnd.org.libreoffice.presenterscreen:GrowNotesFont @@ -332,7 +332,7 @@ bitmaps/ButtonMinusNormal.png - vnd.com.sun.star.comp.PresenterScreen:ShrinkNotesFont + vnd.org.libreoffice.presenterscreen:ShrinkNotesFont @@ -354,21 +354,21 @@ Close - vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter + vnd.org.libreoffice.presenterscreen:CloseSlideSorter NotesViewCloser Close - vnd.com.sun.star.comp.PresenterScreen:CloseNotes + vnd.org.libreoffice.presenterscreen:CloseNotes HelpViewCloser Close - vnd.com.sun.star.comp.PresenterScreen:CloseHelp + vnd.org.libreoffice.presenterscreen:CloseHelp diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu index 36ec36bf924a..33d81468c4b2 100644 --- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu +++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu @@ -17,7 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -59,5 +62,11 @@ vnd.sun.star.findbar:* + + + vnd.org.libreoffice.presenterscreen:* + + diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 3d8512aedd23..0fadef2d828b 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -791,6 +791,11 @@ com.sun.star.migration.Extensions + + + com.sun.PresenterScreen-* + + diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk index 2280f1cd1023..1f6fbfa4d1ac 100644 --- a/officecfg/registry/files.mk +++ b/officecfg/registry/files.mk @@ -40,6 +40,7 @@ officecfg_XCSFILES := \ Office/OOoImprovement/Settings \ Office/OptionsDialog \ Office/Paths \ + Office/PresenterScreen \ Office/ProtocolHandler \ Office/Recovery \ Office/SFX \ diff --git a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs similarity index 98% rename from sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs rename to officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs index 74900896c96a..eb4e6ae79fd8 100644 --- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + AF Configuration of the Presenter Screen extension. @@ -330,11 +330,6 @@ mean default theme. - - Name of the extension which contains the bitmaps - referenced by this theme. - - Color or bitmap that is used to paint the background. diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 25c55e4a0c4f..51c5359e0e8f 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -80,6 +80,7 @@ my_components = \ component/sd/util/sd \ component/sd/util/sdd \ component/sd/util/sdfilt \ + component/sdext/source/presenter/presenter \ component/sfx2/util/sfx \ component/slideshow/util/slideshow \ component/sot/util/sot \ diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 019b1dce756a..d4952faa7383 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -99,14 +99,18 @@ MY_FILES_graphicfilter = \ MY_DEPS_impress = main MY_FILES_impress = \ + $(MY_XCS)/Office/PresenterScreen.xcs \ $(MY_XCS)/Office/UI/Effects.xcs \ $(MY_XCS)/Office/UI/ImpressWindowState.xcs \ + $(MY_XCU)/Office/PresenterScreen.xcu \ $(MY_XCU)/Office/UI/Effects.xcu \ $(MY_XCU)/Office/UI/ImpressWindowState.xcu \ $(MY_MOD)/fcfg_impress_filters.xcu \ $(MY_MOD)/fcfg_impress_types.xcu \ $(MY_MOD)/org/openoffice/Office/Common-impress.xcu \ $(MY_MOD)/org/openoffice/Office/Embedding-impress.xcu \ + $(MY_MOD)/org/openoffice/Office/Jobs-impress.xcu \ + $(MY_MOD)/org/openoffice/Office/ProtocolHandler-impress.xcu \ $(MY_MOD)/org/openoffice/Setup-impress.xcu MY_DEPS_korea = main diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index ca2d2c1c6d79..62d3b942ce07 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -66,17 +66,6 @@ End #endif -/* ** Presenter Screen ** */ - -#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN - -Directory gid_Brand_Dir_Share_Extensions_Presenter_Screen - ParentID = gid_Brand_Dir_Share_Extensions; - DosName = "presenter-screen"; -End - -#endif - /* ** PDF Import ** */ #ifndef WITHOUT_EXTENSION_PDFIMPORT diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 90e99875d32e..f268379905f2 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -72,19 +72,6 @@ End #endif -/* ** Presenter Screen ** */ - -#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN - -File gid_File_Oxt_Presenter_Screen - TXT_FILE_BODY; - Styles = (PACKED, ARCHIVE); - Dir = gid_Brand_Dir_Share_Extensions_Presenter_Screen; - Name = "presenter-screen.oxt"; -End - -#endif - /* ** PDF Import ** */ #ifndef WITHOUT_EXTENSION_PDFIMPORT diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 91853ea629e1..48b5f7d31975 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -87,21 +87,6 @@ Module gid_Module_Optional_Extensions_MEDIAWIKI End #endif -/* ** Presenter Screen ** */ - -#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN -Module gid_Module_Optional_Extensions_PRESENTER_SCREEN - PackageInfo = "packinfo_extensions.txt"; - MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN); - ParentID = gid_Module_Optional_Extensions; - Files = ( - gid_File_Oxt_Presenter_Screen ); - Minimal = NO; - Default = YES; - Styles = ( ); -End -#endif - /* ** PDF Import ** */ #ifndef WITHOUT_EXTENSION_PDFIMPORT diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf index 40d0a0aa176c..1d9e2476e629 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -51,12 +51,6 @@ en-US = "MediaWiki Publisher" [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI] en-US = "MediaWiki Publisher" -[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN] -en-US = "Presenter Screen" - -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN] -en-US = "Presenter Screen" - [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT] en-US = "PDF Import" diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index bbac0236b705..21deb8e486d8 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -37,6 +37,17 @@ File gid_File_Lib_Animcore PACKED_LIB_FILE_BODY; End +File gid_File_Lib_PresenterScreen + LIB_FILE_BODY; + Dir = SCP2_OOO_BIN_DIR; +#if defined UNX + Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX)); +#else + Name = "PresenterScreen.uno.dll"; +#endif + Styles = (PACKED); +End + File gid_File_Share_Registry_Impress_Xcd TXT_FILE_BODY; Styles = (PACKED); diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index cfdd2a4c7a1a..c209e1097686 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -348,3 +348,460 @@ Bitmap BMP_COMMENTS_INDICATOR { File = "comments_indicator.bmp"; }; + +// 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_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_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_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"; +}; diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index ce85b79d408f..47dee23b838b 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -107,6 +107,99 @@ #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) + // ----------------------------------------------------------------------------- /* diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 157eb949a863..8ad42092ced9 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" + +#include #include "PresenterHelper.hxx" #include "CanvasUpdateRequester.hxx" @@ -34,12 +37,14 @@ #include #include #include -#include #include #include #include #include +#include "res_bmp.hrc" +#include "sdresid.hxx" + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; @@ -245,39 +250,221 @@ void SAL_CALL PresenterHelper::toTop ( +namespace { + +struct IdMapEntry { + char const * sid; + sal_uInt32 nid; +}; + +} Reference SAL_CALL PresenterHelper::loadBitmap ( - const OUString& rsURL, + const OUString& id, const Reference& rxCanvas) throw (RuntimeException) { if ( ! rxCanvas.is()) return NULL; - ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); + static IdMapEntry const map[] = { + { "bitmaps/Background.png", BMP_PRESENTERSCREEN_BACKGROUND }, + { "bitmaps/BorderActiveBottom.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM }, + { "bitmaps/BorderActiveBottomCallout.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT }, + { "bitmaps/BorderActiveBottomLeft.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT }, + { "bitmaps/BorderActiveBottomRight.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT }, + { "bitmaps/BorderActiveLeft.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT }, + { "bitmaps/BorderActiveRight.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT }, + { "bitmaps/BorderActiveTop.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP }, + { "bitmaps/BorderActiveTopLeft.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT }, + { "bitmaps/BorderActiveTopRight.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT }, + { "bitmaps/BorderBottom.png", BMP_PRESENTERSCREEN_BORDER_BOTTOM }, + { "bitmaps/BorderBottomLeft.png", + BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT }, + { "bitmaps/BorderBottomRight.png", + BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT }, + { "bitmaps/BorderCurrentSlideBottom.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM }, + { "bitmaps/BorderCurrentSlideBottomLeft.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT }, + { "bitmaps/BorderCurrentSlideBottomRight.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT }, + { "bitmaps/BorderCurrentSlideLeft.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT }, + { "bitmaps/BorderCurrentSlideRight.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT }, + { "bitmaps/BorderCurrentSlideTop.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP }, + { "bitmaps/BorderCurrentSlideTopLeft.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT }, + { "bitmaps/BorderCurrentSlideTopRight.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT }, + { "bitmaps/BorderLeft.png", BMP_PRESENTERSCREEN_BORDER_LEFT }, + { "bitmaps/BorderRight.png", BMP_PRESENTERSCREEN_BORDER_RIGHT }, + { "bitmaps/BorderToolbarBottom.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM }, + { "bitmaps/BorderToolbarLeft.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT }, + { "bitmaps/BorderToolbarRight.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT }, + { "bitmaps/BorderToolbarTop.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP }, + { "bitmaps/BorderToolbarTopLeft.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT }, + { "bitmaps/BorderToolbarTopRight.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT }, + { "bitmaps/BorderTop.png", BMP_PRESENTERSCREEN_BORDER_TOP }, + { "bitmaps/BorderTopLeft.png", BMP_PRESENTERSCREEN_BORDER_TOP_LEFT }, + { "bitmaps/BorderTopRight.png", BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT }, + { "bitmaps/ButtonEffectNextDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED }, + { "bitmaps/ButtonEffectNextMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER }, + { "bitmaps/ButtonEffectNextNormal.png", + BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL }, + { "bitmaps/ButtonEffectNextSelected.png", + BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED }, + { "bitmaps/ButtonFrameCenterMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER }, + { "bitmaps/ButtonFrameCenterNormal.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL }, + { "bitmaps/ButtonFrameLeftMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER }, + { "bitmaps/ButtonFrameLeftNormal.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL }, + { "bitmaps/ButtonFrameRightMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER }, + { "bitmaps/ButtonFrameRightNormal.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL }, + { "bitmaps/ButtonHelpDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED }, + { "bitmaps/ButtonHelpMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER }, + { "bitmaps/ButtonHelpNormal.png", + BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL }, + { "bitmaps/ButtonHelpSelected.png", + BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED }, + { "bitmaps/ButtonMinusDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED }, + { "bitmaps/ButtonMinusMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER }, + { "bitmaps/ButtonMinusNormal.png", + BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL }, + { "bitmaps/ButtonMinusSelected.png", + BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED }, + { "bitmaps/ButtonNotesDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED }, + { "bitmaps/ButtonNotesMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER }, + { "bitmaps/ButtonNotesNormal.png", + BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL }, + { "bitmaps/ButtonNotesSelected.png", + BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED }, + { "bitmaps/ButtonPlusDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED }, + { "bitmaps/ButtonPlusMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER }, + { "bitmaps/ButtonPlusNormal.png", + BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL }, + { "bitmaps/ButtonPlusSelected.png", + BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED }, + { "bitmaps/ButtonSlideNextDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED }, + { "bitmaps/ButtonSlideNextMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER }, + { "bitmaps/ButtonSlideNextNormal.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL }, + { "bitmaps/ButtonSlidePreviousDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED }, + { "bitmaps/ButtonSlidePreviousMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER }, + { "bitmaps/ButtonSlidePreviousNormal.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL }, + { "bitmaps/ButtonSlidePreviousSelected.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED }, + { "bitmaps/ButtonSlideSorterDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED }, + { "bitmaps/ButtonSlideSorterMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER }, + { "bitmaps/ButtonSlideSorterNormal.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL }, + { "bitmaps/ButtonSlideSorterSelected.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED }, + { "bitmaps/ButtonSwitchMonitorMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER }, + { "bitmaps/ButtonSwitchMonitorNormal.png", + BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL }, + { "bitmaps/LabelMouseOverCenter.png", + BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER }, + { "bitmaps/LabelMouseOverLeft.png", + BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT }, + { "bitmaps/LabelMouseOverRight.png", + BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT }, + { "bitmaps/ScrollbarArrowDownDisabled.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED }, + { "bitmaps/ScrollbarArrowDownMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER }, + { "bitmaps/ScrollbarArrowDownNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL }, + { "bitmaps/ScrollbarArrowDownSelected.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED }, + { "bitmaps/ScrollbarArrowUpDisabled.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED }, + { "bitmaps/ScrollbarArrowUpMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER }, + { "bitmaps/ScrollbarArrowUpNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL }, + { "bitmaps/ScrollbarArrowUpSelected.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED }, + { "bitmaps/ScrollbarPagerMiddleMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER }, + { "bitmaps/ScrollbarPagerMiddleNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL }, + { "bitmaps/ScrollbarThumbBottomMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER }, + { "bitmaps/ScrollbarThumbBottomNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL }, + { "bitmaps/ScrollbarThumbMiddleMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER }, + { "bitmaps/ScrollbarThumbMiddleNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL }, + { "bitmaps/ScrollbarThumbTopMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER }, + { "bitmaps/ScrollbarThumbTopNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL }, + { "bitmaps/ViewBackground.png", BMP_PRESENTERSCREEN_VIEW_BACKGROUND } + }; + sal_uInt32 nid = 0; + for (std::size_t i = 0; i != SAL_N_ELEMENTS(map); ++i) { + if (id.equalsAscii(map[i].sid)) { + nid = map[i].nid; + break; + } + } + if (nid == 0) { + return 0; + } - if (mpGraphicFilter.get() == NULL) - mpGraphicFilter.reset(new GraphicFilter(sal_False)); + ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); const cppcanvas::CanvasSharedPtr pCanvas ( cppcanvas::VCLFactory::getInstance().createCanvas( Reference(rxCanvas,UNO_QUERY))); - if (pCanvas.get()!=NULL && !rsURL.isEmpty() && mpGraphicFilter.get()!=NULL) + if (pCanvas.get()!=NULL) { - Graphic aGraphic; - OUString sFileName; - if (osl::FileBase::getSystemPathFromFileURL(rsURL, sFileName) - == osl::FileBase::E_None) - { - if (mpGraphicFilter->ImportGraphic(aGraphic, rsURL) == GRFILTER_OK) - { - BitmapEx aBitmapEx (aGraphic.GetBitmapEx()); - return cppcanvas::VCLFactory::getInstance().createBitmap( - pCanvas, - aBitmapEx)->getUNOBitmap(); - } - } + BitmapEx aBitmapEx = SdResId(nid); + return cppcanvas::VCLFactory::getInstance().createBitmap( + pCanvas, aBitmapEx)->getUNOBitmap(); } return NULL; diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index 4ad837f74242..dbe3e80857ed 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -25,9 +25,7 @@ #include #include #include -#include #include -#include namespace css = ::com::sun::star; @@ -104,7 +102,6 @@ public: private: css::uno::Reference mxComponentContext; - ::boost::scoped_ptr mpGraphicFilter; }; } } // end of namespace ::sd::presenter diff --git a/sdext/Configuration_presenter.mk b/sdext/Configuration_presenter.mk deleted file mode 100644 index 456a17294049..000000000000 --- a/sdext/Configuration_presenter.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Configuration_Configuration,presenter-screen,nodeliver)) - -$(eval $(call gb_Configuration_add_schemas,presenter-screen,sdext/source/presenter/registry/schema,\ - org/openoffice/Office/extension/PresenterScreen.xcs \ -)) - -$(eval $(call gb_Configuration_add_datas,presenter-screen,sdext/source/presenter/registry/data,\ - org/openoffice/Office/Jobs.xcu \ - org/openoffice/Office/ProtocolHandler.xcu \ -)) - -$(eval $(call gb_Configuration_add_localized_datas,presenter-screen,sdext/source/presenter/registry/data,\ - org/openoffice/Office/extension/PresenterScreen.xcu \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk deleted file mode 100644 index e559bde7167c..000000000000 --- a/sdext/CustomTarget_presenter.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)) - -$(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \ - $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp - -$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \ - $(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \ - | $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) - sed "s/PLATFORMID/$(PLATFORMID)/" < $< > $@ - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk deleted file mode 100644 index 93c18a8740ef..000000000000 --- a/sdext/Extension_presenter.mk +++ /dev/null @@ -1,146 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter)) - -$(eval $(call gb_Extension_add_libraries,presenter-screen,\ - PresenterScreen \ -)) - -$(eval $(call gb_Extension_add_file,presenter-screen,components.rdb,$(call gb_Rdb_get_target,presenter))) - -$(eval $(call gb_Extension_add_files,presenter-screen,bitmaps,\ - $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/Background.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottom.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveTop.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveTopRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderBottom.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderBottomLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderBottomRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarBottom.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarTop.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderTop.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderTopLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderTopRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/LabelMouseOverRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ViewBackground.png \ -)) - -$(eval $(call gb_Extension_add_file,presenter-screen,registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs,$(call gb_XcsTarget_get_target,sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs))) - -$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuFile_for_extension,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu))) - -$(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffice/Office,\ - $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu) \ - $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \ -)) - -$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) - -$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(PLATFORMID))) - - - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk index 8153e0d9a845..87418159ef36 100644 --- a/sdext/Library_presenter.mk +++ b/sdext/Library_presenter.mk @@ -31,10 +31,6 @@ $(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presente $(eval $(call gb_Library_use_sdk_api,PresenterScreen)) -$(eval $(call gb_Library_add_defs,PresenterScreen,\ - -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(PLATFORMID)\" \ -)) - $(eval $(call gb_Library_use_libraries,PresenterScreen,\ cppu \ cppuhelper \ diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk index 7bba9d936232..779b3bf6b6d7 100644 --- a/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Module_Module,sdext)) +$(eval $(call gb_Module_add_targets,sdext,\ + Library_presenter \ +)) + ifeq ($(ENABLE_MINIMIZER),YES) $(eval $(call gb_Module_add_targets,sdext,\ Configuration_minimizer \ @@ -53,14 +57,4 @@ $(eval $(call gb_Module_add_check_targets,sdext,\ )) endif -ifeq ($(ENABLE_PRESENTER_SCREEN),YES) -$(eval $(call gb_Module_add_targets,sdext,\ - Configuration_presenter \ - CustomTarget_presenter \ - Extension_presenter \ - Library_presenter \ - Rdb_presenter \ -)) -endif - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sdext/Rdb_presenter.mk b/sdext/Rdb_presenter.mk deleted file mode 100644 index c1d4125202b7..000000000000 --- a/sdext/Rdb_presenter.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Rdb_Rdb,presenter)) - -$(eval $(call gb_Rdb_add_components,presenter,\ - sdext/source/presenter/presenter \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sdext/source/presenter/META-INF/manifest.xml b/sdext/source/presenter/META-INF/manifest.xml deleted file mode 100644 index a25f22fdf81a..000000000000 --- a/sdext/source/presenter/META-INF/manifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index b19bac9a6867..b3f8048b05e5 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -435,7 +435,7 @@ public: OUString sName (A2S("Presenter Console")); PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Console/String")) >>= sName; @@ -465,7 +465,7 @@ public: { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String")) >>= sName; @@ -1886,7 +1886,7 @@ rtl::Reference AccessibleNotes::Create ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Notes/String")) >>= sName; diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 88c4d6d16928..30e4eaf25ff9 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -18,7 +18,6 @@ */ #include "PresenterBitmapContainer.hxx" -#include "PresenterComponent.hxx" #include "PresenterConfigurationAccess.hxx" #include @@ -45,11 +44,9 @@ PresenterBitmapContainer::PresenterBitmapContainer ( const ::boost::shared_ptr& rpParentContainer, const css::uno::Reference& rxComponentContext, const css::uno::Reference& rxCanvas, - const OUString& rsBasePath, const css::uno::Reference& rxPresenterHelper) : mpParentContainer(rpParentContainer), maIconContainer(), - msBasePath(rsBasePath), mxCanvas(rxCanvas), mxPresenterHelper(rxPresenterHelper) { @@ -58,7 +55,7 @@ PresenterBitmapContainer::PresenterBitmapContainer ( // Get access to the configuration. PresenterConfigurationAccess aConfiguration ( rxComponentContext, - A2S("org.openoffice.Office.extension.PresenterScreen"), + A2S("org.openoffice.Office.PresenterScreen"), PresenterConfigurationAccess::READ_ONLY); Reference xBitmapList ( aConfiguration.GetConfigurationNode(rsConfigurationBase), @@ -72,11 +69,9 @@ PresenterBitmapContainer::PresenterBitmapContainer ( const ::boost::shared_ptr& rpParentContainer, const css::uno::Reference& rxComponentContext, const css::uno::Reference& rxCanvas, - const OUString& rsBasePath, const css::uno::Reference& rxPresenterHelper) : mpParentContainer(rpParentContainer), maIconContainer(), - msBasePath(rsBasePath), mxCanvas(rxCanvas), mxPresenterHelper(rxPresenterHelper) { @@ -150,7 +145,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( const css::uno::Reference& rxNode, const ::rtl::OUString& rsPath, const css::uno::Reference& rxPresenterHelper, - const OUString& rsBasePath, const css::uno::Reference& rxCanvas, const SharedBitmapDescriptor& rpDefault) { @@ -167,7 +161,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( pBitmap = LoadBitmap( xBitmapProperties, rxPresenterHelper, - rsBasePath, rxCanvas, rpDefault); } @@ -191,7 +184,6 @@ void PresenterBitmapContainer::ProcessBitmap ( maIconContainer[sName] = LoadBitmap( rxProperties, mxPresenterHelper, - msBasePath, mxCanvas, SharedBitmapDescriptor()); } @@ -199,7 +191,6 @@ void PresenterBitmapContainer::ProcessBitmap ( SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( const Reference& rxProperties, const css::uno::Reference& rxPresenterHelper, - const OUString& rsBasePath, const css::uno::Reference& rxCanvas, const SharedBitmapDescriptor& rpDefault) { @@ -219,7 +210,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::Normal, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -228,7 +219,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::MouseOver, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -237,7 +228,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::ButtonDown, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -246,7 +237,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::Disabled, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -255,7 +246,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::Mask, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index 1a44c7f3fc27..c06f6cf58bd5 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -98,14 +98,12 @@ public: const ::boost::shared_ptr& rpParentContainer, const css::uno::Reference& rxComponentContext, const css::uno::Reference& rxCanvas, - const ::rtl::OUString& rsBasePath, const css::uno::Reference& rxPresenterHelper = NULL); PresenterBitmapContainer ( const css::uno::Reference& rsRootNode, const ::boost::shared_ptr& rpParentContainer, const css::uno::Reference& rxComponentContext, const css::uno::Reference& rxCanvas, - const ::rtl::OUString& rsBasePath, const css::uno::Reference& rxPresenterHelper = NULL); ~PresenterBitmapContainer (void); @@ -120,7 +118,6 @@ public: const css::uno::Reference& rxNode, const ::rtl::OUString& rsPathToBitmapNode, const css::uno::Reference& rxPresenterHelper, - const ::rtl::OUString& rsBitmapBasePath, const css::uno::Reference& rxCanvas, const ::boost::shared_ptr& rpDefaultBitmap); @@ -128,7 +125,6 @@ private: ::boost::shared_ptr mpParentContainer; typedef ::std::map > BitmapContainer; BitmapContainer maIconContainer; - ::rtl::OUString msBasePath; css::uno::Reference mxCanvas; css::uno::Reference mxPresenterHelper; @@ -140,7 +136,6 @@ private: static ::boost::shared_ptr LoadBitmap ( const css::uno::Reference& rxProperties, const css::uno::Reference& rxPresenterHelper, - const ::rtl::OUString& rsBasePath, const css::uno::Reference& rxCanvas, const ::boost::shared_ptr& rpDefault); static BitmapDescriptor::TexturingMode diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index cb4d049e6216..de18f450ea0e 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -17,13 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "PresenterComponent.hxx" #include "cppuhelper/factory.hxx" #include "cppuhelper/implementationentry.hxx" -#include -#include -#include "PresenterExtensionIdentifier.hxx" #include "PresenterProtocolHandler.hxx" #include "PresenterScreen.hxx" @@ -35,41 +31,6 @@ using ::rtl::OUString; namespace sdext { namespace presenter { -::rtl::OUString PresenterComponent::GetBasePath ( - const Reference& rxComponentContext) -{ - return GetBasePath(rxComponentContext, gsExtensionIdentifier); -} - -::rtl::OUString PresenterComponent::GetBasePath ( - const Reference& rxComponentContext, - const OUString& rsExtensionIdentifier) -{ - static ::rtl::OUString sBasePath; - if (sBasePath.isEmpty()) - { - // Determine the base path of the bitmaps. - Reference xInformationProvider ( - rxComponentContext->getValueByName( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "/singletons/com.sun.star.deployment.PackageInformationProvider"))), - UNO_QUERY); - if (xInformationProvider.is()) - { - try - { - sBasePath = xInformationProvider->getPackageLocation(rsExtensionIdentifier) - + OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - } - catch (const deployment::DeploymentException&) - { - } - } - } - - return sBasePath; -} - rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; static struct ImplementationEntry gServiceEntries[] = diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx deleted file mode 100644 index b9a428a4c58f..000000000000 --- a/sdext/source/presenter/PresenterComponent.hxx +++ /dev/null @@ -1,48 +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 . - */ - -#ifndef SDEXT_PRESENTER_COMPONENT_HXX -#define SDEXT_PRESENTER_COMPONENT_HXX - -#include - -namespace css = ::com::sun::star; - -namespace sdext { namespace presenter { - -/** This string is replaced automatically by the makefile during the - building of this extension. -*/ -class PresenterComponent -{ -public: - const static ::rtl::OUString gsExtensionIdentifier; - - static ::rtl::OUString GetBasePath ( - const css::uno::Reference& rxComponentContext); - static ::rtl::OUString GetBasePath ( - const css::uno::Reference& rxComponentContext, - const ::rtl::OUString& rsExtensionIdentifier); -}; - -} } - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index 2ae90dc1085a..5fdb8bc5d026 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -34,7 +34,7 @@ using ::rtl::OUString; namespace sdext { namespace presenter { const ::rtl::OUString PresenterConfigurationAccess::msPresenterScreenRootName = - A2S("/org.openoffice.Office.extension.PresenterScreen/"); + A2S("/org.openoffice.Office.PresenterScreen/"); PresenterConfigurationAccess::PresenterConfigurationAccess ( const Reference& rxContext, diff --git a/sdext/source/presenter/PresenterExtensionIdentifier.hxx b/sdext/source/presenter/PresenterExtensionIdentifier.hxx deleted file mode 100644 index 089f8e377da8..000000000000 --- a/sdext/source/presenter/PresenterExtensionIdentifier.hxx +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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 . - */ - -#ifndef SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX -#define SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX - -namespace sdext { namespace presenter { - -const ::rtl::OUString PresenterComponent::gsExtensionIdentifier( - RTL_CONSTASCII_USTRINGPARAM(PRESENTER_IMPL_IDENTIFIER)); - -} } - -#endif diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index e2c2f3d0aca7..ee6729ffa692 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -346,7 +346,7 @@ void PresenterHelpView::ReadHelpStrings (void) mpTextContainer.reset(new TextContainer()); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference xStrings ( aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")), diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 45b671827acf..34da2bd17fb2 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -47,8 +47,6 @@ using ::rtl::OUString; namespace sdext { namespace presenter { namespace { - const static OUString gsProtocol (A2S("vnd.com.sun.star.comp.PresenterScreen:")); - class Command { public: @@ -240,7 +238,7 @@ private: OUString PresenterProtocolHandler::getImplementationName_static (void) { - return A2S("vnd.sun.star.sdext.presenter.PresenterProtocolHandler"); + return OUString("org.libreoffice.comp.PresenterScreenProtocolHandler"); } Sequence PresenterProtocolHandler::getSupportedServiceNames_static (void) @@ -309,7 +307,7 @@ Reference SAL_CALL PresenterProtocolHandler::queryDispatch ( Reference xDispatch; - if (rURL.Protocol == gsProtocol) + if (rURL.Protocol == "vnd.org.libreoffice.presenterscreen:") { xDispatch.set(Dispatch::Create(rURL.Path, mpPresenterController)); } @@ -432,7 +430,7 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::dispatch( (void)rArguments; ThrowIfDisposed(); - if (rURL.Protocol == gsProtocol + if (rURL.Protocol == "vnd.org.libreoffice.presenterscreen:" && rURL.Path == msURLPath) { if (mpCommand.get() != NULL) diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index bfa2ae2a43d8..d4fadf6e9597 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -95,14 +95,12 @@ namespace { OUString PresenterScreenJob::getImplementationName_static (void) { - return A2S("com.sun.star.comp.Draw.framework.PresenterScreenJob"); + return OUString("org.libreoffice.comp.PresenterScreenJob"); } Sequence PresenterScreenJob::getSupportedServiceNames_static (void) { - static const ::rtl::OUString sServiceName( - A2S("com.sun.star.drawing.framework.PresenterScreenJob")); - return Sequence(&sServiceName, 1); + return Sequence(); } Reference PresenterScreenJob::Create (const Reference& rxContext) @@ -505,7 +503,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber ( Reference xContext (mxContextWeak); PresenterConfigurationAccess aConfiguration ( xContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); bool bStartAlways (false); if (aConfiguration.GetConfigurationNode( @@ -654,7 +652,7 @@ void PresenterScreen::SetupConfiguration ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("org.openoffice.Office.extension.PresenterScreen"), + OUString("org.openoffice.Office.PresenterScreen"), PresenterConfigurationAccess::READ_ONLY); maViewDescriptors.clear(); ProcessViewDescriptions(aConfiguration); diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 576458bd0256..cb87d61f4166 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -20,7 +20,6 @@ #include "PresenterScrollBar.hxx" #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" #include "PresenterTimer.hxx" @@ -272,8 +271,7 @@ void PresenterScrollBar::SetCanvas (const Reference& rx OUString("PresenterScreenSettings/ScrollBar/Bitmaps"), ::boost::shared_ptr(), mxComponentContext, - mxCanvas, - PresenterComponent::GetBasePath(mxComponentContext))); + mxCanvas)); mpSharedBitmaps = mpBitmaps; } catch(Exception&) diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 6c5d75da837a..eb0ce723c163 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -22,7 +22,6 @@ #include "PresenterSlideSorter.hxx" #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterHelper.hxx" #include "PresenterPaintManager.hxx" @@ -1725,7 +1724,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference xBitmaps ( aConfiguration.GetConfigurationNode( @@ -1738,8 +1737,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( A2S("PresenterScreenSettings/SlideSorter/CurrentSlideBorderBitmaps"), ::boost::shared_ptr(), rxContext, - rxCanvas, - PresenterComponent::GetBasePath(rxContext)); + rxCanvas); mpTopLeft = aContainer.GetBitmap(A2S("TopLeft")); mpTop = aContainer.GetBitmap(A2S("Top")); diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index e64f1073c4f7..1fc2f85475af 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -20,7 +20,6 @@ #include "PresenterTheme.hxx" #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterConfigurationAccess.hxx" #include "PresenterHelper.hxx" #include @@ -93,7 +92,6 @@ public: Reference mxComponentContext; Reference mxCanvas; Reference mxPresenterHelper; - OUString msBasePath; ReadContext ( const Reference& rxContext, @@ -119,8 +117,6 @@ public: BorderSize ReadBorderSize (const Reference& rxNode); - void SetBitmapSourceExtension (const OUString& rsExtensionName); - private: Any GetByName ( const Reference& rxNode, @@ -293,7 +289,7 @@ PresenterTheme::~PresenterTheme (void) PresenterConfigurationAccess aConfiguration ( mxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); return aReadContext.ReadTheme(aConfiguration, msThemeName); @@ -381,7 +377,7 @@ bool PresenterTheme::ConvertToColor ( ::boost::shared_ptr pConfiguration ( new PresenterConfigurationAccess( mxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE)); // Get configuration node for the view style container of the current @@ -625,26 +621,11 @@ void PresenterTheme::Theme::Read ( mpParentTheme = rReadContext.ReadTheme(rConfiguration, sParentThemeName); } - // Read the extension that contains the bitmaps referenced in this - // theme. - OUString sBitmapSourceExtension; - if ((PresenterConfigurationAccess::GetConfigurationNode( - mxThemeRoot, A2S("BitmapSourceExtension")) >>= sBitmapSourceExtension) - && !sBitmapSourceExtension.isEmpty()) - { - rReadContext.SetBitmapSourceExtension(sBitmapSourceExtension); - } - else - { - rReadContext.SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier); - } - // Background. mpBackground = PresenterBitmapContainer::LoadBitmap( mxThemeRoot, A2S("Background"), rReadContext.mxPresenterHelper, - rReadContext.msBasePath, rReadContext.mxCanvas, SharedBitmapDescriptor()); @@ -667,8 +648,7 @@ void PresenterTheme::Theme::Read ( ? mpParentTheme->mpIconContainer : ::boost::shared_ptr(), rReadContext.mxComponentContext, - rReadContext.mxCanvas, - rReadContext.msBasePath)); + rReadContext.mxCanvas)); // Read fonts. Reference xFontNode( @@ -720,8 +700,7 @@ ReadContext::ReadContext ( const Reference& rxCanvas) : mxComponentContext(rxContext), mxCanvas(rxCanvas), - mxPresenterHelper(), - msBasePath() + mxPresenterHelper() { Reference xFactory (rxContext->getServiceManager()); if (xFactory.is()) @@ -732,9 +711,6 @@ ReadContext::ReadContext ( rxContext), UNO_QUERY_THROW); } - - // Get base path to bitmaps. - SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier); } ReadContext::~ReadContext (void) @@ -866,12 +842,6 @@ BorderSize ReadContext::ReadBorderSize (const Reference& return aBorderSize; } -void ReadContext::SetBitmapSourceExtension (const OUString& rsExtensionIdentifier) -{ - // Get base path to bitmaps. - msBasePath = PresenterComponent::GetBasePath(mxComponentContext, rsExtensionIdentifier); -} - //===== PaneStyleContainer ==================================================== void PaneStyleContainer::Read ( @@ -953,7 +923,6 @@ void PaneStyleContainer::ProcessPaneStyle( : ::boost::shared_ptr(), rReadContext.mxComponentContext, rReadContext.mxCanvas, - rReadContext.msBasePath, rReadContext.mxPresenterHelper)); } @@ -1088,7 +1057,6 @@ void ViewStyleContainer::ProcessViewStyle( xBackgroundNode, OUString(), rReadContext.mxPresenterHelper, - rReadContext.msBasePath, rReadContext.mxCanvas, SharedBitmapDescriptor())); if (pBackground.get() != NULL && pBackground->GetNormalBitmap().is()) diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 60e44faaed9f..ac69c76720a8 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -22,7 +22,6 @@ #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" #include "PresenterPaneBase.hxx" @@ -120,7 +119,6 @@ class PresenterToolBar::Context : private ::boost::noncopyable { public: - ::rtl::OUString msBasePath; Reference mxPresenterHelper; css::uno::Reference mxCanvas; }; @@ -633,11 +631,9 @@ void PresenterToolBar::CreateControls ( // Expand the macro in the bitmap file names. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); - const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext)); - mpCurrentContainerPart.reset(new ElementContainerPart()); maElementContainer.clear(); maElementContainer.push_back(mpCurrentContainerPart); @@ -651,7 +647,6 @@ void PresenterToolBar::CreateControls ( PresenterConfigurationAccess::GetConfigurationNode(xToolBarNode, A2S("Entries")), UNO_QUERY); Context aContext; - aContext.msBasePath = sBasePath; aContext.mxPresenterHelper = mpPresenterController->GetPresenterHelper(); aContext.mxCanvas = mxCanvas; if (xEntries.is() @@ -1468,7 +1463,6 @@ void ElementMode::ReadElementMode ( xIconNode, A2S(""), rContext.mxPresenterHelper, - rContext.msBasePath, rContext.mxCanvas, rpDefaultMode.get()!=NULL ? rpDefaultMode->mpIcon : SharedBitmapDescriptor()); } diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 7d38f1a7ee7f..7c8124d17d13 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -534,7 +534,7 @@ void PresenterWindowManager::RestoreViewMode (void) sal_Int32 nMode (0); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode; switch (nMode) @@ -560,7 +560,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode) { PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE); aConfiguration.GoToChild(A2S("Presenter")); Any aValue; diff --git a/sdext/source/presenter/description-en-US.txt b/sdext/source/presenter/description-en-US.txt deleted file mode 100644 index 26a10c622fe9..000000000000 --- a/sdext/source/presenter/description-en-US.txt +++ /dev/null @@ -1,2 +0,0 @@ -The Presenter Console Extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide. -To avoid confusions by displaying a large number of presentation elements, the Presenter Console displays the elements on three different easily changeable views. diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml deleted file mode 100644 index e8c52f047c03..000000000000 --- a/sdext/source/presenter/description.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - The Document Foundation - - - - Presenter Console - - - - - - - - - - - diff --git a/sdext/source/presenter/presenter.component b/sdext/source/presenter/presenter.component index 698180404f5e..ee7d1d63c9f1 100644 --- a/sdext/source/presenter/presenter.component +++ b/sdext/source/presenter/presenter.component @@ -8,12 +8,9 @@ * --> - - - - + loader="com.sun.star.loader.SharedLibrary" prefix="presenter"> + + diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu deleted file mode 100644 index a7991b8cad21..000000000000 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - com.sun.star.comp.Draw.framework.PresenterScreenJob - - - com.sun.star.presentation.PresentationDocument - - - - - - - - - - - diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu deleted file mode 100644 index b1ecdb0d47fa..000000000000 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - vnd.com.sun.star.comp.PresenterScreen:* - - - -