From 4413cf97c42cd2318bf10562715ae755dfccf104 Mon Sep 17 00:00:00 2001 From: Ariel Constenla-Haile Date: Tue, 16 Apr 2013 02:57:41 +0000 Subject: i121873 - Integrate the Presenter Screen --- configure.in | 23 - default_images/presenter/Background.png | Bin 0 -> 3474 bytes default_images/presenter/BorderActiveBottom.png | Bin 0 -> 214 bytes .../presenter/BorderActiveBottomCallout.png | Bin 0 -> 1425 bytes .../presenter/BorderActiveBottomLeft.png | Bin 0 -> 598 bytes .../presenter/BorderActiveBottomRight.png | Bin 0 -> 626 bytes default_images/presenter/BorderActiveLeft.png | Bin 0 -> 145 bytes default_images/presenter/BorderActiveRight.png | Bin 0 -> 141 bytes default_images/presenter/BorderActiveTop.png | Bin 0 -> 148 bytes default_images/presenter/BorderActiveTopLeft.png | Bin 0 -> 442 bytes default_images/presenter/BorderActiveTopRight.png | Bin 0 -> 438 bytes default_images/presenter/BorderBottom.png | Bin 0 -> 164 bytes default_images/presenter/BorderBottomLeft.png | Bin 0 -> 576 bytes default_images/presenter/BorderBottomRight.png | Bin 0 -> 587 bytes .../presenter/BorderCurrentSlideBottom.png | Bin 0 -> 140 bytes .../presenter/BorderCurrentSlideBottomLeft.png | Bin 0 -> 161 bytes .../presenter/BorderCurrentSlideBottomRight.png | Bin 0 -> 159 bytes .../presenter/BorderCurrentSlideLeft.png | Bin 0 -> 140 bytes .../presenter/BorderCurrentSlideRight.png | Bin 0 -> 140 bytes default_images/presenter/BorderCurrentSlideTop.png | Bin 0 -> 140 bytes .../presenter/BorderCurrentSlideTopLeft.png | Bin 0 -> 164 bytes .../presenter/BorderCurrentSlideTopRight.png | Bin 0 -> 164 bytes default_images/presenter/BorderLeft.png | Bin 0 -> 147 bytes default_images/presenter/BorderRight.png | Bin 0 -> 177 bytes default_images/presenter/BorderToolbarBottom.png | Bin 0 -> 112 bytes default_images/presenter/BorderToolbarLeft.png | Bin 0 -> 119 bytes default_images/presenter/BorderToolbarRight.png | Bin 0 -> 121 bytes default_images/presenter/BorderToolbarTop.png | Bin 0 -> 120 bytes default_images/presenter/BorderToolbarTopLeft.png | Bin 0 -> 268 bytes default_images/presenter/BorderToolbarTopRight.png | Bin 0 -> 244 bytes default_images/presenter/BorderTop.png | Bin 0 -> 174 bytes default_images/presenter/BorderTopLeft.png | Bin 0 -> 426 bytes default_images/presenter/BorderTopRight.png | Bin 0 -> 414 bytes .../presenter/ButtonEffectNextDisabled.png | Bin 0 -> 258 bytes .../presenter/ButtonEffectNextMouseOver.png | Bin 0 -> 259 bytes .../presenter/ButtonEffectNextNormal.png | Bin 0 -> 262 bytes .../presenter/ButtonEffectNextSelected.png | Bin 0 -> 257 bytes .../presenter/ButtonFrameCenterMouseOver.png | Bin 0 -> 131 bytes .../presenter/ButtonFrameCenterNormal.png | Bin 0 -> 138 bytes .../presenter/ButtonFrameLeftMouseOver.png | Bin 0 -> 166 bytes default_images/presenter/ButtonFrameLeftNormal.png | Bin 0 -> 166 bytes .../presenter/ButtonFrameRightMouseOver.png | Bin 0 -> 163 bytes .../presenter/ButtonFrameRightNormal.png | Bin 0 -> 163 bytes default_images/presenter/ButtonHelpDisabled.png | Bin 0 -> 543 bytes default_images/presenter/ButtonHelpMouseOver.png | Bin 0 -> 538 bytes default_images/presenter/ButtonHelpNormal.png | Bin 0 -> 550 bytes default_images/presenter/ButtonHelpSelected.png | Bin 0 -> 623 bytes default_images/presenter/ButtonMinusDisabled.png | Bin 0 -> 243 bytes default_images/presenter/ButtonMinusMouseOver.png | Bin 0 -> 239 bytes default_images/presenter/ButtonMinusNormal.png | Bin 0 -> 244 bytes default_images/presenter/ButtonMinusSelected.png | Bin 0 -> 245 bytes default_images/presenter/ButtonNotesDisabled.png | Bin 0 -> 321 bytes default_images/presenter/ButtonNotesMouseOver.png | Bin 0 -> 314 bytes default_images/presenter/ButtonNotesNormal.png | Bin 0 -> 324 bytes default_images/presenter/ButtonNotesSelected.png | Bin 0 -> 318 bytes default_images/presenter/ButtonPlusDisabled.png | Bin 0 -> 277 bytes default_images/presenter/ButtonPlusMouseOver.png | Bin 0 -> 275 bytes default_images/presenter/ButtonPlusNormal.png | Bin 0 -> 279 bytes default_images/presenter/ButtonPlusSelected.png | Bin 0 -> 280 bytes .../presenter/ButtonSlideNextDisabled.png | Bin 0 -> 246 bytes .../presenter/ButtonSlideNextMouseOver.png | Bin 0 -> 250 bytes default_images/presenter/ButtonSlideNextNormal.png | Bin 0 -> 250 bytes .../presenter/ButtonSlidePreviousDisabled.png | Bin 0 -> 270 bytes .../presenter/ButtonSlidePreviousMouseOver.png | Bin 0 -> 263 bytes .../presenter/ButtonSlidePreviousNormal.png | Bin 0 -> 271 bytes .../presenter/ButtonSlidePreviousSelected.png | Bin 0 -> 270 bytes .../presenter/ButtonSlideSorterDisabled.png | Bin 0 -> 342 bytes .../presenter/ButtonSlideSorterMouseOver.png | Bin 0 -> 338 bytes .../presenter/ButtonSlideSorterNormal.png | Bin 0 -> 347 bytes .../presenter/ButtonSlideSorterSelected.png | Bin 0 -> 338 bytes default_images/presenter/LabelMouseOverCenter.png | Bin 0 -> 208 bytes default_images/presenter/LabelMouseOverLeft.png | Bin 0 -> 157 bytes default_images/presenter/LabelMouseOverRight.png | Bin 0 -> 154 bytes .../presenter/ScrollbarArrowDownDisabled.png | Bin 0 -> 324 bytes .../presenter/ScrollbarArrowDownMouseOver.png | Bin 0 -> 324 bytes .../presenter/ScrollbarArrowDownNormal.png | Bin 0 -> 331 bytes .../presenter/ScrollbarArrowDownSelected.png | Bin 0 -> 369 bytes .../presenter/ScrollbarArrowUpDisabled.png | Bin 0 -> 319 bytes .../presenter/ScrollbarArrowUpMouseOver.png | Bin 0 -> 323 bytes .../presenter/ScrollbarArrowUpNormal.png | Bin 0 -> 329 bytes .../presenter/ScrollbarArrowUpSelected.png | Bin 0 -> 365 bytes .../presenter/ScrollbarPagerMiddleMouseOver.png | Bin 0 -> 125 bytes .../presenter/ScrollbarPagerMiddleNormal.png | Bin 0 -> 119 bytes .../presenter/ScrollbarThumbBottomMouseOver.png | Bin 0 -> 120 bytes .../presenter/ScrollbarThumbBottomNormal.png | Bin 0 -> 120 bytes .../presenter/ScrollbarThumbMiddleMouseOver.png | Bin 0 -> 118 bytes .../presenter/ScrollbarThumbMiddleNormal.png | Bin 0 -> 118 bytes .../presenter/ScrollbarThumbTopMouseOver.png | Bin 0 -> 120 bytes .../presenter/ScrollbarThumbTopNormal.png | Bin 0 -> 120 bytes default_images/presenter/ViewBackground.png | Bin 0 -> 177 bytes extensions.lst | 6 +- .../data/org/openoffice/Office/PresenterScreen.xcu | 1220 ++++++++++++++++++++ .../data/org/openoffice/Office/makefile.mk | 11 +- officecfg/registry/data/org/openoffice/makefile.mk | 7 +- .../org/openoffice/Office/PresenterScreen.xcs | 470 ++++++++ .../schema/org/openoffice/Office/makefile.mk | 25 +- postprocess/packcomponents/makefile.mk | 3 +- postprocess/packregistry/makefile.mk | 4 + scp2/source/ooo/file_library_ooo.scp | 13 + scp2/source/ooo/module_hidden_ooo.scp | 1 + sd/source/ui/presenter/PresenterHelper.cxx | 18 +- sdext/prj/build.lst | 4 +- sdext/prj/d.lst | 11 +- sdext/source/presenter/Jobs.xcu | 41 + sdext/source/presenter/PresenterAccessibility.cxx | 6 +- .../source/presenter/PresenterBitmapContainer.cxx | 21 +- .../source/presenter/PresenterBitmapContainer.hxx | 5 - sdext/source/presenter/PresenterClock.cxx | 19 +- sdext/source/presenter/PresenterComponent.cxx | 146 --- sdext/source/presenter/PresenterComponent.hxx | 51 - .../presenter/PresenterConfigurationAccess.cxx | 2 +- .../presenter/PresenterExtensionIdentifier.txx | 37 - sdext/source/presenter/PresenterHelpView.cxx | 2 +- sdext/source/presenter/PresenterScreen.component | 30 + sdext/source/presenter/PresenterScreen.cxx | 4 +- sdext/source/presenter/PresenterScreen.hrc | 113 ++ sdext/source/presenter/PresenterScreen.src | 113 ++ sdext/source/presenter/PresenterScrollBar.cxx | 4 +- sdext/source/presenter/PresenterSlideSorter.cxx | 6 +- sdext/source/presenter/PresenterTheme.cxx | 45 +- sdext/source/presenter/PresenterToolBar.cxx | 8 +- sdext/source/presenter/PresenterWindowManager.cxx | 4 +- sdext/source/presenter/ProtocolHandler.xcu | 31 + sdext/source/presenter/bitmaps/Background.png | Bin 3474 -> 0 bytes .../presenter/bitmaps/BorderActiveBottom.png | Bin 214 -> 0 bytes .../bitmaps/BorderActiveBottomCallout.png | Bin 1425 -> 0 bytes .../presenter/bitmaps/BorderActiveBottomLeft.png | Bin 598 -> 0 bytes .../presenter/bitmaps/BorderActiveBottomRight.png | Bin 626 -> 0 bytes .../source/presenter/bitmaps/BorderActiveLeft.png | Bin 145 -> 0 bytes .../source/presenter/bitmaps/BorderActiveRight.png | Bin 141 -> 0 bytes sdext/source/presenter/bitmaps/BorderActiveTop.png | Bin 148 -> 0 bytes .../presenter/bitmaps/BorderActiveTopLeft.png | Bin 442 -> 0 bytes .../presenter/bitmaps/BorderActiveTopRight.png | Bin 438 -> 0 bytes sdext/source/presenter/bitmaps/BorderBottom.png | Bin 164 -> 0 bytes .../source/presenter/bitmaps/BorderBottomLeft.png | Bin 576 -> 0 bytes .../source/presenter/bitmaps/BorderBottomRight.png | Bin 587 -> 0 bytes .../presenter/bitmaps/BorderCurrentSlideBottom.png | Bin 140 -> 0 bytes .../bitmaps/BorderCurrentSlideBottomLeft.png | Bin 161 -> 0 bytes .../bitmaps/BorderCurrentSlideBottomRight.png | Bin 159 -> 0 bytes .../presenter/bitmaps/BorderCurrentSlideLeft.png | Bin 140 -> 0 bytes .../presenter/bitmaps/BorderCurrentSlideRight.png | Bin 140 -> 0 bytes .../presenter/bitmaps/BorderCurrentSlideTop.png | Bin 140 -> 0 bytes .../bitmaps/BorderCurrentSlideTopLeft.png | Bin 164 -> 0 bytes .../bitmaps/BorderCurrentSlideTopRight.png | Bin 164 -> 0 bytes sdext/source/presenter/bitmaps/BorderLeft.png | Bin 147 -> 0 bytes sdext/source/presenter/bitmaps/BorderRight.png | Bin 177 -> 0 bytes .../presenter/bitmaps/BorderToolbarBottom.png | Bin 112 -> 0 bytes .../source/presenter/bitmaps/BorderToolbarLeft.png | Bin 119 -> 0 bytes .../presenter/bitmaps/BorderToolbarRight.png | Bin 121 -> 0 bytes .../source/presenter/bitmaps/BorderToolbarTop.png | Bin 120 -> 0 bytes .../presenter/bitmaps/BorderToolbarTopLeft.png | Bin 268 -> 0 bytes .../presenter/bitmaps/BorderToolbarTopRight.png | Bin 244 -> 0 bytes sdext/source/presenter/bitmaps/BorderTop.png | Bin 174 -> 0 bytes sdext/source/presenter/bitmaps/BorderTopLeft.png | Bin 426 -> 0 bytes sdext/source/presenter/bitmaps/BorderTopRight.png | Bin 414 -> 0 bytes .../presenter/bitmaps/ButtonEffectNextDisabled.png | Bin 258 -> 0 bytes .../bitmaps/ButtonEffectNextMouseOver.png | Bin 259 -> 0 bytes .../presenter/bitmaps/ButtonEffectNextNormal.png | Bin 262 -> 0 bytes .../presenter/bitmaps/ButtonEffectNextSelected.png | Bin 257 -> 0 bytes .../bitmaps/ButtonFrameCenterMouseOver.png | Bin 131 -> 0 bytes .../presenter/bitmaps/ButtonFrameCenterNormal.png | Bin 138 -> 0 bytes .../presenter/bitmaps/ButtonFrameLeftMouseOver.png | Bin 166 -> 0 bytes .../presenter/bitmaps/ButtonFrameLeftNormal.png | Bin 166 -> 0 bytes .../bitmaps/ButtonFrameRightMouseOver.png | Bin 163 -> 0 bytes .../presenter/bitmaps/ButtonFrameRightNormal.png | Bin 163 -> 0 bytes .../presenter/bitmaps/ButtonHelpDisabled.png | Bin 543 -> 0 bytes .../presenter/bitmaps/ButtonHelpMouseOver.png | Bin 538 -> 0 bytes .../source/presenter/bitmaps/ButtonHelpNormal.png | Bin 550 -> 0 bytes .../presenter/bitmaps/ButtonHelpSelected.png | Bin 623 -> 0 bytes .../presenter/bitmaps/ButtonMinusDisabled.png | Bin 243 -> 0 bytes .../presenter/bitmaps/ButtonMinusMouseOver.png | Bin 239 -> 0 bytes .../source/presenter/bitmaps/ButtonMinusNormal.png | Bin 244 -> 0 bytes .../presenter/bitmaps/ButtonMinusSelected.png | Bin 245 -> 0 bytes .../presenter/bitmaps/ButtonNotesDisabled.png | Bin 321 -> 0 bytes .../presenter/bitmaps/ButtonNotesMouseOver.png | Bin 314 -> 0 bytes .../source/presenter/bitmaps/ButtonNotesNormal.png | Bin 324 -> 0 bytes .../presenter/bitmaps/ButtonNotesSelected.png | Bin 318 -> 0 bytes .../presenter/bitmaps/ButtonPlusDisabled.png | Bin 277 -> 0 bytes .../presenter/bitmaps/ButtonPlusMouseOver.png | Bin 275 -> 0 bytes .../source/presenter/bitmaps/ButtonPlusNormal.png | Bin 279 -> 0 bytes .../presenter/bitmaps/ButtonPlusSelected.png | Bin 280 -> 0 bytes .../presenter/bitmaps/ButtonSlideNextDisabled.png | Bin 246 -> 0 bytes .../presenter/bitmaps/ButtonSlideNextMouseOver.png | Bin 250 -> 0 bytes .../presenter/bitmaps/ButtonSlideNextNormal.png | Bin 250 -> 0 bytes .../bitmaps/ButtonSlidePreviousDisabled.png | Bin 270 -> 0 bytes .../bitmaps/ButtonSlidePreviousMouseOver.png | Bin 263 -> 0 bytes .../bitmaps/ButtonSlidePreviousNormal.png | Bin 271 -> 0 bytes .../bitmaps/ButtonSlidePreviousSelected.png | Bin 270 -> 0 bytes .../bitmaps/ButtonSlideSorterDisabled.png | Bin 342 -> 0 bytes .../bitmaps/ButtonSlideSorterMouseOver.png | Bin 338 -> 0 bytes .../presenter/bitmaps/ButtonSlideSorterNormal.png | Bin 347 -> 0 bytes .../bitmaps/ButtonSlideSorterSelected.png | Bin 338 -> 0 bytes .../presenter/bitmaps/LabelMouseOverCenter.png | Bin 208 -> 0 bytes .../presenter/bitmaps/LabelMouseOverLeft.png | Bin 157 -> 0 bytes .../presenter/bitmaps/LabelMouseOverRight.png | Bin 154 -> 0 bytes .../bitmaps/ScrollbarArrowDownDisabled.png | Bin 324 -> 0 bytes .../bitmaps/ScrollbarArrowDownMouseOver.png | Bin 324 -> 0 bytes .../presenter/bitmaps/ScrollbarArrowDownNormal.png | Bin 331 -> 0 bytes .../bitmaps/ScrollbarArrowDownSelected.png | Bin 369 -> 0 bytes .../presenter/bitmaps/ScrollbarArrowUpDisabled.png | Bin 319 -> 0 bytes .../bitmaps/ScrollbarArrowUpMouseOver.png | Bin 323 -> 0 bytes .../presenter/bitmaps/ScrollbarArrowUpNormal.png | Bin 329 -> 0 bytes .../presenter/bitmaps/ScrollbarArrowUpSelected.png | Bin 365 -> 0 bytes .../bitmaps/ScrollbarPagerMiddleMouseOver.png | Bin 125 -> 0 bytes .../bitmaps/ScrollbarPagerMiddleNormal.png | Bin 119 -> 0 bytes .../bitmaps/ScrollbarThumbBottomMouseOver.png | Bin 120 -> 0 bytes .../bitmaps/ScrollbarThumbBottomNormal.png | Bin 120 -> 0 bytes .../bitmaps/ScrollbarThumbMiddleMouseOver.png | Bin 118 -> 0 bytes .../bitmaps/ScrollbarThumbMiddleNormal.png | Bin 118 -> 0 bytes .../bitmaps/ScrollbarThumbTopMouseOver.png | Bin 120 -> 0 bytes .../presenter/bitmaps/ScrollbarThumbTopNormal.png | Bin 120 -> 0 bytes sdext/source/presenter/bitmaps/ViewBackground.png | Bin 177 -> 0 bytes sdext/source/presenter/components.cxx | 74 ++ sdext/source/presenter/delzip | 1 - sdext/source/presenter/description.xml | 58 - sdext/source/presenter/help/component.txt | 2 - .../help/en-US/com.sun.PresenterScreen/makefile.mk | 47 - .../en-US/com.sun.PresenterScreen/presenter.xhp | 180 --- sdext/source/presenter/makefile.mk | 393 ++----- sdext/source/presenter/manifest.xml | 38 - .../registry/data/org/openoffice/Office/Jobs.xcu | 41 - .../data/org/openoffice/Office/ProtocolHandler.xcu | 31 - .../Office/extension/PresenterScreen.xcu | 1220 -------------------- .../org/openoffice/Office/extension/makefile.mk | 47 - .../data/org/openoffice/Office/makefile.mk | 44 - .../Office/extension/PresenterScreen.xcs | 465 -------- set_soenv.in | 1 - 227 files changed, 2278 insertions(+), 2868 deletions(-) create mode 100644 default_images/presenter/Background.png create mode 100644 default_images/presenter/BorderActiveBottom.png create mode 100644 default_images/presenter/BorderActiveBottomCallout.png create mode 100644 default_images/presenter/BorderActiveBottomLeft.png create mode 100644 default_images/presenter/BorderActiveBottomRight.png create mode 100644 default_images/presenter/BorderActiveLeft.png create mode 100644 default_images/presenter/BorderActiveRight.png create mode 100644 default_images/presenter/BorderActiveTop.png create mode 100644 default_images/presenter/BorderActiveTopLeft.png create mode 100644 default_images/presenter/BorderActiveTopRight.png create mode 100644 default_images/presenter/BorderBottom.png create mode 100644 default_images/presenter/BorderBottomLeft.png create mode 100644 default_images/presenter/BorderBottomRight.png create mode 100644 default_images/presenter/BorderCurrentSlideBottom.png create mode 100644 default_images/presenter/BorderCurrentSlideBottomLeft.png create mode 100644 default_images/presenter/BorderCurrentSlideBottomRight.png create mode 100644 default_images/presenter/BorderCurrentSlideLeft.png create mode 100644 default_images/presenter/BorderCurrentSlideRight.png create mode 100644 default_images/presenter/BorderCurrentSlideTop.png create mode 100644 default_images/presenter/BorderCurrentSlideTopLeft.png create mode 100644 default_images/presenter/BorderCurrentSlideTopRight.png create mode 100644 default_images/presenter/BorderLeft.png create mode 100644 default_images/presenter/BorderRight.png create mode 100644 default_images/presenter/BorderToolbarBottom.png create mode 100644 default_images/presenter/BorderToolbarLeft.png create mode 100644 default_images/presenter/BorderToolbarRight.png create mode 100644 default_images/presenter/BorderToolbarTop.png create mode 100644 default_images/presenter/BorderToolbarTopLeft.png create mode 100644 default_images/presenter/BorderToolbarTopRight.png create mode 100644 default_images/presenter/BorderTop.png create mode 100644 default_images/presenter/BorderTopLeft.png create mode 100644 default_images/presenter/BorderTopRight.png create mode 100644 default_images/presenter/ButtonEffectNextDisabled.png create mode 100644 default_images/presenter/ButtonEffectNextMouseOver.png create mode 100644 default_images/presenter/ButtonEffectNextNormal.png create mode 100644 default_images/presenter/ButtonEffectNextSelected.png create mode 100644 default_images/presenter/ButtonFrameCenterMouseOver.png create mode 100644 default_images/presenter/ButtonFrameCenterNormal.png create mode 100644 default_images/presenter/ButtonFrameLeftMouseOver.png create mode 100644 default_images/presenter/ButtonFrameLeftNormal.png create mode 100644 default_images/presenter/ButtonFrameRightMouseOver.png create mode 100644 default_images/presenter/ButtonFrameRightNormal.png create mode 100644 default_images/presenter/ButtonHelpDisabled.png create mode 100644 default_images/presenter/ButtonHelpMouseOver.png create mode 100644 default_images/presenter/ButtonHelpNormal.png create mode 100644 default_images/presenter/ButtonHelpSelected.png create mode 100644 default_images/presenter/ButtonMinusDisabled.png create mode 100644 default_images/presenter/ButtonMinusMouseOver.png create mode 100644 default_images/presenter/ButtonMinusNormal.png create mode 100644 default_images/presenter/ButtonMinusSelected.png create mode 100644 default_images/presenter/ButtonNotesDisabled.png create mode 100644 default_images/presenter/ButtonNotesMouseOver.png create mode 100644 default_images/presenter/ButtonNotesNormal.png create mode 100644 default_images/presenter/ButtonNotesSelected.png create mode 100644 default_images/presenter/ButtonPlusDisabled.png create mode 100644 default_images/presenter/ButtonPlusMouseOver.png create mode 100644 default_images/presenter/ButtonPlusNormal.png create mode 100644 default_images/presenter/ButtonPlusSelected.png create mode 100644 default_images/presenter/ButtonSlideNextDisabled.png create mode 100644 default_images/presenter/ButtonSlideNextMouseOver.png create mode 100644 default_images/presenter/ButtonSlideNextNormal.png create mode 100644 default_images/presenter/ButtonSlidePreviousDisabled.png create mode 100644 default_images/presenter/ButtonSlidePreviousMouseOver.png create mode 100644 default_images/presenter/ButtonSlidePreviousNormal.png create mode 100644 default_images/presenter/ButtonSlidePreviousSelected.png create mode 100644 default_images/presenter/ButtonSlideSorterDisabled.png create mode 100644 default_images/presenter/ButtonSlideSorterMouseOver.png create mode 100644 default_images/presenter/ButtonSlideSorterNormal.png create mode 100644 default_images/presenter/ButtonSlideSorterSelected.png create mode 100644 default_images/presenter/LabelMouseOverCenter.png create mode 100644 default_images/presenter/LabelMouseOverLeft.png create mode 100644 default_images/presenter/LabelMouseOverRight.png create mode 100644 default_images/presenter/ScrollbarArrowDownDisabled.png create mode 100644 default_images/presenter/ScrollbarArrowDownMouseOver.png create mode 100644 default_images/presenter/ScrollbarArrowDownNormal.png create mode 100644 default_images/presenter/ScrollbarArrowDownSelected.png create mode 100644 default_images/presenter/ScrollbarArrowUpDisabled.png create mode 100644 default_images/presenter/ScrollbarArrowUpMouseOver.png create mode 100644 default_images/presenter/ScrollbarArrowUpNormal.png create mode 100644 default_images/presenter/ScrollbarArrowUpSelected.png create mode 100644 default_images/presenter/ScrollbarPagerMiddleMouseOver.png create mode 100644 default_images/presenter/ScrollbarPagerMiddleNormal.png create mode 100644 default_images/presenter/ScrollbarThumbBottomMouseOver.png create mode 100644 default_images/presenter/ScrollbarThumbBottomNormal.png create mode 100644 default_images/presenter/ScrollbarThumbMiddleMouseOver.png create mode 100644 default_images/presenter/ScrollbarThumbMiddleNormal.png create mode 100644 default_images/presenter/ScrollbarThumbTopMouseOver.png create mode 100644 default_images/presenter/ScrollbarThumbTopNormal.png create mode 100644 default_images/presenter/ViewBackground.png create mode 100644 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu create mode 100644 officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs create mode 100644 sdext/source/presenter/Jobs.xcu delete mode 100644 sdext/source/presenter/PresenterComponent.cxx delete mode 100644 sdext/source/presenter/PresenterComponent.hxx delete mode 100644 sdext/source/presenter/PresenterExtensionIdentifier.txx create mode 100644 sdext/source/presenter/PresenterScreen.component create mode 100644 sdext/source/presenter/PresenterScreen.hrc create mode 100644 sdext/source/presenter/PresenterScreen.src create mode 100644 sdext/source/presenter/ProtocolHandler.xcu delete mode 100644 sdext/source/presenter/bitmaps/Background.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveBottom.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveBottomRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveTop.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveTopLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveTopRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderBottom.png delete mode 100644 sdext/source/presenter/bitmaps/BorderBottomLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderBottomRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarBottom.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarTop.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarTopRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderTop.png delete mode 100644 sdext/source/presenter/bitmaps/BorderTopLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderTopRight.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonHelpDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonHelpNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonHelpSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonMinusDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonMinusNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonMinusSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonNotesDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonNotesNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonNotesSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonPlusDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonPlusNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonPlusSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png delete mode 100644 sdext/source/presenter/bitmaps/LabelMouseOverCenter.png delete mode 100644 sdext/source/presenter/bitmaps/LabelMouseOverLeft.png delete mode 100644 sdext/source/presenter/bitmaps/LabelMouseOverRight.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ViewBackground.png create mode 100644 sdext/source/presenter/components.cxx delete mode 100644 sdext/source/presenter/delzip delete mode 100644 sdext/source/presenter/description.xml delete mode 100644 sdext/source/presenter/help/component.txt delete mode 100644 sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk delete mode 100644 sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp delete mode 100644 sdext/source/presenter/manifest.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 delete mode 100644 sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu delete mode 100644 sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk delete mode 100644 sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk delete mode 100644 sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs diff --git a/configure.in b/configure.in index bce50ec5adfa..e6dc9fe37546 100644 --- a/configure.in +++ b/configure.in @@ -516,9 +516,6 @@ AC_ARG_WITH(beanshell-jar, [ --with-beanshell-jar=JARFILE Specify path to jarfile manually ], [ BSH_JAR="$withval" ]) -AC_ARG_ENABLE(presenter-screen, -[ --enable-presenter-screen enables the build of the Presenter Screen extension -],,) AC_ARG_ENABLE(pdfimport, [ --enable-pdfimport enables the build of the PDF Import extension ],,) @@ -6394,16 +6391,6 @@ fi AC_SUBST(ENABLE_OPENGL) -AC_MSG_CHECKING([whether to build the Presenter Screen extension]) -if test -n "$enable_presenter_screen" -a "$enable_presenter_screen" != "no"; then - AC_MSG_RESULT([yes]) - ENABLE_PRESENTER_SCREEN=YES -else - AC_MSG_RESULT([no]) - ENABLE_PRESENTER_SCREEN=NO -fi -AC_SUBST(ENABLE_PRESENTER_SCREEN) - AC_MSG_CHECKING([whether to build the PDF Import extension]) if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then AC_MSG_RESULT([yes]) @@ -6432,16 +6419,6 @@ AC_SUBST(SYSTEM_POPPLER) AC_SUBST(POPPLER_CFLAGS) AC_SUBST(POPPLER_LIBS) -if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then - AC_MSG_CHECKING([for sdext module]) - if test -d ./sdext; then - AC_MSG_RESULT([OK]) - else - AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) - fi - BUILD_TYPE="$BUILD_TYPE SDEXT" -fi - AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test "$WITH_JAVA" != "no"; then AC_MSG_RESULT([yes]) diff --git a/default_images/presenter/Background.png b/default_images/presenter/Background.png new file mode 100644 index 000000000000..7b32e4ab974b Binary files /dev/null and b/default_images/presenter/Background.png differ diff --git a/default_images/presenter/BorderActiveBottom.png b/default_images/presenter/BorderActiveBottom.png new file mode 100644 index 000000000000..8314c9efd092 Binary files /dev/null and b/default_images/presenter/BorderActiveBottom.png differ diff --git a/default_images/presenter/BorderActiveBottomCallout.png b/default_images/presenter/BorderActiveBottomCallout.png new file mode 100644 index 000000000000..b7c33223a33c Binary files /dev/null and b/default_images/presenter/BorderActiveBottomCallout.png differ diff --git a/default_images/presenter/BorderActiveBottomLeft.png b/default_images/presenter/BorderActiveBottomLeft.png new file mode 100644 index 000000000000..8d573e864942 Binary files /dev/null and b/default_images/presenter/BorderActiveBottomLeft.png differ diff --git a/default_images/presenter/BorderActiveBottomRight.png b/default_images/presenter/BorderActiveBottomRight.png new file mode 100644 index 000000000000..35ef8e9213db Binary files /dev/null and b/default_images/presenter/BorderActiveBottomRight.png differ diff --git a/default_images/presenter/BorderActiveLeft.png b/default_images/presenter/BorderActiveLeft.png new file mode 100644 index 000000000000..57d4a3dbbcd3 Binary files /dev/null and b/default_images/presenter/BorderActiveLeft.png differ diff --git a/default_images/presenter/BorderActiveRight.png b/default_images/presenter/BorderActiveRight.png new file mode 100644 index 000000000000..9a9857190b9d Binary files /dev/null and b/default_images/presenter/BorderActiveRight.png differ diff --git a/default_images/presenter/BorderActiveTop.png b/default_images/presenter/BorderActiveTop.png new file mode 100644 index 000000000000..e0bea9d55448 Binary files /dev/null and b/default_images/presenter/BorderActiveTop.png differ diff --git a/default_images/presenter/BorderActiveTopLeft.png b/default_images/presenter/BorderActiveTopLeft.png new file mode 100644 index 000000000000..62d63271fe21 Binary files /dev/null and b/default_images/presenter/BorderActiveTopLeft.png differ diff --git a/default_images/presenter/BorderActiveTopRight.png b/default_images/presenter/BorderActiveTopRight.png new file mode 100644 index 000000000000..450c8e0cc5e7 Binary files /dev/null and b/default_images/presenter/BorderActiveTopRight.png differ diff --git a/default_images/presenter/BorderBottom.png b/default_images/presenter/BorderBottom.png new file mode 100644 index 000000000000..7ad2fd6c2a03 Binary files /dev/null and b/default_images/presenter/BorderBottom.png differ diff --git a/default_images/presenter/BorderBottomLeft.png b/default_images/presenter/BorderBottomLeft.png new file mode 100644 index 000000000000..019de149b3af Binary files /dev/null and b/default_images/presenter/BorderBottomLeft.png differ diff --git a/default_images/presenter/BorderBottomRight.png b/default_images/presenter/BorderBottomRight.png new file mode 100644 index 000000000000..82de5791c1cd Binary files /dev/null and b/default_images/presenter/BorderBottomRight.png differ diff --git a/default_images/presenter/BorderCurrentSlideBottom.png b/default_images/presenter/BorderCurrentSlideBottom.png new file mode 100644 index 000000000000..7000bc22f6c4 Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideBottom.png differ diff --git a/default_images/presenter/BorderCurrentSlideBottomLeft.png b/default_images/presenter/BorderCurrentSlideBottomLeft.png new file mode 100644 index 000000000000..7571c8d94b1f Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideBottomLeft.png differ diff --git a/default_images/presenter/BorderCurrentSlideBottomRight.png b/default_images/presenter/BorderCurrentSlideBottomRight.png new file mode 100644 index 000000000000..c0af63ff58b8 Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideBottomRight.png differ diff --git a/default_images/presenter/BorderCurrentSlideLeft.png b/default_images/presenter/BorderCurrentSlideLeft.png new file mode 100644 index 000000000000..7000bc22f6c4 Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideLeft.png differ diff --git a/default_images/presenter/BorderCurrentSlideRight.png b/default_images/presenter/BorderCurrentSlideRight.png new file mode 100644 index 000000000000..7000bc22f6c4 Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideRight.png differ diff --git a/default_images/presenter/BorderCurrentSlideTop.png b/default_images/presenter/BorderCurrentSlideTop.png new file mode 100644 index 000000000000..7000bc22f6c4 Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideTop.png differ diff --git a/default_images/presenter/BorderCurrentSlideTopLeft.png b/default_images/presenter/BorderCurrentSlideTopLeft.png new file mode 100644 index 000000000000..fdfabd42ae9f Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideTopLeft.png differ diff --git a/default_images/presenter/BorderCurrentSlideTopRight.png b/default_images/presenter/BorderCurrentSlideTopRight.png new file mode 100644 index 000000000000..5b4b642e9f34 Binary files /dev/null and b/default_images/presenter/BorderCurrentSlideTopRight.png differ diff --git a/default_images/presenter/BorderLeft.png b/default_images/presenter/BorderLeft.png new file mode 100644 index 000000000000..cbdb267b8789 Binary files /dev/null and b/default_images/presenter/BorderLeft.png differ diff --git a/default_images/presenter/BorderRight.png b/default_images/presenter/BorderRight.png new file mode 100644 index 000000000000..333073328ddd Binary files /dev/null and b/default_images/presenter/BorderRight.png differ diff --git a/default_images/presenter/BorderToolbarBottom.png b/default_images/presenter/BorderToolbarBottom.png new file mode 100644 index 000000000000..23a3bc3595aa Binary files /dev/null and b/default_images/presenter/BorderToolbarBottom.png differ diff --git a/default_images/presenter/BorderToolbarLeft.png b/default_images/presenter/BorderToolbarLeft.png new file mode 100644 index 000000000000..839ab5091a8e Binary files /dev/null and b/default_images/presenter/BorderToolbarLeft.png differ diff --git a/default_images/presenter/BorderToolbarRight.png b/default_images/presenter/BorderToolbarRight.png new file mode 100644 index 000000000000..e5c4b9d25a16 Binary files /dev/null and b/default_images/presenter/BorderToolbarRight.png differ diff --git a/default_images/presenter/BorderToolbarTop.png b/default_images/presenter/BorderToolbarTop.png new file mode 100644 index 000000000000..c45b97c434cd Binary files /dev/null and b/default_images/presenter/BorderToolbarTop.png differ diff --git a/default_images/presenter/BorderToolbarTopLeft.png b/default_images/presenter/BorderToolbarTopLeft.png new file mode 100644 index 000000000000..978e98a9bbc4 Binary files /dev/null and b/default_images/presenter/BorderToolbarTopLeft.png differ diff --git a/default_images/presenter/BorderToolbarTopRight.png b/default_images/presenter/BorderToolbarTopRight.png new file mode 100644 index 000000000000..7dc3d98860ea Binary files /dev/null and b/default_images/presenter/BorderToolbarTopRight.png differ diff --git a/default_images/presenter/BorderTop.png b/default_images/presenter/BorderTop.png new file mode 100644 index 000000000000..dee68e828147 Binary files /dev/null and b/default_images/presenter/BorderTop.png differ diff --git a/default_images/presenter/BorderTopLeft.png b/default_images/presenter/BorderTopLeft.png new file mode 100644 index 000000000000..bbec4e42be42 Binary files /dev/null and b/default_images/presenter/BorderTopLeft.png differ diff --git a/default_images/presenter/BorderTopRight.png b/default_images/presenter/BorderTopRight.png new file mode 100644 index 000000000000..3416b16c9e91 Binary files /dev/null and b/default_images/presenter/BorderTopRight.png differ diff --git a/default_images/presenter/ButtonEffectNextDisabled.png b/default_images/presenter/ButtonEffectNextDisabled.png new file mode 100644 index 000000000000..5417cf72c928 Binary files /dev/null and b/default_images/presenter/ButtonEffectNextDisabled.png differ diff --git a/default_images/presenter/ButtonEffectNextMouseOver.png b/default_images/presenter/ButtonEffectNextMouseOver.png new file mode 100644 index 000000000000..96805e392176 Binary files /dev/null and b/default_images/presenter/ButtonEffectNextMouseOver.png differ diff --git a/default_images/presenter/ButtonEffectNextNormal.png b/default_images/presenter/ButtonEffectNextNormal.png new file mode 100644 index 000000000000..6dbd732e0977 Binary files /dev/null and b/default_images/presenter/ButtonEffectNextNormal.png differ diff --git a/default_images/presenter/ButtonEffectNextSelected.png b/default_images/presenter/ButtonEffectNextSelected.png new file mode 100644 index 000000000000..eb6e6d45bb23 Binary files /dev/null and b/default_images/presenter/ButtonEffectNextSelected.png differ diff --git a/default_images/presenter/ButtonFrameCenterMouseOver.png b/default_images/presenter/ButtonFrameCenterMouseOver.png new file mode 100644 index 000000000000..b97799f1f314 Binary files /dev/null and b/default_images/presenter/ButtonFrameCenterMouseOver.png differ diff --git a/default_images/presenter/ButtonFrameCenterNormal.png b/default_images/presenter/ButtonFrameCenterNormal.png new file mode 100644 index 000000000000..4cf7218f3b52 Binary files /dev/null and b/default_images/presenter/ButtonFrameCenterNormal.png differ diff --git a/default_images/presenter/ButtonFrameLeftMouseOver.png b/default_images/presenter/ButtonFrameLeftMouseOver.png new file mode 100644 index 000000000000..1f2ab6a00cab Binary files /dev/null and b/default_images/presenter/ButtonFrameLeftMouseOver.png differ diff --git a/default_images/presenter/ButtonFrameLeftNormal.png b/default_images/presenter/ButtonFrameLeftNormal.png new file mode 100644 index 000000000000..0e92cb37d7d8 Binary files /dev/null and b/default_images/presenter/ButtonFrameLeftNormal.png differ diff --git a/default_images/presenter/ButtonFrameRightMouseOver.png b/default_images/presenter/ButtonFrameRightMouseOver.png new file mode 100644 index 000000000000..0f49ad4f7e61 Binary files /dev/null and b/default_images/presenter/ButtonFrameRightMouseOver.png differ diff --git a/default_images/presenter/ButtonFrameRightNormal.png b/default_images/presenter/ButtonFrameRightNormal.png new file mode 100644 index 000000000000..4ca69670e513 Binary files /dev/null and b/default_images/presenter/ButtonFrameRightNormal.png differ diff --git a/default_images/presenter/ButtonHelpDisabled.png b/default_images/presenter/ButtonHelpDisabled.png new file mode 100644 index 000000000000..12f4903b6cf8 Binary files /dev/null and b/default_images/presenter/ButtonHelpDisabled.png differ diff --git a/default_images/presenter/ButtonHelpMouseOver.png b/default_images/presenter/ButtonHelpMouseOver.png new file mode 100644 index 000000000000..7bddef561f11 Binary files /dev/null and b/default_images/presenter/ButtonHelpMouseOver.png differ diff --git a/default_images/presenter/ButtonHelpNormal.png b/default_images/presenter/ButtonHelpNormal.png new file mode 100644 index 000000000000..99c693215ba9 Binary files /dev/null and b/default_images/presenter/ButtonHelpNormal.png differ diff --git a/default_images/presenter/ButtonHelpSelected.png b/default_images/presenter/ButtonHelpSelected.png new file mode 100644 index 000000000000..f162db27650e Binary files /dev/null and b/default_images/presenter/ButtonHelpSelected.png differ diff --git a/default_images/presenter/ButtonMinusDisabled.png b/default_images/presenter/ButtonMinusDisabled.png new file mode 100644 index 000000000000..ff61106eb7ec Binary files /dev/null and b/default_images/presenter/ButtonMinusDisabled.png differ diff --git a/default_images/presenter/ButtonMinusMouseOver.png b/default_images/presenter/ButtonMinusMouseOver.png new file mode 100644 index 000000000000..787249912b9c Binary files /dev/null and b/default_images/presenter/ButtonMinusMouseOver.png differ diff --git a/default_images/presenter/ButtonMinusNormal.png b/default_images/presenter/ButtonMinusNormal.png new file mode 100644 index 000000000000..e2d993384fef Binary files /dev/null and b/default_images/presenter/ButtonMinusNormal.png differ diff --git a/default_images/presenter/ButtonMinusSelected.png b/default_images/presenter/ButtonMinusSelected.png new file mode 100644 index 000000000000..5d15de3b916f Binary files /dev/null and b/default_images/presenter/ButtonMinusSelected.png differ diff --git a/default_images/presenter/ButtonNotesDisabled.png b/default_images/presenter/ButtonNotesDisabled.png new file mode 100644 index 000000000000..09e31d26c649 Binary files /dev/null and b/default_images/presenter/ButtonNotesDisabled.png differ diff --git a/default_images/presenter/ButtonNotesMouseOver.png b/default_images/presenter/ButtonNotesMouseOver.png new file mode 100644 index 000000000000..099d6bf0f2b1 Binary files /dev/null and b/default_images/presenter/ButtonNotesMouseOver.png differ diff --git a/default_images/presenter/ButtonNotesNormal.png b/default_images/presenter/ButtonNotesNormal.png new file mode 100644 index 000000000000..551392622506 Binary files /dev/null and b/default_images/presenter/ButtonNotesNormal.png differ diff --git a/default_images/presenter/ButtonNotesSelected.png b/default_images/presenter/ButtonNotesSelected.png new file mode 100644 index 000000000000..f5494fb1c678 Binary files /dev/null and b/default_images/presenter/ButtonNotesSelected.png differ diff --git a/default_images/presenter/ButtonPlusDisabled.png b/default_images/presenter/ButtonPlusDisabled.png new file mode 100644 index 000000000000..e6ba3f3e78a7 Binary files /dev/null and b/default_images/presenter/ButtonPlusDisabled.png differ diff --git a/default_images/presenter/ButtonPlusMouseOver.png b/default_images/presenter/ButtonPlusMouseOver.png new file mode 100644 index 000000000000..9d21dc40a6eb Binary files /dev/null and b/default_images/presenter/ButtonPlusMouseOver.png differ diff --git a/default_images/presenter/ButtonPlusNormal.png b/default_images/presenter/ButtonPlusNormal.png new file mode 100644 index 000000000000..2e075c2a3a87 Binary files /dev/null and b/default_images/presenter/ButtonPlusNormal.png differ diff --git a/default_images/presenter/ButtonPlusSelected.png b/default_images/presenter/ButtonPlusSelected.png new file mode 100644 index 000000000000..b9d6fe1ed929 Binary files /dev/null and b/default_images/presenter/ButtonPlusSelected.png differ diff --git a/default_images/presenter/ButtonSlideNextDisabled.png b/default_images/presenter/ButtonSlideNextDisabled.png new file mode 100644 index 000000000000..7f3bce058f4c Binary files /dev/null and b/default_images/presenter/ButtonSlideNextDisabled.png differ diff --git a/default_images/presenter/ButtonSlideNextMouseOver.png b/default_images/presenter/ButtonSlideNextMouseOver.png new file mode 100644 index 000000000000..4dc13655965b Binary files /dev/null and b/default_images/presenter/ButtonSlideNextMouseOver.png differ diff --git a/default_images/presenter/ButtonSlideNextNormal.png b/default_images/presenter/ButtonSlideNextNormal.png new file mode 100644 index 000000000000..711b8ca8caf6 Binary files /dev/null and b/default_images/presenter/ButtonSlideNextNormal.png differ diff --git a/default_images/presenter/ButtonSlidePreviousDisabled.png b/default_images/presenter/ButtonSlidePreviousDisabled.png new file mode 100644 index 000000000000..383780eab2cf Binary files /dev/null and b/default_images/presenter/ButtonSlidePreviousDisabled.png differ diff --git a/default_images/presenter/ButtonSlidePreviousMouseOver.png b/default_images/presenter/ButtonSlidePreviousMouseOver.png new file mode 100644 index 000000000000..dc35c62deaf2 Binary files /dev/null and b/default_images/presenter/ButtonSlidePreviousMouseOver.png differ diff --git a/default_images/presenter/ButtonSlidePreviousNormal.png b/default_images/presenter/ButtonSlidePreviousNormal.png new file mode 100644 index 000000000000..26262b4568d7 Binary files /dev/null and b/default_images/presenter/ButtonSlidePreviousNormal.png differ diff --git a/default_images/presenter/ButtonSlidePreviousSelected.png b/default_images/presenter/ButtonSlidePreviousSelected.png new file mode 100644 index 000000000000..7274263a43f5 Binary files /dev/null and b/default_images/presenter/ButtonSlidePreviousSelected.png differ diff --git a/default_images/presenter/ButtonSlideSorterDisabled.png b/default_images/presenter/ButtonSlideSorterDisabled.png new file mode 100644 index 000000000000..ce7d4ad51514 Binary files /dev/null and b/default_images/presenter/ButtonSlideSorterDisabled.png differ diff --git a/default_images/presenter/ButtonSlideSorterMouseOver.png b/default_images/presenter/ButtonSlideSorterMouseOver.png new file mode 100644 index 000000000000..2e7f518ac9e3 Binary files /dev/null and b/default_images/presenter/ButtonSlideSorterMouseOver.png differ diff --git a/default_images/presenter/ButtonSlideSorterNormal.png b/default_images/presenter/ButtonSlideSorterNormal.png new file mode 100644 index 000000000000..7aa914f41c01 Binary files /dev/null and b/default_images/presenter/ButtonSlideSorterNormal.png differ diff --git a/default_images/presenter/ButtonSlideSorterSelected.png b/default_images/presenter/ButtonSlideSorterSelected.png new file mode 100644 index 000000000000..143f995a004c Binary files /dev/null and b/default_images/presenter/ButtonSlideSorterSelected.png differ diff --git a/default_images/presenter/LabelMouseOverCenter.png b/default_images/presenter/LabelMouseOverCenter.png new file mode 100644 index 000000000000..6eb75d386f46 Binary files /dev/null and b/default_images/presenter/LabelMouseOverCenter.png differ diff --git a/default_images/presenter/LabelMouseOverLeft.png b/default_images/presenter/LabelMouseOverLeft.png new file mode 100644 index 000000000000..9455246332cf Binary files /dev/null and b/default_images/presenter/LabelMouseOverLeft.png differ diff --git a/default_images/presenter/LabelMouseOverRight.png b/default_images/presenter/LabelMouseOverRight.png new file mode 100644 index 000000000000..1f972d0cebea Binary files /dev/null and b/default_images/presenter/LabelMouseOverRight.png differ diff --git a/default_images/presenter/ScrollbarArrowDownDisabled.png b/default_images/presenter/ScrollbarArrowDownDisabled.png new file mode 100644 index 000000000000..4dd16272fad7 Binary files /dev/null and b/default_images/presenter/ScrollbarArrowDownDisabled.png differ diff --git a/default_images/presenter/ScrollbarArrowDownMouseOver.png b/default_images/presenter/ScrollbarArrowDownMouseOver.png new file mode 100644 index 000000000000..d1980a2a1a05 Binary files /dev/null and b/default_images/presenter/ScrollbarArrowDownMouseOver.png differ diff --git a/default_images/presenter/ScrollbarArrowDownNormal.png b/default_images/presenter/ScrollbarArrowDownNormal.png new file mode 100644 index 000000000000..166f10057c11 Binary files /dev/null and b/default_images/presenter/ScrollbarArrowDownNormal.png differ diff --git a/default_images/presenter/ScrollbarArrowDownSelected.png b/default_images/presenter/ScrollbarArrowDownSelected.png new file mode 100644 index 000000000000..21d42945ce98 Binary files /dev/null and b/default_images/presenter/ScrollbarArrowDownSelected.png differ diff --git a/default_images/presenter/ScrollbarArrowUpDisabled.png b/default_images/presenter/ScrollbarArrowUpDisabled.png new file mode 100644 index 000000000000..44f60683bc59 Binary files /dev/null and b/default_images/presenter/ScrollbarArrowUpDisabled.png differ diff --git a/default_images/presenter/ScrollbarArrowUpMouseOver.png b/default_images/presenter/ScrollbarArrowUpMouseOver.png new file mode 100644 index 000000000000..9795885632dc Binary files /dev/null and b/default_images/presenter/ScrollbarArrowUpMouseOver.png differ diff --git a/default_images/presenter/ScrollbarArrowUpNormal.png b/default_images/presenter/ScrollbarArrowUpNormal.png new file mode 100644 index 000000000000..804ced846065 Binary files /dev/null and b/default_images/presenter/ScrollbarArrowUpNormal.png differ diff --git a/default_images/presenter/ScrollbarArrowUpSelected.png b/default_images/presenter/ScrollbarArrowUpSelected.png new file mode 100644 index 000000000000..d7be4f324f86 Binary files /dev/null and b/default_images/presenter/ScrollbarArrowUpSelected.png differ diff --git a/default_images/presenter/ScrollbarPagerMiddleMouseOver.png b/default_images/presenter/ScrollbarPagerMiddleMouseOver.png new file mode 100644 index 000000000000..84b781af9fb8 Binary files /dev/null and b/default_images/presenter/ScrollbarPagerMiddleMouseOver.png differ diff --git a/default_images/presenter/ScrollbarPagerMiddleNormal.png b/default_images/presenter/ScrollbarPagerMiddleNormal.png new file mode 100644 index 000000000000..a06ba667f118 Binary files /dev/null and b/default_images/presenter/ScrollbarPagerMiddleNormal.png differ diff --git a/default_images/presenter/ScrollbarThumbBottomMouseOver.png b/default_images/presenter/ScrollbarThumbBottomMouseOver.png new file mode 100644 index 000000000000..482f13638755 Binary files /dev/null and b/default_images/presenter/ScrollbarThumbBottomMouseOver.png differ diff --git a/default_images/presenter/ScrollbarThumbBottomNormal.png b/default_images/presenter/ScrollbarThumbBottomNormal.png new file mode 100644 index 000000000000..ec46e172c134 Binary files /dev/null and b/default_images/presenter/ScrollbarThumbBottomNormal.png differ diff --git a/default_images/presenter/ScrollbarThumbMiddleMouseOver.png b/default_images/presenter/ScrollbarThumbMiddleMouseOver.png new file mode 100644 index 000000000000..62066c24b687 Binary files /dev/null and b/default_images/presenter/ScrollbarThumbMiddleMouseOver.png differ diff --git a/default_images/presenter/ScrollbarThumbMiddleNormal.png b/default_images/presenter/ScrollbarThumbMiddleNormal.png new file mode 100644 index 000000000000..c25e4edcf595 Binary files /dev/null and b/default_images/presenter/ScrollbarThumbMiddleNormal.png differ diff --git a/default_images/presenter/ScrollbarThumbTopMouseOver.png b/default_images/presenter/ScrollbarThumbTopMouseOver.png new file mode 100644 index 000000000000..714481df996d Binary files /dev/null and b/default_images/presenter/ScrollbarThumbTopMouseOver.png differ diff --git a/default_images/presenter/ScrollbarThumbTopNormal.png b/default_images/presenter/ScrollbarThumbTopNormal.png new file mode 100644 index 000000000000..7e0922c74966 Binary files /dev/null and b/default_images/presenter/ScrollbarThumbTopNormal.png differ diff --git a/default_images/presenter/ViewBackground.png b/default_images/presenter/ViewBackground.png new file mode 100644 index 000000000000..ca52d8262a88 Binary files /dev/null and b/default_images/presenter/ViewBackground.png differ diff --git a/extensions.lst b/extensions.lst index 4fde85c9dc81..a62f4f3b5031 100644 --- a/extensions.lst +++ b/extensions.lst @@ -34,13 +34,13 @@ # Some extensions that are installed indepently of the language. # the presenter console extension -[ language=all && ENABLE_PRESENTER_SCREEN=YES ] - file://presenter/presenter-screen.oxt +# [ language=all && ENABLE_XXX ] +# file://XXX.oxt # English dictionary [ language=en.* || language=de || language=it ] b7ce02d25eb302e5b23572cdccaea461 http://numbertext.org/tmp/dict-en.oxt - + # English (USA, en_US) dictionary [ language==nl || language==ru ] e2eab80772ab1aa09716954219351a80 http://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt" diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu new file mode 100644 index 000000000000..74db3aa88b37 --- /dev/null +++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu @@ -0,0 +1,1220 @@ + + + + + + + + + + + + PreviousSlide + Button + + Previous + + private:graphicrepository/presenter/ButtonSlidePreviousNormal.png + + vnd.com.sun.star.comp.PresenterScreen:PrevSlide + + 12 + Bold + B3B7BC + Center + + + + + private:graphicrepository/presenter/ButtonSlidePreviousMouseOver.png + + + FFFFFF + + + + + private:graphicrepository/presenter/ButtonSlidePreviousDisabled.png + + + + + NextEffect + Button + + Next + + private:graphicrepository/presenter/ButtonEffectNextNormal.png + + vnd.com.sun.star.comp.PresenterScreen:NextEffect + + 12 + Bold + B3B7BC + Center + + + + + private:graphicrepository/presenter/ButtonEffectNextMouseOver.png + + + FFFFFF + + + + + private:graphicrepository/presenter/ButtonEffectNextDisabled.png + + + + + Notes + Button + + Notes + + private:graphicrepository/presenter/ButtonNotesNormal.png + + vnd.com.sun.star.comp.PresenterScreen:ShowNotes + + 12 + Bold + B3B7BC + Center + + + + + private:graphicrepository/presenter/ButtonNotesMouseOver.png + + + FFFFFF + + + + + private:graphicrepository/presenter/ButtonNotesSelected.png + + + FFFFFF + + vnd.com.sun.star.comp.PresenterScreen:CloseNotes + + + + private:graphicrepository/presenter/ButtonNotesDisabled.png + + + + + SlideSorter + Button + + Slides + + private:graphicrepository/presenter/ButtonSlideSorterNormal.png + + vnd.com.sun.star.comp.PresenterScreen:ShowSlideSorter + + 12 + Bold + B3B7BC + Center + + + + + private:graphicrepository/presenter/ButtonSlideSorterMouseOver.png + + + FFFFFF + + + + + private:graphicrepository/presenter/ButtonSlideSorterSelected.png + + + FFFFFF + + vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter + + + + private:graphicrepository/presenter/ButtonSlideSorterDisabled.png + + + + + VerticalSeparator + + + 76797C + + + + + ChangeOrientation + + + CurrentTimeLabel + + + 18 + Bold + ffffff + Center + + + + + HorizontalSeparator + + + 71767a + + + + + PresentationTimeLabel + + + 26 + Bold + ffe969 + Center + + + + + ChangeOrientation + + + VerticalSeparator + + + 76797C + + + + + Help + Button + + Help + + private:graphicrepository/presenter/ButtonHelpNormal.png + + vnd.com.sun.star.comp.PresenterScreen:ShowHelp + + 12 + Bold + B3B7BC + Center + + + + + private:graphicrepository/presenter/ButtonHelpMouseOver.png + + + FFFFFF + + + + + private:graphicrepository/presenter/ButtonHelpSelected.png + + + FFFFFF + + vnd.com.sun.star.comp.PresenterScreen:CloseHelp + + + + private:graphicrepository/presenter/ButtonHelpDisabled.png + + + + + + + + + Zoom + Label + + Zoom + + 14 + Bold + B3B7BC + + + + + Grow + Button + + + private:graphicrepository/presenter/ButtonPlusNormal.png + + vnd.com.sun.star.comp.PresenterScreen:GrowNotesFont + + + + private:graphicrepository/presenter/ButtonPlusMouseOver.png + + + + + private:graphicrepository/presenter/ButtonPlusDisabled.png + + + + + Shrink + Button + + + private:graphicrepository/presenter/ButtonMinusNormal.png + + vnd.com.sun.star.comp.PresenterScreen:ShrinkNotesFont + + + + private:graphicrepository/presenter/ButtonMinusMouseOver.png + + + + + private:graphicrepository/presenter/ButtonMinusDisabled.png + + + + + + + + + SlideSorterCloser + + Close + + vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter + + + NotesViewCloser + + Close + + vnd.com.sun.star.comp.PresenterScreen:CloseNotes + + + HelpViewCloser + + Close + + vnd.com.sun.star.comp.PresenterScreen:CloseHelp + + + + + + Up + private:graphicrepository/presenter/ScrollbarArrowUpNormal.png + private:graphicrepository/presenter/ScrollbarArrowUpMouseOver.png + private:graphicrepository/presenter/ScrollbarArrowUpDisabled.png + + + Down + private:graphicrepository/presenter/ScrollbarArrowDownNormal.png + private:graphicrepository/presenter/ScrollbarArrowDownMouseOver.png + private:graphicrepository/presenter/ScrollbarArrowDownDisabled.png + + + PagerVertical + private:graphicrepository/presenter/ScrollbarPagerMiddleNormal.png + private:graphicrepository/presenter/ScrollbarPagerMiddleMouseOver.png + + + ThumbTop + private:graphicrepository/presenter/ScrollbarThumbTopNormal.png + private:graphicrepository/presenter/ScrollbarThumbTopMouseOver.png + + + ThumbBottom + private:graphicrepository/presenter/ScrollbarThumbBottomNormal.png + private:graphicrepository/presenter/ScrollbarThumbBottomMouseOver.png + + + ThumbVertical + private:graphicrepository/presenter/ScrollbarThumbMiddleNormal.png + private:graphicrepository/presenter/ScrollbarThumbMiddleMouseOver.png + + + + + + 9 + 9 + 9 + 9 + + + + private:graphicrepository/presenter/BorderCurrentSlideTopLeft.png + + + private:graphicrepository/presenter/BorderCurrentSlideTop.png + + + private:graphicrepository/presenter/BorderCurrentSlideTopRight.png + + + private:graphicrepository/presenter/BorderCurrentSlideLeft.png + + + private:graphicrepository/presenter/BorderCurrentSlideRight.png + + + private:graphicrepository/presenter/BorderCurrentSlideBottomLeft.png + + + private:graphicrepository/presenter/BorderCurrentSlideBottom.png + + + private:graphicrepository/presenter/BorderCurrentSlideBottomRight.png + + + + + + + + Left click, right or down arrow, spacebar, page down, enter, return, 'N' + + + Next slide, or next effect + + + + + Right click, left or up arrow, page up, backspace, 'P' + + + Previous slide, or previous effect + + + + + + + + + + + + + Home + + + First slide + + + + + End + + + Last slide + + + + + + + + + + + + + Alt-Page Up + + + Previous slide without effects + + + + + Alt-Page Down + + + Next slide without effects + + + + + + + + + + + + + 'B', '.' + + + Blacks/Unblacks the screen + + + + + 'W', ',' + + + Whites/Unwhites the screen + + + + + + + + + + + + + Esc, '-' + + + End slide show + + + + + + + + + + + + + Number followed by Enter + + + Go to that slide + + + + + + + + + + + + + 'G', 'S' + + + Grow/Shrink size of notes font + + + + + 'A', 'Z' + + + Scroll notes up/down + + + + + 'H', 'L' + + + Move caret in notes view backward/forward + + + + + + + + + + + + + Ctrl-'1' + + + Shows the Presenter Console + + + + + Ctrl-'2' + + + Shows the Presentation Notes + + + + + Ctrl-'3' + + + Shows the Slides Overview + + + + + + + + + + DefaultTheme + + + + + DefaultPaneStyle + + + + Bold + 14 + B3B7BC + Center + -7 + + + 6 + 6 + 6 + 6 + + + 20 + 28 + 20 + 29 + + + + private:graphicrepository/presenter/BorderTop.png + 6 + + + private:graphicrepository/presenter/BorderTopLeft.png + 6 + 6 + + + private:graphicrepository/presenter/BorderTopRight.png + -6 + 6 + + + private:graphicrepository/presenter/BorderLeft.png + 6 + + + private:graphicrepository/presenter/BorderRight.png + -6 + + + private:graphicrepository/presenter/BorderBottomLeft.png + 6 + -6 + + + private:graphicrepository/presenter/BorderBottomRight.png + -6 + -6 + + + private:graphicrepository/presenter/BorderBottom.png + -6 + + + + + + ActivePaneStyle + + + DefaultPaneStyle + + + + Bold + 14 + FFFFFF + Center + -10 + + + + private:graphicrepository/presenter/BorderActiveTop.png + 6 + + + private:graphicrepository/presenter/BorderActiveTopLeft.png + 6 + 6 + + + private:graphicrepository/presenter/BorderActiveTopRight.png + -6 + 6 + + + private:graphicrepository/presenter/BorderActiveLeft.png + 6 + + + private:graphicrepository/presenter/BorderActiveRight.png + -6 + + + private:graphicrepository/presenter/BorderActiveBottomLeft.png + 6 + -6 + + + private:graphicrepository/presenter/BorderActiveBottomRight.png + -6 + -6 + + + private:graphicrepository/presenter/BorderActiveBottom.png + -6 + + + + + + ToolbarPaneStyle + + + 4 + 4 + 4 + 4 + + + 8 + 8 + 8 + 0 + + + + private:graphicrepository/presenter/BorderToolbarTop.png + 4 + + + private:graphicrepository/presenter/BorderToolbarTopLeft.png + 4 + 4 + + + private:graphicrepository/presenter/BorderToolbarTopRight.png + -4 + 4 + + + private:graphicrepository/presenter/BorderToolbarLeft.png + 4 + + + private:graphicrepository/presenter/BorderToolbarRight.png + -4 + + + private:graphicrepository/presenter/BorderToolbarLeft.png + 4 + + + private:graphicrepository/presenter/BorderToolbarRight.png + -4 + + + private:graphicrepository/presenter/BorderToolbarBottom.png + -4 + + + + + + ActiveBottomCalloutPaneStyle + + + ActivePaneStyle + + + 52 + + + + private:graphicrepository/presenter/BorderActiveBottomCallout.png + -6 + 49 + 41 + + + + + + + DefaultViewStyle + + + 20 + FFFFFF + + + + private:graphicrepository/presenter/ViewBackground.png + Repeat + Repeat + 33000000 + + + + NotesViewStyle + DefaultViewStyle + + + Bold + 26 + d1d6dc + + + + SlideSorterViewStyle + DefaultViewStyle + + + HelpViewStyle + DefaultViewStyle + + + Bold + 20 + ffffff + + + + + private:graphicrepository/presenter/Background.png + E4EFF9 + Repeat + Stretch + + + + ButtonFrameLeft + private:graphicrepository/presenter/ButtonFrameLeftNormal.png + private:graphicrepository/presenter/ButtonFrameLeftMouseOver.png + 2 + + + ButtonFrameCenter + private:graphicrepository/presenter/ButtonFrameCenterNormal.png + private:graphicrepository/presenter/ButtonFrameCenterMouseOver.png + 2 + + + ButtonFrameRight + private:graphicrepository/presenter/ButtonFrameRightNormal.png + private:graphicrepository/presenter/ButtonFrameRightMouseOver.png + 2 + + + private:graphicrepository/presenter/LabelMouseOverLeft.png + + + private:graphicrepository/presenter/LabelMouseOverCenter.png + + + private:graphicrepository/presenter/LabelMouseOverRight.png + + + private:graphicrepository/presenter/ButtonSlideNextNormal.png + + + + + + Bold + 18 + b3b7bc + + + + Bold + 18 + ffffff + + + + Bold + 20 + ffffff + + + + Bold + 24 + e02050 + + + + + + private:resource/pane/Presenter/Pane1 + + + ActivePaneStyle + + + + + private:resource/view/Presenter/CurrentSlidePreview + + + DefaultViewStyle + + + + + private:resource/pane/Presenter/Pane2 + + + DefaultPaneStyle + + + + + private:resource/view/Presenter/NextSlidePreview + + + DefaultViewStyle + + + + + private:resource/pane/Presenter/Pane4 + + + ToolbarPaneStyle + + + + + private:resource/view/Presenter/ToolBar + + + DefaultViewStyle + + + + + private:resource/pane/Presenter/Pane3 + + + ActivePaneStyle + + + + + private:resource/view/Presenter/Notes + + + NotesViewStyle + + + + + private:resource/view/Presenter/SlideSorter + + + SlideSorterViewStyle + + + + + private:resource/pane/Presenter/Overlay + + + ActivePaneStyle + + + + + private:resource/view/Presenter/Help + + + HelpViewStyle + + + + + private:resource/pane/Presenter/Pane6 + + + ActivePaneStyle + + + + + + + + + private:resource/view/Presenter/CurrentSlidePreview + + + Current Slide (%CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%) + + + Current Slide, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT% + + true + + + + Click to exit presentation... + + + + + Current Slide (end) + + + + + + + private:resource/view/Presenter/NextSlidePreview + + + Next Slide + + false + + + + private:resource/view/Presenter/ToolBar + + false + + + + private:resource/view/Presenter/Notes + + + Notes + + false + + + + private:resource/view/Presenter/SlideSorter + + false + + + + + Slide Overview, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT% + + + + + private:resource/view/Presenter/Help + + + Help + + false + + + + + + DefaultLayout + + + + + private:resource/pane/Presenter/Pane1 + + + private:resource/view/Presenter/CurrentSlidePreview + + + 0.05 + + + 0.05 + + + 0.50 + + + 0.50 + + + + + private:resource/pane/Presenter/Pane2 + + + private:resource/view/Presenter/NextSlidePreview + + + 0.60 + + + 0.05 + + + 0.35 + + + 0.35 + + + + + private:resource/pane/Presenter/Pane4 + + + private:resource/view/Presenter/ToolBar + + + 0.60 + + + 0.45 + + + 0.25 + + + 0.1 + + + + + private:resource/pane/Presenter/Pane3 + + + private:resource/view/Presenter/Notes + + + 0.05 + + + 0.60 + + + 0.9 + + + 0.35 + + + + + private:resource/pane/Presenter/Overlay + + + private:resource/view/Presenter/SlideSorter + + + 0.05 + + + 0.05 + + + 0.95 + + + 0.8 + + + + + private:resource/pane/Presenter/Pane6 + + + private:resource/view/Presenter/Help + + + 0.05 + + + 0.05 + + + 0.95 + + + 0.8 + + + + + + + + + Presenter Console + + + + + Current Slide Info + + + + + Presenter Notes + + + + + diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk index f0efa832bac2..aa97150ead4a 100644 --- a/officecfg/registry/data/org/openoffice/Office/makefile.mk +++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk @@ -41,24 +41,25 @@ XCUFILES= \ Embedding.xcu \ ExtensionDependencies.xcu \ ExtensionManager.xcu \ + FormWizard.xcu \ + Histories.xcu \ Impress.xcu \ Jobs.xcu \ Labels.xcu \ Linguistic.xcu \ Logging.xcu \ Math.xcu \ + Paths.xcu \ + PresenterScreen.xcu \ ProtocolHandler.xcu \ - Security.xcu \ - Scripting.xcu \ SFX.xcu \ + Scripting.xcu \ + Security.xcu \ TableWizard.xcu \ UI.xcu \ Views.xcu \ WebWizard.xcu \ - FormWizard.xcu \ Writer.xcu \ - Paths.xcu \ - Histories.xcu MODULEFILES= \ Accelerators-macosx.xcu \ diff --git a/officecfg/registry/data/org/openoffice/makefile.mk b/officecfg/registry/data/org/openoffice/makefile.mk index 913dec2c988b..11b08571aa4e 100755 --- a/officecfg/registry/data/org/openoffice/makefile.mk +++ b/officecfg/registry/data/org/openoffice/makefile.mk @@ -32,13 +32,14 @@ PACKAGE=org.openoffice # --- Targets ------------------------------------------------------ XCUFILES= \ + FirstStartWizard.xcu \ Inet.xcu \ + Interaction.xcu \ Setup.xcu \ System.xcu \ - VCL.xcu \ - FirstStartWizard.xcu \ UserProfile.xcu \ - Interaction.xcu + VCL.xcu \ + MODULEFILES= \ Inet-macosx.xcu \ diff --git a/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs new file mode 100644 index 000000000000..9eef7c543ba6 --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs @@ -0,0 +1,470 @@ + + + + + + + AF + Configuration of the Presenter Screen extension. + + + + + Describes one bitmap that can be used as button icon or to paint + a pane border. + + Name of the bitmap. Used to look-up the bitmap in a container. + + + Text that is displayed together with the icon. + + + Relative file name to the bitmap for the normal icon. + + + Relative file name to the bitmap for the mouse over icon. + + + Relative file name to the bitmap for the button down icon. + + + Relative file name to the bitmap for the icon in disabled state. + + + Relative file name to the bitmap for the icon in disabled state. + + + The file name of the mask bitmap. Use red for pixel outside of + the border and blue for inside pixels. + + + + Horizontal offset to move the bitmap just outside the + window border. + 0 + + + Vertical offset to move the bitmap just outside the + window border. + 0 + + + Horizontal position of a hot spot. + + + Vertical position of a hot spot. + + + Color that is used as replacement for the bitmap when the later + can for some reason not be used. + + + Horizontal texturing mode. + + + Show texture only once + + + Repeat the texture + + + Stretch the texture to cover the paint area + + + + + Vertical texturing mode. + + + Show texture only once + + + Repeat the texture + + + Stretch the texture to cover the paint area + + + Once + + + + Four values describing the sizes of a border around a + rectangular area. + + Left border size. + + + Top border size. + + + Right border size. + + + Bottom border size. + + + + Font description. + + The name of the font family. + + + Font size. + + + Something like "Bold" or "Italic" or "Bold Italic". + + + Font color. + + + Orientation of text. Can be left, right, or centered. + + + Flush left + + + Flush right + + + Centered + + + + + Horizontal offset in relation to the anchor point. + + + Vertical offset in relation to the anchor point. + + + + Describes a ToolBar. + + Font used for displaying the text. + + + The icon to display. + + + The text to display. + + + Action to execute when a button is triggered. + + + + Describes a ToolBar entry. + + Name of the entry. May be used to have mode dependant entries. + + + Type of the entry. Examples are "Label" and "Button". + + + Description of a tool bar entry in normal mode (not selected, not mouse over) + + + Description of a tool bar entry when the mouse is over it. + + + Description of a tool bar entry when it is selected. + + + Description of a tool bar entry when it is disabled. + + + + Definition of one tool bar. + + Entries of the tool bars. + + + + Describes a Button. + + Name of the button that is used to look up the button. + + + Font used for displaying the text. + + + The icon to display. + + + The text to display. + + + Action to execute when a button is triggered. + + + + Describes a Help entry. + + Typically a list of keyboard key names. + + + Typically a description of the action triggered by pressing the keys on the left. + + + + Visual properties of a pane style: + the border of a pane and its title font. + + Name of the style. Used for referencing the style. + Has to be unique among pane styles and view styles + in one theme. + + + Name of the parent style. Values not supplied in this style + are taken from the parent style. Empty string or missing + mean no parent. + + + + Font used for displaying the pane title. + + + Size of the inner part of the border. + + + Size of the outer part of the border. + + + Bitmaps that are used to paint the borders of + a pane. + + + + Visual properties of a view style: + font and backround color. + + Name of the style. Used for referencing the style. + Has to be unique among pane styles and view styles + in one theme. + + + Name of the parent style. Values not supplied in this style + are taken from the parent style. Empty string or missing + mean no parent. + + + + Font used for text display inside a view. + + + Color (or bitmap) that is used to paint the + background of a view. + + + + Association of a drawing framework resource to a + style of the presenter theme. + + URL of a drawing framework resource. + + + Name of a pane style or a view style. + + + + A Presenter string + + The localized string. + + + + Association of a drawing framework resource to a + style of the presenter theme. + + URL of a drawing framework view. + + + Name of a view style. + + + Title displayed for the component. An empty or missing + title means that no title is displayed. + + + + Title displayed for the component when accessibility support is active. + An empty or missing title means that no title is displayed. + + + + When the value is false then the background is painted before the + view is painted. + false + + + List of localizable strings used by the view. + + + + Visual properties of the presenter view. The values in a theme + are hints and can be ignored. + + Name of the theme. Used for referencing the theme. + Has to be unique among all themes. The name of the + default theme is 'DefaultTheme' + + + Name of the parent theme. Values not supplied in this theme + are taken from the parent theme. Empty string or missing + 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. + + + List of pane styles. + + + List of view styles. + + + List of style associations. + + + List of additional bitmaps for example for buttons. + + + List of additional fonts. + + + + Layout of a component of the presenter screen. + + URL of a pane resource. + + + URL of a view resource that is to be displayed in + the pane. + + + Relative x position in the range of [0,1]. + + + Relative y position in the range of [0,1]. + + + Relative width in the range of [0,1]. + + + Relative height in the range of [0,1]. + + + + Layout of all components of the presenter screen. + + Name of the layout. Used for referencing the layout. + Has to be unique among all presenter layouts. + + + Name of the parent layout. Values not supplied in this layout + are taken from the parent layout. Missing or empty string + mean no parent layout. + + + + List of component layouts. + + + + + + Settings regarding controls that are only used by the Presenter + Screen. + + Set of tool bars. + + + Set of buttons. + + + Settings of scroll bars. + + Bitmaps of icons used for displaying the scroll bar. + + + + Settings of the slide sorter of the presenter screen. + + Size of the border around the current slide. + + + Bitmaps that are used to paint the border around the current + slide. + + + + Settings of help view. + + List of entries displayed in the help view. + + + + + General properties of the presenter view. + + When true then presenter screen is displayed on single screen systems + or when fullscreen presentation spans all screens. + false + + + List of available themes. + + + Name of the current theme. An empty name or the string "DefaultTheme" + specify the default theme. + DefaultTheme + + + Description of the views. + + + List of visible presenter components. + + + Name of the current layout. An empty name or the + string "DefaultLayout" specify the default layout. + DefaultLayout + + + Strings that are used make the presenter console accessible. + + + The view mode on start up of the extension. Valid values are 0 for the Preview-only mode, 1 for the notes view, 2 for the slide overview. + 0 + + + + diff --git a/officecfg/registry/schema/org/openoffice/Office/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/makefile.mk index bfdda65b88ec..2f5a0de341d2 100644 --- a/officecfg/registry/schema/org/openoffice/Office/makefile.mk +++ b/officecfg/registry/schema/org/openoffice/Office/makefile.mk @@ -43,10 +43,13 @@ XCSFILES= \ Compatibility.xcs \ DataAccess.xcs \ Draw.xcs \ - Events.xcs \ Embedding.xcs \ + Events.xcs \ + ExtendedColorScheme.xcs \ ExtensionDependencies.xcs \ ExtensionManager.xcs \ + FormWizard.xcs \ + Histories.xcs \ Impress.xcs \ Java.xcs \ Jobs.xcs \ @@ -54,26 +57,24 @@ XCSFILES= \ Linguistic.xcs \ Logging.xcs \ Math.xcs \ + OOoImprovement.xcs \ OptionsDialog.xcs \ + Paths.xcs \ + PresenterScreen.xcs \ ProtocolHandler.xcs \ + Recovery.xcs \ SFX.xcs \ + Scripting.xcs \ + Security.xcs \ Substitution.xcs \ + TabBrowse.xcs \ TableWizard.xcs \ + TypeDetection.xcs \ UI.xcs \ Views.xcs \ + WebWizard.xcs \ Writer.xcs \ WriterWeb.xcs \ - Scripting.xcs \ - Security.xcs \ - WebWizard.xcs \ - Recovery.xcs \ - FormWizard.xcs \ - ExtendedColorScheme.xcs \ - TypeDetection.xcs \ - TabBrowse.xcs \ - Paths.xcs \ - Histories.xcs \ - OOoImprovement.xcs .INCLUDE : target.mk diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index a915c5f1ab21..fe244c7d15cb 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -175,7 +175,8 @@ my_components = \ xmx \ xsltdlg \ xstor \ - PresentationMinimizer + PresentationMinimizer \ + PresenterScreen .IF "$(OS)" == "MACOSX" my_components += component/vcl/vcl.macosx diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 07d41cf7a598..3241f7fb80ba 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -121,6 +121,10 @@ MY_FILES_impress = \ $(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/Jobs-presenterscreen.xcu \ + $(MY_MOD)/org/openoffice/Office/ProtocolHandler/ProtocolHandler-presenterscreen.xcu \ + $(MY_XCS)/Office/PresenterScreen.xcs \ + $(MY_XCU)/Office/PresenterScreen.xcu \ $(MY_MOD)/org/openoffice/Setup-impress.xcu MY_FILES_korea = \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 86549930b414..274b29882df5 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1350,6 +1350,19 @@ File gid_File_Lib_PresentationMinimizer #endif End +File gid_File_Lib_PresenterScreen + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef UNX + Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX)); + #elif defined OS2 + Name = "PresenterScreen.dll"; + #else + Name = "PresenterScreen.uno.dll"; + #endif +End + File gid_File_Lib_Sdbc_2 TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index b020a7f0a9e5..d2acefc802db 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -339,6 +339,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Fastsax_Uno, gid_File_Lib_Slideshow, gid_File_Lib_PresentationMinimizer + gid_File_Lib_PresenterScreen gid_File_Lib_Recentfile, gid_File_Lib_Scriptframe, gid_File_Lib_Sdbc_2, diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 9f2319d395cd..ca2baa7ff131 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -35,6 +35,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -263,18 +264,17 @@ Reference SAL_CALL PresenterHelper::loadBitmap ( if (pCanvas.get()!=NULL && rsURL.getLength()>0 && mpGraphicFilter.get()!=NULL) { - Graphic aGraphic; - OUString sFileName; - if (osl::FileBase::getSystemPathFromFileURL(rsURL, sFileName) - == osl::FileBase::E_None) + sal_Int32 nIndex = 0; + if( rsURL.getToken( 0, '/', nIndex ).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "private:graphicrepository" ) ) ) { - if (mpGraphicFilter->ImportGraphic(aGraphic, rsURL) == GRFILTER_OK) - { - BitmapEx aBitmapEx (aGraphic.GetBitmapEx()); + OUString sPathName( rsURL.copy( nIndex ) ); + BitmapEx aBitmap; + if ( ::vcl::ImageRepository::loadImage( sPathName, aBitmap, false ) + && !aBitmap.IsEmpty() ) return cppcanvas::VCLFactory::getInstance().createBitmap( pCanvas, - aBitmapEx)->getUNOBitmap(); - } + aBitmap)->getUNOBitmap(); } } diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst index 29350f7ca526..bf319f0a961b 100644 --- a/sdext/prj/build.lst +++ b/sdext/prj/build.lst @@ -2,9 +2,7 @@ dx sdext : L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhel dx sdext usr1 - all sdext_mkout NULL dx sdext\prj get - all sdext_prj NULL dx sdext\source\minimizer nmake - all sdext_minimizer sdext_inc NULL -dx sdext\source\presenter\registry\data\org\openoffice\Office\extension nmake - all sdext_presenter_xcu NULL -dx sdext\source\presenter\help\en-US\com.sun.PresenterScreen nmake - all sdext_presenter_help NULL -dx sdext\source\presenter nmake - all sdext_presenter sdext_inc sdext_presenter_xcu sdext_presenter_help NULL +dx sdext\source\presenter nmake - all sdext_presenter sdext_inc NULL dx sdext\inc nmake - all sdext_inc NULL dx sdext\source\pdfimport\xpdfwrapper nmake - all dx_xpdfwrap NULL dx sdext\source\pdfimport\xpdftest nmake - all dx_parsetest dx_xpdfwrap NULL diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst index aacc8a5d041a..bd865bf962a0 100644 --- a/sdext/prj/d.lst +++ b/sdext/prj/d.lst @@ -1,10 +1,7 @@ -mkdir: %_DEST%\bin%_EXT%\presenter mkdir: %_DEST%\bin%_EXT%\pdfimport ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.* ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.* ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt -..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt -..\%__SRC%\bin\presenter-screen_develop.zip %_DEST%\bin%_EXT%\presenter\presenter-screen_develop.zip @@ -17,14 +14,18 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool mkdir: %_DEST%\xml%_EXT%\registry\spool\org mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office -mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Addons +mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\ProtocolHandler -..\%__SRC%\misc\registry\spool\org\openoffice\Office\Addons\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Addons +..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs ..\%__SRC%\misc\registry\spool\org\openoffice\Office\ProtocolHandler\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\ProtocolHandler mkdir: %_DEST%\xml%_EXT% ..\%__SRC%\misc\PresentationMinimizer.component %_DEST%\xml%_EXT%\PresentationMinimizer.component +..\%__SRC%\misc\PresenterScreen.component %_DEST%\xml%_EXT%\PresenterScreen.component ..\%__SRC%\bin\PresentationMinimizer*.dll %_DEST%\bin%_EXT%\PresentationMinimizer*.dll ..\%__SRC%\lib\PresentationMinimizer*.so %_DEST%\lib%_EXT% +..\%__SRC%\bin\PresenterScreen*.dll %_DEST%\bin%_EXT%\PresenterScreen*.dll +..\%__SRC%\lib\PresenterScreen*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib diff --git a/sdext/source/presenter/Jobs.xcu b/sdext/source/presenter/Jobs.xcu new file mode 100644 index 000000000000..99c830bc53cc --- /dev/null +++ b/sdext/source/presenter/Jobs.xcu @@ -0,0 +1,41 @@ + + + + + + + + com.sun.star.comp.Draw.framework.PresenterScreenJob + + + com.sun.star.presentation.PresentationDocument + + + + + + + + + + + diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 0912d78066b0..25a70c92427a 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -462,7 +462,7 @@ public: OUString sName (A2S("Presenter Console")); PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Console/String")) >>= sName; @@ -495,7 +495,7 @@ public: { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String")) >>= sName; @@ -2249,7 +2249,7 @@ rtl::Reference AccessibleNotes::Create ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/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 4a21ed302e8c..239260275732 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -25,7 +25,6 @@ #include "precompiled_sdext.hxx" #include "PresenterBitmapContainer.hxx" -#include "PresenterComponent.hxx" #include "PresenterConfigurationAccess.hxx" #include @@ -69,11 +68,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) { @@ -82,7 +79,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), @@ -100,11 +97,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) { @@ -193,7 +188,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) { @@ -210,7 +204,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( pBitmap = LoadBitmap( xBitmapProperties, rxPresenterHelper, - rsBasePath, rxCanvas, rpDefault); } @@ -237,7 +230,6 @@ void PresenterBitmapContainer::ProcessBitmap ( maIconContainer[sName] = LoadBitmap( rxProperties, mxPresenterHelper, - msBasePath, mxCanvas, SharedBitmapDescriptor()); } @@ -248,7 +240,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) { @@ -268,7 +259,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::Normal, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -277,7 +268,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::MouseOver, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -286,7 +277,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::ButtonDown, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -295,7 +286,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::Disabled, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -304,7 +295,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 e5c1e8ee35f5..afc3aa79c50c 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -103,14 +103,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); @@ -125,7 +123,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); @@ -133,7 +130,6 @@ private: ::boost::shared_ptr mpParentContainer; typedef ::std::map > BitmapContainer; BitmapContainer maIconContainer; - ::rtl::OUString msBasePath; css::uno::Reference mxCanvas; css::uno::Reference mxPresenterHelper; @@ -145,7 +141,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/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx index eecc80b1e2cc..7e0cfaf90153 100644 --- a/sdext/source/presenter/PresenterClock.cxx +++ b/sdext/source/presenter/PresenterClock.cxx @@ -25,7 +25,6 @@ #include "precompiled_sdext.hxx" #include "PresenterClock.hxx" -#include "PresenterComponent.hxx" #include "PresenterConfigurationAccess.hxx" #include "PresenterGeometryHelper.hxx" #include @@ -202,7 +201,6 @@ namespace { void LoadBitmap ( const OUString& rsKey, const ::std::vector& rValues, - const OUString& rsBitmapPath, const Reference& rxBitmapLoader); void ScaleBitmaps (void); }; @@ -1036,7 +1034,7 @@ void AnalogBitmapPainter::PrepareBitmaps (const Reference& r // Get access to the clock bitmaps in the configuration. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"), + OUString::createFromAscii("org.openoffice.Office.PresenterScreen"), PresenterConfigurationAccess::READ_ONLY); Reference xTheme (GetTheme(aConfiguration)); @@ -1118,17 +1116,6 @@ void AnalogBitmapPainter::LoadBitmaps ( const Reference& rxCanvas) { (void)rConfiguration; - - // Get base path to bitmaps. - Reference xInformationProvider ( - mxComponentContext->getValueByName(OUString::createFromAscii( - "/singletons/com.sun.star.deployment.PackageInformationProvider")), - UNO_QUERY); - OUString sLocation; - if (xInformationProvider.is()) - sLocation = xInformationProvider->getPackageLocation(gsExtensionIdentifier); - sLocation += OUString::createFromAscii("/"); - // Create the bitmap loader. Reference xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY); @@ -1161,7 +1148,6 @@ void AnalogBitmapPainter::LoadBitmaps ( this, _1, _2, - sLocation, xBitmapLoader)); } @@ -1171,7 +1157,6 @@ void AnalogBitmapPainter::LoadBitmaps ( void AnalogBitmapPainter::LoadBitmap ( const OUString& rsKey, const ::std::vector& rValues, - const OUString& rsBitmapPath, const Reference& rxBitmapLoader) { if (rValues.size() == 3) @@ -1195,7 +1180,7 @@ void AnalogBitmapPainter::LoadBitmap ( rValues[2] >>= pDescriptor->maOffset.Y; pDescriptor->mxBitmap = Reference( - rxBitmapLoader->getByName(rsBitmapPath+sFileName), UNO_QUERY); + rxBitmapLoader->getByName(sFileName), UNO_QUERY); if ( ! pDescriptor->mxBitmap.is()) mbThemeLoadingFailed = true; diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx deleted file mode 100644 index 3302ab63f047..000000000000 --- a/sdext/source/presenter/PresenterComponent.cxx +++ /dev/null @@ -1,146 +0,0 @@ -/************************************************************** - * - * 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 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - - - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sdext.hxx" - -#include "PresenterComponent.hxx" -#include "cppuhelper/factory.hxx" -#include "cppuhelper/implementationentry.hxx" -#include -#include - -#include "PresenterExtensionIdentifier.hxx" -#include "PresenterProtocolHandler.hxx" -#include "PresenterScreen.hxx" - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace cppu; -using namespace osl; -using ::rtl::OUString; - - - -namespace sdext { namespace presenter { - -static OUString gsBasePath; - -::rtl::OUString PresenterComponent::GetBasePath ( - const Reference& rxComponentContext) -{ - return GetBasePath(rxComponentContext, gsExtensionIdentifier); -} - - - - -::rtl::OUString PresenterComponent::GetBasePath ( - const Reference& rxComponentContext, - const OUString& rsExtensionIdentifier) -{ - if (gsBasePath.getLength() == 0) - { - // 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 - { - gsBasePath = xInformationProvider->getPackageLocation(rsExtensionIdentifier) - + OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - } - catch(deployment::DeploymentException&) - { - } - } - } - - return gsBasePath; -} - - - -rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; - -static struct ImplementationEntry gServiceEntries[] = -{ - { - PresenterProtocolHandler::Create, - PresenterProtocolHandler::getImplementationName_static, - PresenterProtocolHandler::getSupportedServiceNames_static, - createSingleComponentFactory, &g_moduleCount.modCnt, 0 - }, - { - PresenterScreenJob::Create, - PresenterScreenJob::getImplementationName_static, - PresenterScreenJob::getSupportedServiceNames_static, - createSingleComponentFactory, 0, 0 - }, - { 0, 0, 0, 0, 0, 0 } -}; - - - - -extern "C" -{ - sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) - { - return g_moduleCount.canUnload( &g_moduleCount , pTime ); - } - - - - - void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) - { - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - - - - - sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) - { - return component_writeInfoHelper(pServiceManager, pRegistryKey, gServiceEntries); - } - - - - - void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) - { - return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries); - } - -} - -} } // end of namespace sdext::presenter diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx deleted file mode 100644 index 059f4ad497b9..000000000000 --- a/sdext/source/presenter/PresenterComponent.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/************************************************************** - * - * 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 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - - - -#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 diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index eb727f6f2aa8..1ee457415acf 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -40,7 +40,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.txx b/sdext/source/presenter/PresenterExtensionIdentifier.txx deleted file mode 100644 index 875782970951..000000000000 --- a/sdext/source/presenter/PresenterExtensionIdentifier.txx +++ /dev/null @@ -1,37 +0,0 @@ -/************************************************************** - * - * 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 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - - - -#ifndef SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX -#define SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX - -namespace sdext { namespace presenter { - -/** The UPDATE_IDENTIFIER part of the string below is replaced by the - makefile.mk with the actual, platform specific, extension identifier. -*/ -const ::rtl::OUString PresenterComponent::gsExtensionIdentifier( - ::rtl::OUString::createFromAscii("com.sun.PresenterScreen-UPDATED_PLATFORM")); - -} } - -#endif diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index fd50f060973a..d9608ccd8882 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -385,7 +385,7 @@ void PresenterHelpView::ReadHelpStrings (void) mpTextContainer.reset(new TextContainer()); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference xStrings ( aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")), diff --git a/sdext/source/presenter/PresenterScreen.component b/sdext/source/presenter/PresenterScreen.component new file mode 100644 index 000000000000..ce058818c6fd --- /dev/null +++ b/sdext/source/presenter/PresenterScreen.component @@ -0,0 +1,30 @@ + + + + + + + + + + diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 602ad6436446..ebdd2daf53e9 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -541,7 +541,7 @@ sal_Int32 PresenterScreen::GetScreenNumber ( // is set. PresenterConfigurationAccess aConfiguration ( xContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); bool bStartAlways (false); if (aConfiguration.GetConfigurationNode( @@ -704,7 +704,7 @@ void PresenterScreen::SetupConfiguration ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"), + OUString::createFromAscii("org.openoffice.Office.PresenterScreen"), PresenterConfigurationAccess::READ_ONLY); maViewDescriptors.clear(); ProcessViewDescriptions(aConfiguration); diff --git a/sdext/source/presenter/PresenterScreen.hrc b/sdext/source/presenter/PresenterScreen.hrc new file mode 100644 index 000000000000..e2b53d2544bf --- /dev/null +++ b/sdext/source/presenter/PresenterScreen.hrc @@ -0,0 +1,113 @@ +/************************************************************** + * + * 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 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + +#define SDEXT_PRESENTER_RES_START 255 + +#define BACKGROUND SDEXT_PRESENTER_RES_START + 1 +#define BORDERACTIVEBOTTOM SDEXT_PRESENTER_RES_START + 2 +#define BORDERACTIVEBOTTOMCALLOUT SDEXT_PRESENTER_RES_START + 3 +#define BORDERACTIVEBOTTOMLEFT SDEXT_PRESENTER_RES_START + 4 +#define BORDERACTIVEBOTTOMRIGHT SDEXT_PRESENTER_RES_START + 5 +#define BORDERACTIVELEFT SDEXT_PRESENTER_RES_START + 6 +#define BORDERACTIVERIGHT SDEXT_PRESENTER_RES_START + 7 +#define BORDERACTIVETOP SDEXT_PRESENTER_RES_START + 8 +#define BORDERACTIVETOPLEFT SDEXT_PRESENTER_RES_START + 9 +#define BORDERACTIVETOPRIGHT SDEXT_PRESENTER_RES_START + 10 +#define BORDERBOTTOM SDEXT_PRESENTER_RES_START + 11 +#define BORDERBOTTOMLEFT SDEXT_PRESENTER_RES_START + 12 +#define BORDERBOTTOMRIGHT SDEXT_PRESENTER_RES_START + 13 +#define BORDERCURRENTSLIDEBOTTOM SDEXT_PRESENTER_RES_START + 14 +#define BORDERCURRENTSLIDEBOTTOMLEFT SDEXT_PRESENTER_RES_START + 15 +#define BORDERCURRENTSLIDEBOTTOMRIGHT SDEXT_PRESENTER_RES_START + 16 +#define BORDERCURRENTSLIDELEFT SDEXT_PRESENTER_RES_START + 17 +#define BORDERCURRENTSLIDERIGHT SDEXT_PRESENTER_RES_START + 18 +#define BORDERCURRENTSLIDETOP SDEXT_PRESENTER_RES_START + 19 +#define BORDERCURRENTSLIDETOPLEFT SDEXT_PRESENTER_RES_START + 20 +#define BORDERCURRENTSLIDETOPRIGHT SDEXT_PRESENTER_RES_START + 21 +#define BORDERLEFT SDEXT_PRESENTER_RES_START + 22 +#define BORDERRIGHT SDEXT_PRESENTER_RES_START + 23 +#define BORDERTOOLBARBOTTOM SDEXT_PRESENTER_RES_START + 24 +#define BORDERTOOLBARLEFT SDEXT_PRESENTER_RES_START + 25 +#define BORDERTOOLBARRIGHT SDEXT_PRESENTER_RES_START + 26 +#define BORDERTOOLBARTOP SDEXT_PRESENTER_RES_START + 27 +#define BORDERTOOLBARTOPLEFT SDEXT_PRESENTER_RES_START + 28 +#define BORDERTOOLBARTOPRIGHT SDEXT_PRESENTER_RES_START + 29 +#define BORDERTOP SDEXT_PRESENTER_RES_START + 30 +#define BORDERTOPLEFT SDEXT_PRESENTER_RES_START + 31 +#define BORDERTOPRIGHT SDEXT_PRESENTER_RES_START + 32 +#define BUTTONEFFECTNEXTDISABLED SDEXT_PRESENTER_RES_START + 33 +#define BUTTONEFFECTNEXTMOUSEOVER SDEXT_PRESENTER_RES_START + 34 +#define BUTTONEFFECTNEXTNORMAL SDEXT_PRESENTER_RES_START + 35 +#define BUTTONEFFECTNEXTSELECTED SDEXT_PRESENTER_RES_START + 36 +#define BUTTONFRAMECENTERMOUSEOVER SDEXT_PRESENTER_RES_START + 37 +#define BUTTONFRAMECENTERNORMAL SDEXT_PRESENTER_RES_START + 38 +#define BUTTONFRAMELEFTMOUSEOVER SDEXT_PRESENTER_RES_START + 39 +#define BUTTONFRAMELEFTNORMAL SDEXT_PRESENTER_RES_START + 40 +#define BUTTONFRAMERIGHTMOUSEOVER SDEXT_PRESENTER_RES_START + 41 +#define BUTTONFRAMERIGHTNORMAL SDEXT_PRESENTER_RES_START + 42 +#define BUTTONHELPDISABLED SDEXT_PRESENTER_RES_START + 43 +#define BUTTONHELPMOUSEOVER SDEXT_PRESENTER_RES_START + 44 +#define BUTTONHELPNORMAL SDEXT_PRESENTER_RES_START + 45 +#define BUTTONHELPSELECTED SDEXT_PRESENTER_RES_START + 46 +#define BUTTONMINUSDISABLED SDEXT_PRESENTER_RES_START + 47 +#define BUTTONMINUSMOUSEOVER SDEXT_PRESENTER_RES_START + 48 +#define BUTTONMINUSNORMAL SDEXT_PRESENTER_RES_START + 49 +#define BUTTONMINUSSELECTED SDEXT_PRESENTER_RES_START + 50 +#define BUTTONNOTESDISABLED SDEXT_PRESENTER_RES_START + 51 +#define BUTTONNOTESMOUSEOVER SDEXT_PRESENTER_RES_START + 52 +#define BUTTONNOTESNORMAL SDEXT_PRESENTER_RES_START + 53 +#define BUTTONNOTESSELECTED SDEXT_PRESENTER_RES_START + 54 +#define BUTTONPLUSDISABLED SDEXT_PRESENTER_RES_START + 55 +#define BUTTONPLUSMOUSEOVER SDEXT_PRESENTER_RES_START + 56 +#define BUTTONPLUSNORMAL SDEXT_PRESENTER_RES_START + 57 +#define BUTTONPLUSSELECTED SDEXT_PRESENTER_RES_START + 58 +#define BUTTONSLIDENEXTDISABLED SDEXT_PRESENTER_RES_START + 59 +#define BUTTONSLIDENEXTMOUSEOVER SDEXT_PRESENTER_RES_START + 60 +#define BUTTONSLIDENEXTNORMAL SDEXT_PRESENTER_RES_START + 61 +#define BUTTONSLIDEPREVIOUSDISABLED SDEXT_PRESENTER_RES_START + 62 +#define BUTTONSLIDEPREVIOUSMOUSEOVER SDEXT_PRESENTER_RES_START + 63 +#define BUTTONSLIDEPREVIOUSNORMAL SDEXT_PRESENTER_RES_START + 64 +#define BUTTONSLIDEPREVIOUSSELECTED SDEXT_PRESENTER_RES_START + 65 +#define BUTTONSLIDESORTERDISABLED SDEXT_PRESENTER_RES_START + 66 +#define BUTTONSLIDESORTERMOUSEOVER SDEXT_PRESENTER_RES_START + 67 +#define BUTTONSLIDESORTERNORMAL SDEXT_PRESENTER_RES_START + 68 +#define BUTTONSLIDESORTERSELECTED SDEXT_PRESENTER_RES_START + 69 +#define LABELMOUSEOVERCENTER SDEXT_PRESENTER_RES_START + 70 +#define LABELMOUSEOVERLEFT SDEXT_PRESENTER_RES_START + 71 +#define LABELMOUSEOVERRIGHT SDEXT_PRESENTER_RES_START + 72 +#define SCROLLBARARROWDOWNDISABLED SDEXT_PRESENTER_RES_START + 73 +#define SCROLLBARARROWDOWNMOUSEOVER SDEXT_PRESENTER_RES_START + 74 +#define SCROLLBARARROWDOWNNORMAL SDEXT_PRESENTER_RES_START + 75 +#define SCROLLBARARROWDOWNSELECTED SDEXT_PRESENTER_RES_START + 76 +#define SCROLLBARARROWUPDISABLED SDEXT_PRESENTER_RES_START + 77 +#define SCROLLBARARROWUPMOUSEOVER SDEXT_PRESENTER_RES_START + 78 +#define SCROLLBARARROWUPNORMAL SDEXT_PRESENTER_RES_START + 79 +#define SCROLLBARARROWUPSELECTED SDEXT_PRESENTER_RES_START + 80 +#define SCROLLBARPAGERMIDDLEMOUSEOVER SDEXT_PRESENTER_RES_START + 81 +#define SCROLLBARPAGERMIDDLENORMAL SDEXT_PRESENTER_RES_START + 82 +#define SCROLLBARTHUMBBOTTOMMOUSEOVER SDEXT_PRESENTER_RES_START + 83 +#define SCROLLBARTHUMBBOTTOMNORMAL SDEXT_PRESENTER_RES_START + 84 +#define SCROLLBARTHUMBMIDDLEMOUSEOVER SDEXT_PRESENTER_RES_START + 85 +#define SCROLLBARTHUMBMIDDLENORMAL SDEXT_PRESENTER_RES_START + 86 +#define SCROLLBARTHUMBTOPMOUSEOVER SDEXT_PRESENTER_RES_START + 87 +#define SCROLLBARTHUMBTOPNORMAL SDEXT_PRESENTER_RES_START + 88 +#define VIEWBACKGROUND SDEXT_PRESENTER_RES_START + 89 + diff --git a/sdext/source/presenter/PresenterScreen.src b/sdext/source/presenter/PresenterScreen.src new file mode 100644 index 000000000000..f5129bf0a7f2 --- /dev/null +++ b/sdext/source/presenter/PresenterScreen.src @@ -0,0 +1,113 @@ +/************************************************************** + * + * 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 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + +#include "PresenterScreen.hrc" + +Bitmap BACKGROUND{ File = "presenter/Background.png"; }; +Bitmap BORDERACTIVEBOTTOM{ File = "presenter/BorderActiveBottom.png"; }; +Bitmap BORDERACTIVEBOTTOMCALLOUT{ File = "presenter/BorderActiveBottomCallout.png"; }; +Bitmap BORDERACTIVEBOTTOMLEFT{ File = "presenter/BorderActiveBottomLeft.png"; }; +Bitmap BORDERACTIVEBOTTOMRIGHT{ File = "presenter/BorderActiveBottomRight.png"; }; +Bitmap BORDERACTIVELEFT{ File = "presenter/BorderActiveLeft.png"; }; +Bitmap BORDERACTIVERIGHT{ File = "presenter/BorderActiveRight.png"; }; +Bitmap BORDERACTIVETOP{ File = "presenter/BorderActiveTop.png"; }; +Bitmap BORDERACTIVETOPLEFT{ File = "presenter/BorderActiveTopLeft.png"; }; +Bitmap BORDERACTIVETOPRIGHT{ File = "presenter/BorderActiveTopRight.png"; }; +Bitmap BORDERBOTTOM{ File = "presenter/BorderBottom.png"; }; +Bitmap BORDERBOTTOMLEFT{ File = "presenter/BorderBottomLeft.png"; }; +Bitmap BORDERBOTTOMRIGHT{ File = "presenter/BorderBottomRight.png"; }; +Bitmap BORDERCURRENTSLIDEBOTTOM{ File = "presenter/BorderCurrentSlideBottom.png"; }; +Bitmap BORDERCURRENTSLIDEBOTTOMLEFT{ File = "presenter/BorderCurrentSlideBottomLeft.png"; }; +Bitmap BORDERCURRENTSLIDEBOTTOMRIGHT{ File = "presenter/BorderCurrentSlideBottomRight.png"; }; +Bitmap BORDERCURRENTSLIDELEFT{ File = "presenter/BorderCurrentSlideLeft.png"; }; +Bitmap BORDERCURRENTSLIDERIGHT{ File = "presenter/BorderCurrentSlideRight.png"; }; +Bitmap BORDERCURRENTSLIDETOP{ File = "presenter/BorderCurrentSlideTop.png"; }; +Bitmap BORDERCURRENTSLIDETOPLEFT{ File = "presenter/BorderCurrentSlideTopLeft.png"; }; +Bitmap BORDERCURRENTSLIDETOPRIGHT{ File = "presenter/BorderCurrentSlideTopRight.png"; }; +Bitmap BORDERLEFT{ File = "presenter/BorderLeft.png"; }; +Bitmap BORDERRIGHT{ File = "presenter/BorderRight.png"; }; +Bitmap BORDERTOOLBARBOTTOM{ File = "presenter/BorderToolbarBottom.png"; }; +Bitmap BORDERTOOLBARLEFT{ File = "presenter/BorderToolbarLeft.png"; }; +Bitmap BORDERTOOLBARRIGHT{ File = "presenter/BorderToolbarRight.png"; }; +Bitmap BORDERTOOLBARTOP{ File = "presenter/BorderToolbarTop.png"; }; +Bitmap BORDERTOOLBARTOPLEFT{ File = "presenter/BorderToolbarTopLeft.png"; }; +Bitmap BORDERTOOLBARTOPRIGHT{ File = "presenter/BorderToolbarTopRight.png"; }; +Bitmap BORDERTOP{ File = "presenter/BorderTop.png"; }; +Bitmap BORDERTOPLEFT{ File = "presenter/BorderTopLeft.png"; }; +Bitmap BORDERTOPRIGHT{ File = "presenter/BorderTopRight.png"; }; +Bitmap BUTTONEFFECTNEXTDISABLED{ File = "presenter/ButtonEffectNextDisabled.png"; }; +Bitmap BUTTONEFFECTNEXTMOUSEOVER{ File = "presenter/ButtonEffectNextMouseOver.png"; }; +Bitmap BUTTONEFFECTNEXTNORMAL{ File = "presenter/ButtonEffectNextNormal.png"; }; +Bitmap BUTTONEFFECTNEXTSELECTED{ File = "presenter/ButtonEffectNextSelected.png"; }; +Bitmap BUTTONFRAMECENTERMOUSEOVER{ File = "presenter/ButtonFrameCenterMouseOver.png"; }; +Bitmap BUTTONFRAMECENTERNORMAL{ File = "presenter/ButtonFrameCenterNormal.png"; }; +Bitmap BUTTONFRAMELEFTMOUSEOVER{ File = "presenter/ButtonFrameLeftMouseOver.png"; }; +Bitmap BUTTONFRAMELEFTNORMAL{ File = "presenter/ButtonFrameLeftNormal.png"; }; +Bitmap BUTTONFRAMERIGHTMOUSEOVER{ File = "presenter/ButtonFrameRightMouseOver.png"; }; +Bitmap BUTTONFRAMERIGHTNORMAL{ File = "presenter/ButtonFrameRightNormal.png"; }; +Bitmap BUTTONHELPDISABLED{ File = "presenter/ButtonHelpDisabled.png"; }; +Bitmap BUTTONHELPMOUSEOVER{ File = "presenter/ButtonHelpMouseOver.png"; }; +Bitmap BUTTONHELPNORMAL{ File = "presenter/ButtonHelpNormal.png"; }; +Bitmap BUTTONHELPSELECTED{ File = "presenter/ButtonHelpSelected.png"; }; +Bitmap BUTTONMINUSDISABLED{ File = "presenter/ButtonMinusDisabled.png"; }; +Bitmap BUTTONMINUSMOUSEOVER{ File = "presenter/ButtonMinusMouseOver.png"; }; +Bitmap BUTTONMINUSNORMAL{ File = "presenter/ButtonMinusNormal.png"; }; +Bitmap BUTTONMINUSSELECTED{ File = "presenter/ButtonMinusSelected.png"; }; +Bitmap BUTTONNOTESDISABLED{ File = "presenter/ButtonNotesDisabled.png"; }; +Bitmap BUTTONNOTESMOUSEOVER{ File = "presenter/ButtonNotesMouseOver.png"; }; +Bitmap BUTTONNOTESNORMAL{ File = "presenter/ButtonNotesNormal.png"; }; +Bitmap BUTTONNOTESSELECTED{ File = "presenter/ButtonNotesSelected.png"; }; +Bitmap BUTTONPLUSDISABLED{ File = "presenter/ButtonPlusDisabled.png"; }; +Bitmap BUTTONPLUSMOUSEOVER{ File = "presenter/ButtonPlusMouseOver.png"; }; +Bitmap BUTTONPLUSNORMAL{ File = "presenter/ButtonPlusNormal.png"; }; +Bitmap BUTTONPLUSSELECTED{ File = "presenter/ButtonPlusSelected.png"; }; +Bitmap BUTTONSLIDENEXTDISABLED{ File = "presenter/ButtonSlideNextDisabled.png"; }; +Bitmap BUTTONSLIDENEXTMOUSEOVER{ File = "presenter/ButtonSlideNextMouseOver.png"; }; +Bitmap BUTTONSLIDENEXTNORMAL{ File = "presenter/ButtonSlideNextNormal.png"; }; +Bitmap BUTTONSLIDEPREVIOUSDISABLED{ File = "presenter/ButtonSlidePreviousDisabled.png"; }; +Bitmap BUTTONSLIDEPREVIOUSMOUSEOVER{ File = "presenter/ButtonSlidePreviousMouseOver.png"; }; +Bitmap BUTTONSLIDEPREVIOUSNORMAL{ File = "presenter/ButtonSlidePreviousNormal.png"; }; +Bitmap BUTTONSLIDEPREVIOUSSELECTED{ File = "presenter/ButtonSlidePreviousSelected.png"; }; +Bitmap BUTTONSLIDESORTERDISABLED{ File = "presenter/ButtonSlideSorterDisabled.png"; }; +Bitmap BUTTONSLIDESORTERMOUSEOVER{ File = "presenter/ButtonSlideSorterMouseOver.png"; }; +Bitmap BUTTONSLIDESORTERNORMAL{ File = "presenter/ButtonSlideSorterNormal.png"; }; +Bitmap BUTTONSLIDESORTERSELECTED{ File = "presenter/ButtonSlideSorterSelected.png"; }; +Bitmap LABELMOUSEOVERCENTER{ File = "presenter/LabelMouseOverCenter.png"; }; +Bitmap LABELMOUSEOVERLEFT{ File = "presenter/LabelMouseOverLeft.png"; }; +Bitmap LABELMOUSEOVERRIGHT{ File = "presenter/LabelMouseOverRight.png"; }; +Bitmap SCROLLBARARROWDOWNDISABLED{ File = "presenter/ScrollbarArrowDownDisabled.png"; }; +Bitmap SCROLLBARARROWDOWNMOUSEOVER{ File = "presenter/ScrollbarArrowDownMouseOver.png"; }; +Bitmap SCROLLBARARROWDOWNNORMAL{ File = "presenter/ScrollbarArrowDownNormal.png"; }; +Bitmap SCROLLBARARROWDOWNSELECTED{ File = "presenter/ScrollbarArrowDownSelected.png"; }; +Bitmap SCROLLBARARROWUPDISABLED{ File = "presenter/ScrollbarArrowUpDisabled.png"; }; +Bitmap SCROLLBARARROWUPMOUSEOVER{ File = "presenter/ScrollbarArrowUpMouseOver.png"; }; +Bitmap SCROLLBARARROWUPNORMAL{ File = "presenter/ScrollbarArrowUpNormal.png"; }; +Bitmap SCROLLBARARROWUPSELECTED{ File = "presenter/ScrollbarArrowUpSelected.png"; }; +Bitmap SCROLLBARPAGERMIDDLEMOUSEOVER{ File = "presenter/ScrollbarPagerMiddleMouseOver.png"; }; +Bitmap SCROLLBARPAGERMIDDLENORMAL{ File = "presenter/ScrollbarPagerMiddleNormal.png"; }; +Bitmap SCROLLBARTHUMBBOTTOMMOUSEOVER{ File = "presenter/ScrollbarThumbBottomMouseOver.png"; }; +Bitmap SCROLLBARTHUMBBOTTOMNORMAL{ File = "presenter/ScrollbarThumbBottomNormal.png"; }; +Bitmap SCROLLBARTHUMBMIDDLEMOUSEOVER{ File = "presenter/ScrollbarThumbMiddleMouseOver.png"; }; +Bitmap SCROLLBARTHUMBMIDDLENORMAL{ File = "presenter/ScrollbarThumbMiddleNormal.png"; }; +Bitmap SCROLLBARTHUMBTOPMOUSEOVER{ File = "presenter/ScrollbarThumbTopMouseOver.png"; }; +Bitmap SCROLLBARTHUMBTOPNORMAL{ File = "presenter/ScrollbarThumbTopNormal.png"; }; +Bitmap VIEWBACKGROUND{ File = "presenter/ViewBackground.png"; }; + diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index b84999a6c606..384b02a2e1df 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -27,7 +27,6 @@ #include "PresenterScrollBar.hxx" #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" #include "PresenterTimer.hxx" @@ -329,8 +328,7 @@ void PresenterScrollBar::SetCanvas (const Reference& rx OUString::createFromAscii("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 50ac8c9eb2db..a38ce06f3271 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -27,7 +27,6 @@ #include "PresenterSlideSorter.hxx" #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterHelper.hxx" #include "PresenterPaintManager.hxx" @@ -2061,7 +2060,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference xBitmaps ( aConfiguration.GetConfigurationNode( @@ -2074,8 +2073,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 bdeb56c4fb14..72656ec1e887 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -27,7 +27,6 @@ #include "PresenterTheme.hxx" #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterConfigurationAccess.hxx" #include "PresenterHelper.hxx" #include @@ -102,7 +101,6 @@ public: Reference mxComponentContext; Reference mxCanvas; Reference mxPresenterHelper; - OUString msBasePath; ReadContext ( const Reference& rxContext, @@ -128,8 +126,6 @@ public: BorderSize ReadBorderSize (const Reference& rxNode); - void SetBitmapSourceExtension (const OUString& rsExtensionName); - private: Any GetByName ( const Reference& rxNode, @@ -336,7 +332,7 @@ void SAL_CALL PresenterTheme::disposing (void) PresenterConfigurationAccess aConfiguration ( mxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); return aReadContext.ReadTheme(aConfiguration, msThemeName); @@ -446,7 +442,7 @@ bool PresenterTheme::ConvertToColor ( ::boost::shared_ptr pConfiguration ( new PresenterConfigurationAccess( mxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE)); // Get configuration node for the view style container of the current @@ -749,26 +745,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.getLength()>0) - { - rReadContext.SetBitmapSourceExtension(sBitmapSourceExtension); - } - else - { - rReadContext.SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier); - } - // Background. mpBackground = PresenterBitmapContainer::LoadBitmap( mxThemeRoot, A2S("Background"), rReadContext.mxPresenterHelper, - rReadContext.msBasePath, rReadContext.mxCanvas, SharedBitmapDescriptor()); @@ -791,8 +772,7 @@ void PresenterTheme::Theme::Read ( ? mpParentTheme->mpIconContainer : ::boost::shared_ptr(), rReadContext.mxComponentContext, - rReadContext.mxCanvas, - rReadContext.msBasePath)); + rReadContext.mxCanvas)); // Read fonts. Reference xFontNode( @@ -856,8 +836,7 @@ ReadContext::ReadContext ( const Reference& rxCanvas) : mxComponentContext(rxContext), mxCanvas(rxCanvas), - mxPresenterHelper(), - msBasePath() + mxPresenterHelper() { Reference xFactory (rxContext->getServiceManager()); if (xFactory.is()) @@ -868,9 +847,6 @@ ReadContext::ReadContext ( rxContext), UNO_QUERY_THROW); } - - // Get base path to bitmaps. - SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier); } @@ -1021,17 +997,6 @@ BorderSize ReadContext::ReadBorderSize (const Reference& } - - -void ReadContext::SetBitmapSourceExtension (const OUString& rsExtensionIdentifier) -{ - // Get base path to bitmaps. - msBasePath = PresenterComponent::GetBasePath(mxComponentContext, rsExtensionIdentifier); -} - - - - //===== PaneStyleContainer ==================================================== void PaneStyleContainer::Read ( @@ -1116,7 +1081,6 @@ void PaneStyleContainer::ProcessPaneStyle( : ::boost::shared_ptr(), rReadContext.mxComponentContext, rReadContext.mxCanvas, - rReadContext.msBasePath, rReadContext.mxPresenterHelper)); } @@ -1275,7 +1239,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 2b34e27228b1..2fdae656af55 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -28,7 +28,6 @@ #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" #include "PresenterPaneBase.hxx" @@ -127,7 +126,6 @@ class PresenterToolBar::Context : private ::boost::noncopyable { public: - ::rtl::OUString msBasePath; Reference mxPresenterHelper; css::uno::Reference mxCanvas; }; @@ -773,11 +771,9 @@ void PresenterToolBar::CreateControls ( // Expand the macro in the bitmap file names. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); - const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext)); - mpCurrentContainerPart.reset(new ElementContainerPart()); maElementContainer.clear(); maElementContainer.push_back(mpCurrentContainerPart); @@ -791,7 +787,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() @@ -1668,7 +1663,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 00dfbcf45666..8332a3d9d137 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -749,7 +749,7 @@ void PresenterWindowManager::RestoreViewMode (void) sal_Int32 nMode (0); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode; switch (nMode) @@ -778,7 +778,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode) { PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE); aConfiguration.GoToChild(A2S("Presenter")); Any aValue; diff --git a/sdext/source/presenter/ProtocolHandler.xcu b/sdext/source/presenter/ProtocolHandler.xcu new file mode 100644 index 000000000000..6b9ca6c25b90 --- /dev/null +++ b/sdext/source/presenter/ProtocolHandler.xcu @@ -0,0 +1,31 @@ + + + + + + + + vnd.com.sun.star.comp.PresenterScreen:* + + + + diff --git a/sdext/source/presenter/bitmaps/Background.png b/sdext/source/presenter/bitmaps/Background.png deleted file mode 100644 index 7b32e4ab974b..000000000000 Binary files a/sdext/source/presenter/bitmaps/Background.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottom.png b/sdext/source/presenter/bitmaps/BorderActiveBottom.png deleted file mode 100644 index 8314c9efd092..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveBottom.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png b/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png deleted file mode 100644 index b7c33223a33c..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png b/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png deleted file mode 100644 index 8d573e864942..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png b/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png deleted file mode 100644 index 35ef8e9213db..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveLeft.png b/sdext/source/presenter/bitmaps/BorderActiveLeft.png deleted file mode 100644 index 57d4a3dbbcd3..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveRight.png b/sdext/source/presenter/bitmaps/BorderActiveRight.png deleted file mode 100644 index 9a9857190b9d..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveTop.png b/sdext/source/presenter/bitmaps/BorderActiveTop.png deleted file mode 100644 index e0bea9d55448..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveTop.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png b/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png deleted file mode 100644 index 62d63271fe21..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveTopRight.png b/sdext/source/presenter/bitmaps/BorderActiveTopRight.png deleted file mode 100644 index 450c8e0cc5e7..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveTopRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderBottom.png b/sdext/source/presenter/bitmaps/BorderBottom.png deleted file mode 100644 index 7ad2fd6c2a03..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderBottom.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderBottomLeft.png b/sdext/source/presenter/bitmaps/BorderBottomLeft.png deleted file mode 100644 index 019de149b3af..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderBottomLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderBottomRight.png b/sdext/source/presenter/bitmaps/BorderBottomRight.png deleted file mode 100644 index 82de5791c1cd..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderBottomRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png deleted file mode 100644 index 7000bc22f6c4..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png deleted file mode 100644 index 7571c8d94b1f..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png deleted file mode 100644 index c0af63ff58b8..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png deleted file mode 100644 index 7000bc22f6c4..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png deleted file mode 100644 index 7000bc22f6c4..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png deleted file mode 100644 index 7000bc22f6c4..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png deleted file mode 100644 index fdfabd42ae9f..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png deleted file mode 100644 index 5b4b642e9f34..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderLeft.png b/sdext/source/presenter/bitmaps/BorderLeft.png deleted file mode 100644 index cbdb267b8789..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderRight.png b/sdext/source/presenter/bitmaps/BorderRight.png deleted file mode 100644 index 333073328ddd..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarBottom.png b/sdext/source/presenter/bitmaps/BorderToolbarBottom.png deleted file mode 100644 index 23a3bc3595aa..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarBottom.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarLeft.png b/sdext/source/presenter/bitmaps/BorderToolbarLeft.png deleted file mode 100644 index 839ab5091a8e..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarRight.png b/sdext/source/presenter/bitmaps/BorderToolbarRight.png deleted file mode 100644 index e5c4b9d25a16..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTop.png b/sdext/source/presenter/bitmaps/BorderToolbarTop.png deleted file mode 100644 index c45b97c434cd..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarTop.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png b/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png deleted file mode 100644 index 978e98a9bbc4..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png b/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png deleted file mode 100644 index 7dc3d98860ea..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderTop.png b/sdext/source/presenter/bitmaps/BorderTop.png deleted file mode 100644 index dee68e828147..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderTop.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderTopLeft.png b/sdext/source/presenter/bitmaps/BorderTopLeft.png deleted file mode 100644 index bbec4e42be42..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderTopLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderTopRight.png b/sdext/source/presenter/bitmaps/BorderTopRight.png deleted file mode 100644 index 3416b16c9e91..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderTopRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png b/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png deleted file mode 100644 index 5417cf72c928..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png b/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png deleted file mode 100644 index 96805e392176..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png b/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png deleted file mode 100644 index 6dbd732e0977..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png b/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png deleted file mode 100644 index eb6e6d45bb23..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png b/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png deleted file mode 100644 index b97799f1f314..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png b/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png deleted file mode 100644 index 4cf7218f3b52..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png b/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png deleted file mode 100644 index 1f2ab6a00cab..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png b/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png deleted file mode 100644 index 0e92cb37d7d8..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png b/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png deleted file mode 100644 index 0f49ad4f7e61..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png b/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png deleted file mode 100644 index 4ca69670e513..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png b/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png deleted file mode 100644 index 12f4903b6cf8..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png b/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png deleted file mode 100644 index 7bddef561f11..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonHelpNormal.png b/sdext/source/presenter/bitmaps/ButtonHelpNormal.png deleted file mode 100644 index 99c693215ba9..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonHelpNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonHelpSelected.png b/sdext/source/presenter/bitmaps/ButtonHelpSelected.png deleted file mode 100644 index f162db27650e..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonHelpSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png b/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png deleted file mode 100644 index ff61106eb7ec..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png b/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png deleted file mode 100644 index 787249912b9c..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonMinusNormal.png b/sdext/source/presenter/bitmaps/ButtonMinusNormal.png deleted file mode 100644 index e2d993384fef..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonMinusNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonMinusSelected.png b/sdext/source/presenter/bitmaps/ButtonMinusSelected.png deleted file mode 100644 index 5d15de3b916f..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonMinusSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png b/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png deleted file mode 100644 index 09e31d26c649..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png b/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png deleted file mode 100644 index 099d6bf0f2b1..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonNotesNormal.png b/sdext/source/presenter/bitmaps/ButtonNotesNormal.png deleted file mode 100644 index 551392622506..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonNotesNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonNotesSelected.png b/sdext/source/presenter/bitmaps/ButtonNotesSelected.png deleted file mode 100644 index f5494fb1c678..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonNotesSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png b/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png deleted file mode 100644 index e6ba3f3e78a7..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png b/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png deleted file mode 100644 index 9d21dc40a6eb..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonPlusNormal.png b/sdext/source/presenter/bitmaps/ButtonPlusNormal.png deleted file mode 100644 index 2e075c2a3a87..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonPlusNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonPlusSelected.png b/sdext/source/presenter/bitmaps/ButtonPlusSelected.png deleted file mode 100644 index b9d6fe1ed929..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonPlusSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png b/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png deleted file mode 100644 index 7f3bce058f4c..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png deleted file mode 100644 index 4dc13655965b..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png b/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png deleted file mode 100644 index 711b8ca8caf6..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png deleted file mode 100644 index 383780eab2cf..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png deleted file mode 100644 index dc35c62deaf2..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png deleted file mode 100644 index 26262b4568d7..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png deleted file mode 100644 index 7274263a43f5..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png deleted file mode 100644 index ce7d4ad51514..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png deleted file mode 100644 index 2e7f518ac9e3..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png deleted file mode 100644 index 7aa914f41c01..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png deleted file mode 100644 index 143f995a004c..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png b/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png deleted file mode 100644 index 6eb75d386f46..000000000000 Binary files a/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png b/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png deleted file mode 100644 index 9455246332cf..000000000000 Binary files a/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverRight.png b/sdext/source/presenter/bitmaps/LabelMouseOverRight.png deleted file mode 100644 index 1f972d0cebea..000000000000 Binary files a/sdext/source/presenter/bitmaps/LabelMouseOverRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png deleted file mode 100644 index 4dd16272fad7..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png deleted file mode 100644 index d1980a2a1a05..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png deleted file mode 100644 index 166f10057c11..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png deleted file mode 100644 index 21d42945ce98..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png deleted file mode 100644 index 44f60683bc59..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png deleted file mode 100644 index 9795885632dc..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png deleted file mode 100644 index 804ced846065..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png deleted file mode 100644 index d7be4f324f86..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png deleted file mode 100644 index 84b781af9fb8..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png b/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png deleted file mode 100644 index a06ba667f118..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png deleted file mode 100644 index 482f13638755..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png b/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png deleted file mode 100644 index ec46e172c134..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png deleted file mode 100644 index 62066c24b687..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png b/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png deleted file mode 100644 index c25e4edcf595..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png deleted file mode 100644 index 714481df996d..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png b/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png deleted file mode 100644 index 7e0922c74966..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ViewBackground.png b/sdext/source/presenter/bitmaps/ViewBackground.png deleted file mode 100644 index ca52d8262a88..000000000000 Binary files a/sdext/source/presenter/bitmaps/ViewBackground.png and /dev/null differ diff --git a/sdext/source/presenter/components.cxx b/sdext/source/presenter/components.cxx new file mode 100644 index 000000000000..656d0f2a004a --- /dev/null +++ b/sdext/source/presenter/components.cxx @@ -0,0 +1,74 @@ +/************************************************************** + * + * 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 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sdext.hxx" + +#include +#include + +#include "PresenterProtocolHandler.hxx" +#include "PresenterScreen.hxx" + + +namespace sdext { namespace presenter { + + +rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; + +static struct cppu::ImplementationEntry gServiceEntries[] = +{ + { + PresenterProtocolHandler::Create, + PresenterProtocolHandler::getImplementationName_static, + PresenterProtocolHandler::getSupportedServiceNames_static, + cppu::createSingleComponentFactory, &g_moduleCount.modCnt, 0 + }, + { + PresenterScreenJob::Create, + PresenterScreenJob::getImplementationName_static, + PresenterScreenJob::getSupportedServiceNames_static, + cppu::createSingleComponentFactory, 0, 0 + }, + { 0, 0, 0, 0, 0, 0 } +}; + +extern "C" +{ + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) + { + return g_moduleCount.canUnload( &g_moduleCount , pTime ); + } + + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( + const sal_Char ** ppEnvTypeName, uno_Environment ** ) + { + *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; + } + + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + { + return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries); + } +} + +} } // end of namespace sdext::presenter diff --git a/sdext/source/presenter/delzip b/sdext/source/presenter/delzip deleted file mode 100644 index 636fda90bfcb..000000000000 --- a/sdext/source/presenter/delzip +++ /dev/null @@ -1 +0,0 @@ -ECHO is OFF diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml deleted file mode 100644 index 68b126dc66ff..000000000000 --- a/sdext/source/presenter/description.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Apache Software Foundation - - - - Presenter Console - - - - - - - - diff --git a/sdext/source/presenter/help/component.txt b/sdext/source/presenter/help/component.txt deleted file mode 100644 index 26a10c622fe9..000000000000 --- a/sdext/source/presenter/help/component.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/help/en-US/com.sun.PresenterScreen/makefile.mk b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk deleted file mode 100644 index f6531d70ca7d..000000000000 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************** -# -# 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 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=../../../../.. -PRJNAME=sdext -TARGET=PresenterScreenHelp -EXTNAME=PresenterScreen - -PACKAGE = com.sun.PresenterScreen - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -.IF "$(ENABLE_PRESENTER_SCREEN)" == "NO" -do_nothing: - @echo "Presenter Screen build disabled." -.ELSE - -XHPFILES= \ - presenter.xhp - - -.INCLUDE : target.mk -.INCLUDE : tg_help.mk - -.ENDIF diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp deleted file mode 100644 index a315c1a06702..000000000000 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - @PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts - /com.sun.PresenterScreen-PLATFORMID/presenter.xhp - - - - -@PRESENTEREXTENSIONPRODUCTNAME@ shortcuts - -@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts - When running a slide show using the @PRESENTEREXTENSIONPRODUCTNAME@, you can use the following keys: - - - - Action - - - Key or Keys - - - - - Next slide, or next effect - - - Left click, right arrow, down arrow, spacebar, page down, enter, return, 'N' - - - - - Previous slide, or previous effect - - - Right click, left arrow, up arrow, page up, backspace, 'P' - - - - - First slide - - - Home - - - - - Last slide - - - End - - - - - Previous slide without effects - - - Alt+Page Up - - - - - Next slide without effects - - - Alt+Page Down - - - - - Black/Unblack the screen - - - 'B', '.' - - - - - White/Unwhite the screen - - - 'W', ',' - - - - - End slide show - - - Esc, '-' - - - - - Go to slide number - - - Number followed by Enter - - - - - Grow/Shrink size of notes font - - - 'G', 'S' - - - - - Scroll notes up/down - - - 'A', 'Z' - - - - - Move caret in notes view backward/forward - - - 'H', 'L' - - - - - Show the @PRESENTEREXTENSIONPRODUCTNAME@ - - - Ctrl-'1' - - - - - Show the Presentation Notes - - - Ctrl-'2' - - - - - Show the Slides Overview - - - Ctrl-'3' - - -
- - - diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 6fc59c68fb8e..b1541c857737 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -1,5 +1,5 @@ #************************************************************** -# +# # 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 @@ -7,20 +7,18 @@ # 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 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# #************************************************************** - - PRJ=..$/.. PRJNAME=sdext TARGET=PresenterScreen @@ -28,21 +26,19 @@ GEN_HID=FALSE EXTNAME=PresenterScreen ENABLE_EXCEPTIONS=TRUE -# survive zip dependencies -MAXLINELENGTH:=80000 + +PACKAGE=org.openoffice.Office +ABSXCSROOT=$(SOLARXMLDIR) +XCSROOT=.. +DTDDIR=$(ABSXCSROOT) +XSLDIR=$(ABSXCSROOT)$/processing +PROCESSOUT=$(MISC)$/$(TARGET) +PROCESSORDIR=$(SOLARBINDIR) # --- Settings ---------------------------------- -.INCLUDE : rtlbootstrap.mk .INCLUDE : settings.mk -PACKAGE=com.sun.PresenterScreen-$(PLATFORMID) - -.IF "$(ENABLE_PRESENTER_SCREEN)" == "NO" -@all: - @echo "Presenter Screen build disabled." -.ELSE - .IF "$(L10N_framework)" != "" @all: @@ -52,307 +48,116 @@ PACKAGE=com.sun.PresenterScreen-$(PLATFORMID) .INCLUDE : $(PRJ)$/util$/makefile.pmk - DLLPRE= -common_build_zip= # --- Files ------------------------------------- -SLOFILES= \ - $(SLO)$/PresenterAccessibility.obj \ - $(SLO)$/PresenterAnimation.obj \ - $(SLO)$/PresenterAnimator.obj \ - $(SLO)$/PresenterBitmapContainer.obj \ - $(SLO)$/PresenterButton.obj \ - $(SLO)$/PresenterCanvasHelper.obj \ - $(SLO)$/PresenterConfigurationAccess.obj \ - $(SLO)$/PresenterController.obj \ - $(SLO)$/PresenterCurrentSlideObserver.obj \ - $(SLO)$/PresenterFrameworkObserver.obj \ - $(SLO)$/PresenterGeometryHelper.obj \ - $(SLO)$/PresenterHelper.obj \ - $(SLO)$/PresenterHelpView.obj \ - $(SLO)$/PresenterNotesView.obj \ - $(SLO)$/PresenterPaintManager.obj \ - $(SLO)$/PresenterPane.obj \ - $(SLO)$/PresenterPaneAnimator.obj \ - $(SLO)$/PresenterPaneBase.obj \ - $(SLO)$/PresenterPaneBorderManager.obj \ - $(SLO)$/PresenterPaneBorderPainter.obj \ - $(SLO)$/PresenterPaneContainer.obj \ - $(SLO)$/PresenterPaneFactory.obj \ - $(SLO)$/PresenterProtocolHandler.obj \ - $(SLO)$/PresenterScreen.obj \ - $(SLO)$/PresenterScrollBar.obj \ - $(SLO)$/PresenterSlidePreview.obj \ - $(SLO)$/PresenterSlideShowView.obj \ - $(SLO)$/PresenterSlideSorter.obj \ - $(SLO)$/PresenterSprite.obj \ - $(SLO)$/PresenterSpritePane.obj \ - $(SLO)$/PresenterTextView.obj \ - $(SLO)$/PresenterTheme.obj \ - $(SLO)$/PresenterTimer.obj \ - $(SLO)$/PresenterToolBar.obj \ - $(SLO)$/PresenterUIPainter.obj \ - $(SLO)$/PresenterViewFactory.obj \ - $(SLO)$/PresenterWindowManager.obj \ - $(SLO)$/PresenterComponent.obj +SLOFILES=\ + $(SLO)$/components.obj \ + $(SLO)$/PresenterAccessibility.obj \ + $(SLO)$/PresenterAnimation.obj \ + $(SLO)$/PresenterAnimator.obj \ + $(SLO)$/PresenterBitmapContainer.obj \ + $(SLO)$/PresenterButton.obj \ + $(SLO)$/PresenterCanvasHelper.obj \ + $(SLO)$/PresenterConfigurationAccess.obj \ + $(SLO)$/PresenterController.obj \ + $(SLO)$/PresenterCurrentSlideObserver.obj \ + $(SLO)$/PresenterFrameworkObserver.obj \ + $(SLO)$/PresenterGeometryHelper.obj \ + $(SLO)$/PresenterHelper.obj \ + $(SLO)$/PresenterHelpView.obj \ + $(SLO)$/PresenterNotesView.obj \ + $(SLO)$/PresenterPaintManager.obj \ + $(SLO)$/PresenterPane.obj \ + $(SLO)$/PresenterPaneAnimator.obj \ + $(SLO)$/PresenterPaneBase.obj \ + $(SLO)$/PresenterPaneBorderManager.obj \ + $(SLO)$/PresenterPaneBorderPainter.obj \ + $(SLO)$/PresenterPaneContainer.obj \ + $(SLO)$/PresenterPaneFactory.obj \ + $(SLO)$/PresenterProtocolHandler.obj \ + $(SLO)$/PresenterScreen.obj \ + $(SLO)$/PresenterScrollBar.obj \ + $(SLO)$/PresenterSlidePreview.obj \ + $(SLO)$/PresenterSlideShowView.obj \ + $(SLO)$/PresenterSlideSorter.obj \ + $(SLO)$/PresenterSprite.obj \ + $(SLO)$/PresenterSpritePane.obj \ + $(SLO)$/PresenterTextView.obj \ + $(SLO)$/PresenterTheme.obj \ + $(SLO)$/PresenterTimer.obj \ + $(SLO)$/PresenterToolBar.obj \ + $(SLO)$/PresenterUIPainter.obj \ + $(SLO)$/PresenterViewFactory.obj \ + $(SLO)$/PresenterWindowManager.obj \ # --- Library ----------------------------------- -SHL1TARGET= $(TARGET).uno +SHL1TARGET=$(TARGET).uno -SHL1STDLIBS= $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) +SHL1STDLIBS= \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) SHL1DEPN= -SHL1IMPLIB= i$(SHL1TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map +SHL1IMPLIB= i$(SHL1TARGET) +SHL1LIBS= $(SLB)$/$(TARGET).lib +SHL1DEF= $(MISC)$/$(SHL1TARGET).def +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1RPATH= OXT -DEF1NAME= $(SHL1TARGET) - -ZIP2TARGET= presenter-screen_develop -ZIP2DIR= $(COMMONMISC) -ZIP2EXT= .zip -ZIP2FLAGS=-r -ZIP2LIST= */com.sun.PresenterScreen/*.xhp - -ZIP1TARGET= presenter-screen -ZIP1DIR= $(MISC)$/$(TARGET) -ZIP1EXT= .oxt -ZIP1FLAGS=-r -ZIP1LIST= * - -EXTENSIONDIR=$(ZIP1DIR) - -.INCLUDE : extension_pre.mk - -.IF "$(WITH_LANG)"=="" -FIND_XCU=registry/data -.ELSE # "$(WITH_LANG)"=="" -FIND_XCU=$(MISC)$/$(EXTNAME)_in$/merge -.ENDIF # "$(WITH_LANG)"=="" - -COMPONENT_FILES= \ - $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/Jobs.xcu \ - $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu \ - $(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs \ - $(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu - -COMPONENT_BITMAPS= \ - $(ZIP1DIR)$/bitmaps$/BorderTop.png \ - $(ZIP1DIR)$/bitmaps$/BorderTopLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderTopRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderBottomLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderBottomRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderBottom.png \ - \ - $(ZIP1DIR)$/bitmaps$/BorderActiveTop.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveTopLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveTopRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveBottomLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveBottomRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveBottom.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveBottomCallout.png \ - \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideTop.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideTopLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideTopRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideBottomLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideBottomRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideBottom.png \ - \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarTop.png \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarTopLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarTopRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarBottom.png \ - \ - $(ZIP1DIR)$/bitmaps$/Background.png \ - $(ZIP1DIR)$/bitmaps$/ViewBackground.png \ - \ - $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousDisabled.png \ - $(ZIP1DIR)$/bitmaps$/ButtonEffectNextNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonEffectNextMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonEffectNextSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonEffectNextDisabled.png \ - $(ZIP1DIR)$/bitmaps$/ButtonNotesNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonNotesMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonNotesSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonNotesDisabled.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterDisabled.png \ - $(ZIP1DIR)$/bitmaps$/ButtonHelpNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonHelpMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonHelpSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonHelpDisabled.png \ - \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpMouseOver.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpSelected.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpDisabled.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownMouseOver.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownSelected.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownDisabled.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarPagerMiddleNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarPagerMiddleMouseOver.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbTopNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbTopMouseOver.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbBottomNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbBottomMouseOver.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbMiddleNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbMiddleMouseOver.png \ - \ - $(ZIP1DIR)$/bitmaps$/ButtonPlusNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonPlusMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonPlusSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonPlusDisabled.png \ - $(ZIP1DIR)$/bitmaps$/ButtonMinusNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonMinusMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonMinusSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonMinusDisabled.png \ - \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameLeftNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameCenterNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameRightNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameLeftMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameCenterMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameRightMouseOver.png \ - \ - $(ZIP1DIR)$/bitmaps$/LabelMouseOverLeft.png \ - $(ZIP1DIR)$/bitmaps$/LabelMouseOverCenter.png \ - $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png - -COMPONENT_IMAGES=\ - $(ZIP1DIR)$/bitmaps$/extension_32.png \ - $(ZIP1DIR)$/bitmaps$/extension_32_h.png - -COMPONENT_LIBRARY= \ - $(ZIP1DIR)$/$(TARGET).uno$(DLLPOST) - -PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l) - -COMPONENT_HELP= \ - $(ZIP1DIR)$/help/component.txt \ - $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp) - -ZIP1DEPS= \ - $(PACKLICS) \ - $(DESCRIPTION) \ - $(COMPONENT_MANIFEST) \ - $(COMPONENT_FILES) \ - $(COMPONENT_BITMAPS) \ - $(COMPONENT_IMAGES) \ - $(COMPONENT_LIBRARY) \ - $(COMPONENT_HELP) - -# $(COMPONENT_MERGED_XCU) \ - - -LINKNAME:=help -XHPLINKSRC:=$(ZIP1DIR)/help - -my_XHPFILES= \ - presenter.xhp - -LINKLINKFILES= \ - $(PACKAGE)/{$(my_XHPFILES)} +DEF1NAME= $(SHL1TARGET) -# --- Targets ---------------------------------- +# ------------------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : extension_helplink.mk +# Resource files -$(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx +SRS1NAME=$(TARGET) +SRC1FILES = \ + $(TARGET).src \ -$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx - $(TYPE) $< | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ +SRSFILELIST=\ + $(SRS)$/$(TARGET).srs \ -$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f) - @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ +RESLIB1NAME=$(TARGET) +RESLIB1SRSFILES= $(SRSFILELIST) -$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp - @echo creating $@ - @-$(MKDIRHIER) $(@:d) - $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@ -.IF "$(ZIP1TARGETN)"!="" -$(ZIP1TARGETN) : $(HELPLINKALLTARGETS) +PACKAGEDIR=$(subst,.,$/ $(PACKAGE)) +SPOOLDIR=$(MISC)$/registry$/spool -.ENDIF # "$(ZIP1TARGETN)"!="" +XCUFILES= \ + Jobs.xcu \ + ProtocolHandler.xcu -$(COMPONENT_BITMAPS) : bitmaps$/$$(@:f) - @-$(MKDIRHIER) $(@:d) - +$(COPY) $< $@ +MYXCUFILES= \ + $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-presenterscreen.xcu \ + $(SPOOLDIR)$/$(PACKAGEDIR)$/ProtocolHandler/ProtocolHandler-presenterscreen.xcu + + +# --- Targets ---------------------------------- + +.INCLUDE : target.mk -$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) - @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ +ALLTAR : $(MYXCUFILES) -$(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) +XCU_SOURCEDIR:=. + +$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-presenterscreen.xcu : $(XCU_SOURCEDIR)$/Jobs.xcu + @-$(MKDIRHIER) $(@:d) + @$(COPY) $< $@ + +$(SPOOLDIR)$/$(PACKAGEDIR)$/ProtocolHandler$/ProtocolHandler-presenterscreen.xcu : $(XCU_SOURCEDIR)$/ProtocolHandler.xcu @-$(MKDIRHIER) $(@:d) - +$(COPY) $< $@ -.IF "$(OS)$(CPU)"=="WNTI" - .IF "$(COM)"=="GCC" - $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR) - .ELSE - .IF "$(PACKMS)"!="" - .IF "$(CCNUMVER)" <= "001399999999" - $(GNUCOPY) $(PACKMS)$/msvcr71.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/msvcp71.dll $(ZIP1DIR) - .ELSE - .IF "$(CCNUMVER)" <= "001499999999" - $(GNUCOPY) $(PACKMS)$/msvcr80.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/msvcp80.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/msvcm80.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR) - .ELSE - $(GNUCOPY) $(PACKMS)$/msvcr90.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/msvcp90.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/msvcm90.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR) - .ENDIF - .ENDIF - .ELSE # "$(PACKMS)"!="" - .IF "$(CCNUMVER)" <= "001399999999" - $(GNUCOPY) $(SOLARBINDIR)$/msvcr71.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcp71.dll $(ZIP1DIR) - .ELSE - .IF "$(CCNUMVER)" <= "001499999999" - $(GNUCOPY) $(SOLARBINDIR)$/msvcr80.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcp80.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcm80.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR) - .ELSE - $(GNUCOPY) $(SOLARBINDIR)$/msvcr90.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcp90.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcm90.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR) - .ENDIF - .ENDIF - .ENDIF # "$(PACKMS)"!="" - .ENDIF #"$(COM)"=="GCC" -.ENDIF - -.INCLUDE : extension_post.mk + @$(COPY) $< $@ + +ALLTAR : $(MISC)/PresenterScreen.component + +$(MISC)/PresenterScreen.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt PresenterScreen.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt PresenterScreen.component .ENDIF # L10N_framework -.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO" diff --git a/sdext/source/presenter/manifest.xml b/sdext/source/presenter/manifest.xml deleted file mode 100644 index 50cbebbd514b..000000000000 --- a/sdext/source/presenter/manifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - 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 99c830bc53cc..000000000000 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu +++ /dev/null @@ -1,41 +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 6b9ca6c25b90..000000000000 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - vnd.com.sun.star.comp.PresenterScreen:* - - - - diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu deleted file mode 100644 index cd815e1df90f..000000000000 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu +++ /dev/null @@ -1,1220 +0,0 @@ - - - - - - - - - - - - PreviousSlide - Button - - Previous - - bitmaps/ButtonSlidePreviousNormal.png - - vnd.com.sun.star.comp.PresenterScreen:PrevSlide - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonSlidePreviousMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonSlidePreviousDisabled.png - - - - - NextEffect - Button - - Next - - bitmaps/ButtonEffectNextNormal.png - - vnd.com.sun.star.comp.PresenterScreen:NextEffect - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonEffectNextMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonEffectNextDisabled.png - - - - - Notes - Button - - Notes - - bitmaps/ButtonNotesNormal.png - - vnd.com.sun.star.comp.PresenterScreen:ShowNotes - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonNotesMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonNotesSelected.png - - - FFFFFF - - vnd.com.sun.star.comp.PresenterScreen:CloseNotes - - - - bitmaps/ButtonNotesDisabled.png - - - - - SlideSorter - Button - - Slides - - bitmaps/ButtonSlideSorterNormal.png - - vnd.com.sun.star.comp.PresenterScreen:ShowSlideSorter - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonSlideSorterMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonSlideSorterSelected.png - - - FFFFFF - - vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter - - - - bitmaps/ButtonSlideSorterDisabled.png - - - - - VerticalSeparator - - - 76797C - - - - - ChangeOrientation - - - CurrentTimeLabel - - - 18 - Bold - ffffff - Center - - - - - HorizontalSeparator - - - 71767a - - - - - PresentationTimeLabel - - - 26 - Bold - ffe969 - Center - - - - - ChangeOrientation - - - VerticalSeparator - - - 76797C - - - - - Help - Button - - Help - - bitmaps/ButtonHelpNormal.png - - vnd.com.sun.star.comp.PresenterScreen:ShowHelp - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonHelpMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonHelpSelected.png - - - FFFFFF - - vnd.com.sun.star.comp.PresenterScreen:CloseHelp - - - - bitmaps/ButtonHelpDisabled.png - - - - - - - - - Zoom - Label - - Zoom - - 14 - Bold - B3B7BC - - - - - Grow - Button - - - bitmaps/ButtonPlusNormal.png - - vnd.com.sun.star.comp.PresenterScreen:GrowNotesFont - - - - bitmaps/ButtonPlusMouseOver.png - - - - - bitmaps/ButtonPlusDisabled.png - - - - - Shrink - Button - - - bitmaps/ButtonMinusNormal.png - - vnd.com.sun.star.comp.PresenterScreen:ShrinkNotesFont - - - - bitmaps/ButtonMinusMouseOver.png - - - - - bitmaps/ButtonMinusDisabled.png - - - - - - - - - SlideSorterCloser - - Close - - vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter - - - NotesViewCloser - - Close - - vnd.com.sun.star.comp.PresenterScreen:CloseNotes - - - HelpViewCloser - - Close - - vnd.com.sun.star.comp.PresenterScreen:CloseHelp - - - - - - Up - bitmaps/ScrollbarArrowUpNormal.png - bitmaps/ScrollbarArrowUpMouseOver.png - bitmaps/ScrollbarArrowUpDisabled.png - - - Down - bitmaps/ScrollbarArrowDownNormal.png - bitmaps/ScrollbarArrowDownMouseOver.png - bitmaps/ScrollbarArrowDownDisabled.png - - - PagerVertical - bitmaps/ScrollbarPagerMiddleNormal.png - bitmaps/ScrollbarPagerMiddleMouseOver.png - - - ThumbTop - bitmaps/ScrollbarThumbTopNormal.png - bitmaps/ScrollbarThumbTopMouseOver.png - - - ThumbBottom - bitmaps/ScrollbarThumbBottomNormal.png - bitmaps/ScrollbarThumbBottomMouseOver.png - - - ThumbVertical - bitmaps/ScrollbarThumbMiddleNormal.png - bitmaps/ScrollbarThumbMiddleMouseOver.png - - - - - - 9 - 9 - 9 - 9 - - - - bitmaps/BorderCurrentSlideTopLeft.png - - - bitmaps/BorderCurrentSlideTop.png - - - bitmaps/BorderCurrentSlideTopRight.png - - - bitmaps/BorderCurrentSlideLeft.png - - - bitmaps/BorderCurrentSlideRight.png - - - bitmaps/BorderCurrentSlideBottomLeft.png - - - bitmaps/BorderCurrentSlideBottom.png - - - bitmaps/BorderCurrentSlideBottomRight.png - - - - - - - - Left click, right or down arrow, spacebar, page down, enter, return, 'N' - - - Next slide, or next effect - - - - - Right click, left or up arrow, page up, backspace, 'P' - - - Previous slide, or previous effect - - - - - - - - - - - - - Home - - - First slide - - - - - End - - - Last slide - - - - - - - - - - - - - Alt-Page Up - - - Previous slide without effects - - - - - Alt-Page Down - - - Next slide without effects - - - - - - - - - - - - - 'B', '.' - - - Blacks/Unblacks the screen - - - - - 'W', ',' - - - Whites/Unwhites the screen - - - - - - - - - - - - - Esc, '-' - - - End slide show - - - - - - - - - - - - - Number followed by Enter - - - Go to that slide - - - - - - - - - - - - - 'G', 'S' - - - Grow/Shrink size of notes font - - - - - 'A', 'Z' - - - Scroll notes up/down - - - - - 'H', 'L' - - - Move caret in notes view backward/forward - - - - - - - - - - - - - Ctrl-'1' - - - Shows the Presenter Console - - - - - Ctrl-'2' - - - Shows the Presentation Notes - - - - - Ctrl-'3' - - - Shows the Slides Overview - - - - - - - - - - DefaultTheme - - - - - DefaultPaneStyle - - - - Bold - 14 - B3B7BC - Center - -7 - - - 6 - 6 - 6 - 6 - - - 20 - 28 - 20 - 29 - - - - bitmaps/BorderTop.png - 6 - - - bitmaps/BorderTopLeft.png - 6 - 6 - - - bitmaps/BorderTopRight.png - -6 - 6 - - - bitmaps/BorderLeft.png - 6 - - - bitmaps/BorderRight.png - -6 - - - bitmaps/BorderBottomLeft.png - 6 - -6 - - - bitmaps/BorderBottomRight.png - -6 - -6 - - - bitmaps/BorderBottom.png - -6 - - - - - - ActivePaneStyle - - - DefaultPaneStyle - - - - Bold - 14 - FFFFFF - Center - -10 - - - - bitmaps/BorderActiveTop.png - 6 - - - bitmaps/BorderActiveTopLeft.png - 6 - 6 - - - bitmaps/BorderActiveTopRight.png - -6 - 6 - - - bitmaps/BorderActiveLeft.png - 6 - - - bitmaps/BorderActiveRight.png - -6 - - - bitmaps/BorderActiveBottomLeft.png - 6 - -6 - - - bitmaps/BorderActiveBottomRight.png - -6 - -6 - - - bitmaps/BorderActiveBottom.png - -6 - - - - - - ToolbarPaneStyle - - - 4 - 4 - 4 - 4 - - - 8 - 8 - 8 - 0 - - - - bitmaps/BorderToolbarTop.png - 4 - - - bitmaps/BorderToolbarTopLeft.png - 4 - 4 - - - bitmaps/BorderToolbarTopRight.png - -4 - 4 - - - bitmaps/BorderToolbarLeft.png - 4 - - - bitmaps/BorderToolbarRight.png - -4 - - - bitmaps/BorderToolbarLeft.png - 4 - - - bitmaps/BorderToolbarRight.png - -4 - - - bitmaps/BorderToolbarBottom.png - -4 - - - - - - ActiveBottomCalloutPaneStyle - - - ActivePaneStyle - - - 52 - - - - bitmaps/BorderActiveBottomCallout.png - -6 - 49 - 41 - - - - - - - DefaultViewStyle - - - 20 - FFFFFF - - - - bitmaps/ViewBackground.png - Repeat - Repeat - 33000000 - - - - NotesViewStyle - DefaultViewStyle - - - Bold - 26 - d1d6dc - - - - SlideSorterViewStyle - DefaultViewStyle - - - HelpViewStyle - DefaultViewStyle - - - Bold - 20 - ffffff - - - - - bitmaps/Background.png - E4EFF9 - Repeat - Stretch - - - - ButtonFrameLeft - bitmaps/ButtonFrameLeftNormal.png - bitmaps/ButtonFrameLeftMouseOver.png - 2 - - - ButtonFrameCenter - bitmaps/ButtonFrameCenterNormal.png - bitmaps/ButtonFrameCenterMouseOver.png - 2 - - - ButtonFrameRight - bitmaps/ButtonFrameRightNormal.png - bitmaps/ButtonFrameRightMouseOver.png - 2 - - - bitmaps/LabelMouseOverLeft.png - - - bitmaps/LabelMouseOverCenter.png - - - bitmaps/LabelMouseOverRight.png - - - bitmaps/ButtonSlideNextNormal.png - - - - - - Bold - 18 - b3b7bc - - - - Bold - 18 - ffffff - - - - Bold - 20 - ffffff - - - - Bold - 24 - e02050 - - - - - - private:resource/pane/Presenter/Pane1 - - - ActivePaneStyle - - - - - private:resource/view/Presenter/CurrentSlidePreview - - - DefaultViewStyle - - - - - private:resource/pane/Presenter/Pane2 - - - DefaultPaneStyle - - - - - private:resource/view/Presenter/NextSlidePreview - - - DefaultViewStyle - - - - - private:resource/pane/Presenter/Pane4 - - - ToolbarPaneStyle - - - - - private:resource/view/Presenter/ToolBar - - - DefaultViewStyle - - - - - private:resource/pane/Presenter/Pane3 - - - ActivePaneStyle - - - - - private:resource/view/Presenter/Notes - - - NotesViewStyle - - - - - private:resource/view/Presenter/SlideSorter - - - SlideSorterViewStyle - - - - - private:resource/pane/Presenter/Overlay - - - ActivePaneStyle - - - - - private:resource/view/Presenter/Help - - - HelpViewStyle - - - - - private:resource/pane/Presenter/Pane6 - - - ActivePaneStyle - - - - - - - - - private:resource/view/Presenter/CurrentSlidePreview - - - Current Slide (%CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%) - - - Current Slide, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT% - - true - - - - Click to exit presentation... - - - - - Current Slide (end) - - - - - - - private:resource/view/Presenter/NextSlidePreview - - - Next Slide - - false - - - - private:resource/view/Presenter/ToolBar - - false - - - - private:resource/view/Presenter/Notes - - - Notes - - false - - - - private:resource/view/Presenter/SlideSorter - - false - - - - - Slide Overview, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT% - - - - - private:resource/view/Presenter/Help - - - Help - - false - - - - - - DefaultLayout - - - - - private:resource/pane/Presenter/Pane1 - - - private:resource/view/Presenter/CurrentSlidePreview - - - 0.05 - - - 0.05 - - - 0.50 - - - 0.50 - - - - - private:resource/pane/Presenter/Pane2 - - - private:resource/view/Presenter/NextSlidePreview - - - 0.60 - - - 0.05 - - - 0.35 - - - 0.35 - - - - - private:resource/pane/Presenter/Pane4 - - - private:resource/view/Presenter/ToolBar - - - 0.60 - - - 0.45 - - - 0.25 - - - 0.1 - - - - - private:resource/pane/Presenter/Pane3 - - - private:resource/view/Presenter/Notes - - - 0.05 - - - 0.60 - - - 0.9 - - - 0.35 - - - - - private:resource/pane/Presenter/Overlay - - - private:resource/view/Presenter/SlideSorter - - - 0.05 - - - 0.05 - - - 0.95 - - - 0.8 - - - - - private:resource/pane/Presenter/Pane6 - - - private:resource/view/Presenter/Help - - - 0.05 - - - 0.05 - - - 0.95 - - - 0.8 - - - - - - - - - Presenter Console - - - - - Current Slide Info - - - - - Presenter Notes - - - - - diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk deleted file mode 100644 index 44661a376d4e..000000000000 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************** -# -# 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 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/..$/..$/..$/..$/..$/..$/.. - -PRJNAME=sdext -TARGET=data_ooOfficeext -PACKAGE=org.openoffice.Office.extension -EXTENSIONNAME=PresenterScreen - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -XCSROOT=$(PRJ)$/source$/presenter -ABSXCSROOT=$(PWD)/$(PRJ)$/source$/presenter - -# --- Targets ------------------------------------------------------ - -XCUFILES= \ - PresenterScreen.xcu - -MODULEFILES= - -LOCALIZEDFILES= \ - PresenterScreen.xcu - -.INCLUDE : target.mk diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk b/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk deleted file mode 100644 index d1551ff50cc1..000000000000 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk +++ /dev/null @@ -1,44 +0,0 @@ -#************************************************************** -# -# 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 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/..$/..$/..$/..$/..$/.. - -PRJNAME=sdext -TARGET=data_ooOffice -PACKAGE=org.openoffice.Office -EXTNAME=presenter - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Targets ------------------------------------------------------ - -XCUFILES= \ - Jobs.xcu \ - ProtocolHandler.xcu - -MODULEFILES= - -LOCALIZEDFILES= - -.INCLUDE : target.mk diff --git a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs deleted file mode 100644 index 4764a643a2c9..000000000000 --- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs +++ /dev/null @@ -1,465 +0,0 @@ - - - - - - - AF - Configuration of the Presenter Screen extension. - - - - - Describes one bitmap that can be used as button icon or to paint - a pane border. - - Name of the bitmap. Used to look-up the bitmap in a container. - - - Text that is displayed together with the icon. - - - Relative file name to the bitmap for the normal icon. - - - Relative file name to the bitmap for the mouse over icon. - - - Relative file name to the bitmap for the button down icon. - - - Relative file name to the bitmap for the icon in disabled state. - - - Relative file name to the bitmap for the icon in disabled state. - - - The file name of the mask bitmap. Use red for pixel outside of - the border and blue for inside pixels. - - - - Horizontal offset to move the bitmap just outside the - window border. - 0 - - - Vertical offset to move the bitmap just outside the - window border. - 0 - - - Horizontal position of a hot spot. - - - Vertical position of a hot spot. - - - Color that is used as replacement for the bitmap when the later - can for some reason not be used. - - - Horizontal texturing mode. - - - Show texture only once - - - Repeat the texture - - - Stretch the texture to cover the paint area - - - - - Vertical texturing mode. - - - Show texture only once - - - Repeat the texture - - - Stretch the texture to cover the paint area - - - Once - - - - Four values describing the sizes of a border around a - rectangular area. - - Left border size. - - - Top border size. - - - Right border size. - - - Bottom border size. - - - - Font description. - - The name of the font family. - - - Font size. - - - Something like "Bold" or "Italic" or "Bold Italic". - - - Font color. - - - Orientation of text. Can be left, right, or centered. - - - Flush left - - - Flush right - - - Centered - - - - - Horizontal offset in relation to the anchor point. - - - Vertical offset in relation to the anchor point. - - - - - Font used for displaying the text. - - - The icon to display. - - - The text to display. - - - Action to execute when a button is triggered. - - - - - Name of the entry. May be used to have mode dependant entries. - - - Type of the entry. Examples are "Label" and "Button". - - - Description of a tool bar entry in normal mode (not selected, not mouse over) - - - Description of a tool bar entry when the mouse is over it. - - - Description of a tool bar entry when it is selected. - - - Description of a tool bar entry when it is disabled. - - - - Definition of one tool bar. - - Entries of the tool bars. - - - - - Name of the button that is used to look up the button. - - - Font used for displaying the text. - - - The icon to display. - - - The text to display. - - - Action to execute when a button is triggered. - - - - - Typically a list of keyboard key names. - - - Typically a description of the action triggered by pressing the keys on the left. - - - - Visual properties of a pane style: - the border of a pane and its title font. - - Name of the style. Used for referencing the style. - Has to be unique among pane styles and view styles - in one theme. - - - Name of the parent style. Values not supplied in this style - are taken from the parent style. Empty string or missing - mean no parent. - - - - Font used for displaying the pane title. - - - Size of the inner part of the border. - - - Size of the outer part of the border. - - - Bitmaps that are used to paint the borders of - a pane. - - - - Visual properties of a view style: - font and backround color. - - Name of the style. Used for referencing the style. - Has to be unique among pane styles and view styles - in one theme. - - - Name of the parent style. Values not supplied in this style - are taken from the parent style. Empty string or missing - mean no parent. - - - - Font used for text display inside a view. - - - Color (or bitmap) that is used to paint the - background of a view. - - - - Association of a drawing framework resource to a - style of the presenter theme. - - URL of a drawing framework resource. - - - Name of a pane style or a view style. - - - - - - - - - Association of a drawing framework resource to a - style of the presenter theme. - - URL of a drawing framework view. - - - Name of a view style. - - - Title displayed for the component. An empty or missing - title means that no title is displayed. - - - - Title displayed for the component when accessibility support is active. - An empty or missing title means that no title is displayed. - - - - When the value is false then the background is painted before the - view is painted. - false - - - List of localizable strings used by the view. - - - - Visual properties of the presenter view. The values in a theme - are hints and can be ignored. - - Name of the theme. Used for referencing the theme. - Has to be unique among all themes. The name of the - default theme is 'DefaultTheme' - - - Name of the parent theme. Values not supplied in this theme - are taken from the parent theme. Empty string or missing - 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. - - - List of pane styles. - - - List of view styles. - - - List of style associations. - - - List of additional bitmaps for example for buttons. - - - List of additional fonts. - - - - Layout of a component of the presenter screen. - - URL of a pane resource. - - - URL of a view resource that is to be displayed in - the pane. - - - Relative x position in the range of [0,1]. - - - Relative y position in the range of [0,1]. - - - Relative width in the range of [0,1]. - - - Relative height in the range of [0,1]. - - - - Layout of all components of the presenter screen. - - Name of the layout. Used for referencing the layout. - Has to be unique among all presenter layouts. - - - Name of the parent layout. Values not supplied in this layout - are taken from the parent layout. Missing or empty string - mean no parent layout. - - - - List of component layouts. - - - - - - Settings regarding controls that are only used by the Presenter - Screen. - - Set of tool bars. - - - Set of buttons. - - - Settings of scroll bars. - - Bitmaps of icons used for displaying the scroll bar. - - - - Settings of the slide sorter of the presenter screen. - - Size of the border around the current slide. - - - Bitmaps that are used to paint the border around the current - slide. - - - - Settings of help view. - - List of entries displayed in the help view. - - - - - General properties of the presenter view. - - When true then presenter screen is displayed on single screen systems - or when fullscreen presentation spans all screens. - false - - - List of available themes. - - - Name of the current theme. An empty name or the string "DefaultTheme" - specify the default theme. - DefaultTheme - - - Description of the views. - - - List of visible presenter components. - - - Name of the current layout. An empty name or the - string "DefaultLayout" specify the default layout. - DefaultLayout - - - Strings that are used make the presenter console accessible. - - - The view mode on start up of the extension. Valid values are 0 for the Preview-only mode, 1 for the notes view, 2 for the slide overview. - 0 - - - - diff --git a/set_soenv.in b/set_soenv.in index 302ac0652d1f..ef96c7d750af 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1676,7 +1676,6 @@ ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" ); ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" ); ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" ); ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" ); -ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" ); ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" ); ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" ); ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" ); -- cgit