You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2013/03/26 13:50:58 UTC
svn commit: r1461094 - in /openoffice/trunk/main: ./
default_images/presenter/ helpcontent2/source/text/simpress/04/
helpcontent2/util/simpress/ officecfg/registry/data/org/openoffice/
officecfg/registry/data/org/openoffice/Office/ officecfg/registry/s...
Author: arielch
Date: Tue Mar 26 12:50:55 2013
New Revision: 1461094
URL: http://svn.apache.org/r1461094
Log:
i121873 - Revert revision 1457992, 1457161, 1457159
Added:
openoffice/trunk/main/sdext/source/presenter/PresenterComponent.cxx
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/PresenterComponent.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterComponent.hxx
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/PresenterComponent.hxx
openoffice/trunk/main/sdext/source/presenter/bitmaps/
- copied from r1457160, openoffice/trunk/main/sdext/source/presenter/bitmaps/
openoffice/trunk/main/sdext/source/presenter/bitmaps/Background.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/Background.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveBottom.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveBottom.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveTop.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveTop.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveTopRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderActiveTopRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderBottom.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderBottom.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderBottomLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderBottomLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderBottomRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderBottomRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarBottom.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarBottom.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarTop.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarTop.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderTop.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderTop.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderTopLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderTopLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderTopRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/BorderTopRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonHelpNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonHelpNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonHelpSelected.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonHelpSelected.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonMinusNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonMinusNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonMinusSelected.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonMinusSelected.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonNotesNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonNotesNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonNotesSelected.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonNotesSelected.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonPlusNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonPlusNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonPlusSelected.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonPlusSelected.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/LabelMouseOverRight.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/LabelMouseOverRight.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png
openoffice/trunk/main/sdext/source/presenter/bitmaps/ViewBackground.png
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/bitmaps/ViewBackground.png
openoffice/trunk/main/sdext/source/presenter/delzip
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/delzip
openoffice/trunk/main/sdext/source/presenter/description.xml
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/description.xml
openoffice/trunk/main/sdext/source/presenter/help/
- copied from r1457160, openoffice/trunk/main/sdext/source/presenter/help/
openoffice/trunk/main/sdext/source/presenter/help/component.txt
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/help/component.txt
openoffice/trunk/main/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk
openoffice/trunk/main/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
openoffice/trunk/main/sdext/source/presenter/manifest.xml
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/manifest.xml
openoffice/trunk/main/sdext/source/presenter/registry/
- copied from r1457160, openoffice/trunk/main/sdext/source/presenter/registry/
openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu
openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk
openoffice/trunk/main/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
- copied unchanged from r1457158, openoffice/trunk/main/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
Removed:
openoffice/trunk/main/default_images/presenter/
openoffice/trunk/main/helpcontent2/source/text/simpress/04/presenter.xhp
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
openoffice/trunk/main/sdext/source/presenter/Jobs.xcu
openoffice/trunk/main/sdext/source/presenter/PresenterScreen.component
openoffice/trunk/main/sdext/source/presenter/PresenterScreen.hrc
openoffice/trunk/main/sdext/source/presenter/PresenterScreen.src
openoffice/trunk/main/sdext/source/presenter/ProtocolHandler.xcu
openoffice/trunk/main/sdext/source/presenter/components.cxx
Modified:
openoffice/trunk/main/configure.in
openoffice/trunk/main/extensions.lst
openoffice/trunk/main/helpcontent2/source/text/simpress/04/makefile.mk
openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk
openoffice/trunk/main/officecfg/registry/data/org/openoffice/makefile.mk
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/postprocess/packregistry/makefile.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
openoffice/trunk/main/sd/source/ui/presenter/PresenterHelper.cxx
openoffice/trunk/main/sdext/prj/build.lst
openoffice/trunk/main/sdext/prj/d.lst
openoffice/trunk/main/sdext/source/presenter/PresenterAccessibility.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.hxx
openoffice/trunk/main/sdext/source/presenter/PresenterClock.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterConfigurationAccess.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterHelpView.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterScrollBar.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterSlideSorter.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterTheme.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterToolBar.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterWindowManager.cxx
openoffice/trunk/main/sdext/source/presenter/makefile.mk
openoffice/trunk/main/set_soenv.in
Modified: openoffice/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Tue Mar 26 12:50:55 2013
@@ -519,6 +519,9 @@ 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
],,)
@@ -6408,6 +6411,16 @@ 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])
@@ -6436,6 +6449,16 @@ 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])
Modified: openoffice/trunk/main/extensions.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions.lst?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/extensions.lst (original)
+++ openoffice/trunk/main/extensions.lst Tue Mar 26 12:50:55 2013
@@ -34,13 +34,13 @@
# Some extensions that are installed indepently of the language.
# the presenter console extension
-# [ language=all && ENABLE_XXX ]
-# file://XXX.oxt
+[ language=all && ENABLE_PRESENTER_SCREEN=YES ]
+ file://presenter/presenter-screen.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"
Modified: openoffice/trunk/main/helpcontent2/source/text/simpress/04/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/simpress/04/makefile.mk?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/simpress/04/makefile.mk (original)
+++ openoffice/trunk/main/helpcontent2/source/text/simpress/04/makefile.mk Tue Mar 26 12:50:55 2013
@@ -40,8 +40,7 @@ MODULE = simpress
# this list matches the *.xhp files to process
XHPFILES = \
- 01020000.xhp \
- presenter.xhp
+ 01020000.xhp
# --- Targets ------------------------------------------------------
Modified: openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk (original)
+++ openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk Tue Mar 26 12:50:55 2013
@@ -234,7 +234,6 @@ LINKLINKFILES= \
text$/simpress$/02$/13180000.xhp \
text$/simpress$/02$/13190000.xhp \
text$/simpress$/04$/01020000.xhp \
- text$/simpress$/04$/presenter.xhp \
text$/simpress$/guide$/3d_create.xhp \
text$/simpress$/guide$/animated_gif_create.xhp \
text$/simpress$/guide$/animated_gif_save.xhp \
Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk Tue Mar 26 12:50:55 2013
@@ -41,25 +41,24 @@ 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 \
- SFX.xcu \
- Scripting.xcu \
Security.xcu \
+ Scripting.xcu \
+ SFX.xcu \
TableWizard.xcu \
UI.xcu \
Views.xcu \
WebWizard.xcu \
+ FormWizard.xcu \
Writer.xcu \
+ Paths.xcu \
+ Histories.xcu
MODULEFILES= \
Accelerators-macosx.xcu \
Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/makefile.mk?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/makefile.mk (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/makefile.mk Tue Mar 26 12:50:55 2013
@@ -32,14 +32,13 @@ PACKAGE=org.openoffice
# --- Targets ------------------------------------------------------
XCUFILES= \
- FirstStartWizard.xcu \
Inet.xcu \
- Interaction.xcu \
Setup.xcu \
System.xcu \
- UserProfile.xcu \
VCL.xcu \
-
+ FirstStartWizard.xcu \
+ UserProfile.xcu \
+ Interaction.xcu
MODULEFILES= \
Inet-macosx.xcu \
Modified: openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk (original)
+++ openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk Tue Mar 26 12:50:55 2013
@@ -43,13 +43,10 @@ XCSFILES= \
Compatibility.xcs \
DataAccess.xcs \
Draw.xcs \
- Embedding.xcs \
Events.xcs \
- ExtendedColorScheme.xcs \
+ Embedding.xcs \
ExtensionDependencies.xcs \
ExtensionManager.xcs \
- FormWizard.xcs \
- Histories.xcs \
Impress.xcs \
Java.xcs \
Jobs.xcs \
@@ -57,24 +54,26 @@ 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
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Tue Mar 26 12:50:55 2013
@@ -175,8 +175,7 @@ my_components = \
xmx \
xsltdlg \
xstor \
- PresentationMinimizer \
- PresenterScreen
+ PresentationMinimizer
.IF "$(OS)" == "MACOSX"
my_components += component/vcl/vcl.macosx
Modified: openoffice/trunk/main/postprocess/packregistry/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packregistry/makefile.mk?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packregistry/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packregistry/makefile.mk Tue Mar 26 12:50:55 2013
@@ -121,10 +121,6 @@ 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 = \
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Tue Mar 26 12:50:55 2013
@@ -1350,19 +1350,6 @@ 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);
Modified: openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Tue Mar 26 12:50:55 2013
@@ -339,7 +339,6 @@ 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,
Modified: openoffice/trunk/main/sd/source/ui/presenter/PresenterHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/presenter/PresenterHelper.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/presenter/PresenterHelper.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/presenter/PresenterHelper.cxx Tue Mar 26 12:50:55 2013
@@ -35,7 +35,6 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
-#include <vcl/imagerepository.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -264,17 +263,18 @@ Reference<rendering::XBitmap> SAL_CALL P
if (pCanvas.get()!=NULL && rsURL.getLength()>0 && mpGraphicFilter.get()!=NULL)
{
- sal_Int32 nIndex = 0;
- if( rsURL.getToken( 0, '/', nIndex ).equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "private:graphicrepository" ) ) )
+ Graphic aGraphic;
+ OUString sFileName;
+ if (osl::FileBase::getSystemPathFromFileURL(rsURL, sFileName)
+ == osl::FileBase::E_None)
{
- OUString sPathName( rsURL.copy( nIndex ) );
- BitmapEx aBitmap;
- if ( ::vcl::ImageRepository::loadImage( sPathName, aBitmap, false )
- && !aBitmap.IsEmpty() )
+ if (mpGraphicFilter->ImportGraphic(aGraphic, rsURL) == GRFILTER_OK)
+ {
+ BitmapEx aBitmapEx (aGraphic.GetBitmapEx());
return cppcanvas::VCLFactory::getInstance().createBitmap(
pCanvas,
- aBitmap)->getUNOBitmap();
+ aBitmapEx)->getUNOBitmap();
+ }
}
}
Modified: openoffice/trunk/main/sdext/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/prj/build.lst?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/prj/build.lst (original)
+++ openoffice/trunk/main/sdext/prj/build.lst Tue Mar 26 12:50:55 2013
@@ -2,7 +2,9 @@ dx sdext : L10N:l10n offuh comphelper un
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 nmake - all sdext_presenter 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\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
Modified: openoffice/trunk/main/sdext/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/prj/d.lst?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/prj/d.lst (original)
+++ openoffice/trunk/main/sdext/prj/d.lst Tue Mar 26 12:50:55 2013
@@ -1,7 +1,10 @@
+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
@@ -14,18 +17,14 @@ 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\Jobs
+mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Addons
mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\ProtocolHandler
-..\%__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\Addons\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Addons
..\%__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
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterAccessibility.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterAccessibility.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterAccessibility.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterAccessibility.cxx Tue Mar 26 12:50:55 2013
@@ -462,7 +462,7 @@ public:
OUString sName (A2S("Presenter Console"));
PresenterConfigurationAccess aConfiguration (
rxContext,
- OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.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.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
PresenterConfigurationAccess::READ_ONLY);
aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String"))
>>= sName;
@@ -2249,7 +2249,7 @@ rtl::Reference<PresenterAccessible::Acce
{
PresenterConfigurationAccess aConfiguration (
rxContext,
- OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
PresenterConfigurationAccess::READ_ONLY);
aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Notes/String"))
>>= sName;
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.cxx Tue Mar 26 12:50:55 2013
@@ -25,6 +25,7 @@
#include "precompiled_sdext.hxx"
#include "PresenterBitmapContainer.hxx"
+#include "PresenterComponent.hxx"
#include "PresenterConfigurationAccess.hxx"
#include <com/sun/star/deployment/XPackageInformationProvider.hpp>
@@ -68,9 +69,11 @@ PresenterBitmapContainer::PresenterBitma
const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
+ const OUString& rsBasePath,
const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper)
: mpParentContainer(rpParentContainer),
maIconContainer(),
+ msBasePath(rsBasePath),
mxCanvas(rxCanvas),
mxPresenterHelper(rxPresenterHelper)
{
@@ -79,7 +82,7 @@ PresenterBitmapContainer::PresenterBitma
// Get access to the configuration.
PresenterConfigurationAccess aConfiguration (
rxComponentContext,
- A2S("org.openoffice.Office.PresenterScreen"),
+ A2S("org.openoffice.Office.extension.PresenterScreen"),
PresenterConfigurationAccess::READ_ONLY);
Reference<container::XNameAccess> xBitmapList (
aConfiguration.GetConfigurationNode(rsConfigurationBase),
@@ -97,9 +100,11 @@ PresenterBitmapContainer::PresenterBitma
const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
+ const OUString& rsBasePath,
const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper)
: mpParentContainer(rpParentContainer),
maIconContainer(),
+ msBasePath(rsBasePath),
mxCanvas(rxCanvas),
mxPresenterHelper(rxPresenterHelper)
{
@@ -188,6 +193,7 @@ SharedBitmapDescriptor PresenterBitmapCo
const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
const ::rtl::OUString& rsPath,
const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
+ const OUString& rsBasePath,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const SharedBitmapDescriptor& rpDefault)
{
@@ -204,6 +210,7 @@ SharedBitmapDescriptor PresenterBitmapCo
pBitmap = LoadBitmap(
xBitmapProperties,
rxPresenterHelper,
+ rsBasePath,
rxCanvas,
rpDefault);
}
@@ -230,6 +237,7 @@ void PresenterBitmapContainer::ProcessBi
maIconContainer[sName] = LoadBitmap(
rxProperties,
mxPresenterHelper,
+ msBasePath,
mxCanvas,
SharedBitmapDescriptor());
}
@@ -240,6 +248,7 @@ void PresenterBitmapContainer::ProcessBi
SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
const Reference<beans::XPropertySet>& rxProperties,
const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
+ const OUString& rsBasePath,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const SharedBitmapDescriptor& rpDefault)
{
@@ -259,7 +268,7 @@ SharedBitmapDescriptor PresenterBitmapCo
{
pBitmap->SetBitmap(
BitmapDescriptor::Normal,
- rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
+ rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
}
catch (Exception&)
{}
@@ -268,7 +277,7 @@ SharedBitmapDescriptor PresenterBitmapCo
{
pBitmap->SetBitmap(
BitmapDescriptor::MouseOver,
- rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
+ rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
}
catch (Exception&)
{}
@@ -277,7 +286,7 @@ SharedBitmapDescriptor PresenterBitmapCo
{
pBitmap->SetBitmap(
BitmapDescriptor::ButtonDown,
- rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
+ rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
}
catch (Exception&)
{}
@@ -286,7 +295,7 @@ SharedBitmapDescriptor PresenterBitmapCo
{
pBitmap->SetBitmap(
BitmapDescriptor::Disabled,
- rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
+ rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
}
catch (Exception&)
{}
@@ -295,7 +304,7 @@ SharedBitmapDescriptor PresenterBitmapCo
{
pBitmap->SetBitmap(
BitmapDescriptor::Mask,
- rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
+ rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
}
catch (Exception&)
{}
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.hxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.hxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.hxx Tue Mar 26 12:50:55 2013
@@ -103,12 +103,14 @@ public:
const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
+ const ::rtl::OUString& rsBasePath,
const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = NULL);
PresenterBitmapContainer (
const css::uno::Reference<css::container::XNameAccess>& rsRootNode,
const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
+ const ::rtl::OUString& rsBasePath,
const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = NULL);
~PresenterBitmapContainer (void);
@@ -123,6 +125,7 @@ public:
const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
const ::rtl::OUString& rsPathToBitmapNode,
const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
+ const ::rtl::OUString& rsBitmapBasePath,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const ::boost::shared_ptr<BitmapDescriptor>& rpDefaultBitmap);
@@ -130,6 +133,7 @@ private:
::boost::shared_ptr<PresenterBitmapContainer> mpParentContainer;
typedef ::std::map<rtl::OUString, ::boost::shared_ptr<BitmapDescriptor> > BitmapContainer;
BitmapContainer maIconContainer;
+ ::rtl::OUString msBasePath;
css::uno::Reference<css::rendering::XCanvas> mxCanvas;
css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
@@ -141,6 +145,7 @@ private:
static ::boost::shared_ptr<BitmapDescriptor> LoadBitmap (
const css::uno::Reference<css::beans::XPropertySet>& rxProperties,
const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
+ const ::rtl::OUString& rsBasePath,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>& rpDefault);
static BitmapDescriptor::TexturingMode
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterClock.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterClock.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterClock.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterClock.cxx Tue Mar 26 12:50:55 2013
@@ -25,6 +25,7 @@
#include "precompiled_sdext.hxx"
#include "PresenterClock.hxx"
+#include "PresenterComponent.hxx"
#include "PresenterConfigurationAccess.hxx"
#include "PresenterGeometryHelper.hxx"
#include <com/sun/star/awt/InvalidateStyle.hpp>
@@ -201,6 +202,7 @@ namespace {
void LoadBitmap (
const OUString& rsKey,
const ::std::vector<Any>& rValues,
+ const OUString& rsBitmapPath,
const Reference<container::XNameAccess>& rxBitmapLoader);
void ScaleBitmaps (void);
};
@@ -1034,7 +1036,7 @@ void AnalogBitmapPainter::PrepareBitmaps
// Get access to the clock bitmaps in the configuration.
PresenterConfigurationAccess aConfiguration (
mxComponentContext,
- OUString::createFromAscii("org.openoffice.Office.PresenterScreen"),
+ OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"),
PresenterConfigurationAccess::READ_ONLY);
Reference<container::XNameAccess> xTheme (GetTheme(aConfiguration));
@@ -1116,6 +1118,17 @@ void AnalogBitmapPainter::LoadBitmaps (
const Reference<rendering::XCanvas>& rxCanvas)
{
(void)rConfiguration;
+
+ // Get base path to bitmaps.
+ Reference<deployment::XPackageInformationProvider> 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<lang::XMultiComponentFactory> xFactory (
mxComponentContext->getServiceManager(), UNO_QUERY);
@@ -1148,6 +1161,7 @@ void AnalogBitmapPainter::LoadBitmaps (
this,
_1,
_2,
+ sLocation,
xBitmapLoader));
}
@@ -1157,6 +1171,7 @@ void AnalogBitmapPainter::LoadBitmaps (
void AnalogBitmapPainter::LoadBitmap (
const OUString& rsKey,
const ::std::vector<Any>& rValues,
+ const OUString& rsBitmapPath,
const Reference<container::XNameAccess>& rxBitmapLoader)
{
if (rValues.size() == 3)
@@ -1180,7 +1195,7 @@ void AnalogBitmapPainter::LoadBitmap (
rValues[2] >>= pDescriptor->maOffset.Y;
pDescriptor->mxBitmap = Reference<rendering::XBitmap>(
- rxBitmapLoader->getByName(sFileName), UNO_QUERY);
+ rxBitmapLoader->getByName(rsBitmapPath+sFileName), UNO_QUERY);
if ( ! pDescriptor->mxBitmap.is())
mbThemeLoadingFailed = true;
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterConfigurationAccess.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterConfigurationAccess.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterConfigurationAccess.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterConfigurationAccess.cxx Tue Mar 26 12:50:55 2013
@@ -40,7 +40,7 @@ using ::rtl::OUString;
namespace sdext { namespace presenter {
const ::rtl::OUString PresenterConfigurationAccess::msPresenterScreenRootName =
- A2S("/org.openoffice.Office.PresenterScreen/");
+ A2S("/org.openoffice.Office.extension.PresenterScreen/");
PresenterConfigurationAccess::PresenterConfigurationAccess (
const Reference<XComponentContext>& rxContext,
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterHelpView.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterHelpView.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterHelpView.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterHelpView.cxx Tue Mar 26 12:50:55 2013
@@ -385,7 +385,7 @@ void PresenterHelpView::ReadHelpStrings
mpTextContainer.reset(new TextContainer());
PresenterConfigurationAccess aConfiguration (
mxComponentContext,
- OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
PresenterConfigurationAccess::READ_ONLY);
Reference<container::XNameAccess> xStrings (
aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")),
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx Tue Mar 26 12:50:55 2013
@@ -541,7 +541,7 @@ sal_Int32 PresenterScreen::GetScreenNumb
// is set.
PresenterConfigurationAccess aConfiguration (
xContext,
- OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.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.PresenterScreen"),
+ OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"),
PresenterConfigurationAccess::READ_ONLY);
maViewDescriptors.clear();
ProcessViewDescriptions(aConfiguration);
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterScrollBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterScrollBar.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterScrollBar.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterScrollBar.cxx Tue Mar 26 12:50:55 2013
@@ -27,6 +27,7 @@
#include "PresenterScrollBar.hxx"
#include "PresenterBitmapContainer.hxx"
#include "PresenterCanvasHelper.hxx"
+#include "PresenterComponent.hxx"
#include "PresenterGeometryHelper.hxx"
#include "PresenterPaintManager.hxx"
#include "PresenterTimer.hxx"
@@ -328,7 +329,8 @@ void PresenterScrollBar::SetCanvas (cons
OUString::createFromAscii("PresenterScreenSettings/ScrollBar/Bitmaps"),
::boost::shared_ptr<PresenterBitmapContainer>(),
mxComponentContext,
- mxCanvas));
+ mxCanvas,
+ PresenterComponent::GetBasePath(mxComponentContext)));
mpSharedBitmaps = mpBitmaps;
}
catch(Exception&)
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterSlideSorter.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterSlideSorter.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterSlideSorter.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterSlideSorter.cxx Tue Mar 26 12:50:55 2013
@@ -27,6 +27,7 @@
#include "PresenterSlideSorter.hxx"
#include "PresenterButton.hxx"
#include "PresenterCanvasHelper.hxx"
+#include "PresenterComponent.hxx"
#include "PresenterGeometryHelper.hxx"
#include "PresenterHelper.hxx"
#include "PresenterPaintManager.hxx"
@@ -2060,7 +2061,7 @@ PresenterSlideSorter::CurrentSlideFrameR
{
PresenterConfigurationAccess aConfiguration (
rxContext,
- OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
PresenterConfigurationAccess::READ_ONLY);
Reference<container::XHierarchicalNameAccess> xBitmaps (
aConfiguration.GetConfigurationNode(
@@ -2073,7 +2074,8 @@ PresenterSlideSorter::CurrentSlideFrameR
A2S("PresenterScreenSettings/SlideSorter/CurrentSlideBorderBitmaps"),
::boost::shared_ptr<PresenterBitmapContainer>(),
rxContext,
- rxCanvas);
+ rxCanvas,
+ PresenterComponent::GetBasePath(rxContext));
mpTopLeft = aContainer.GetBitmap(A2S("TopLeft"));
mpTop = aContainer.GetBitmap(A2S("Top"));
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterTheme.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterTheme.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterTheme.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterTheme.cxx Tue Mar 26 12:50:55 2013
@@ -27,6 +27,7 @@
#include "PresenterTheme.hxx"
#include "PresenterBitmapContainer.hxx"
#include "PresenterCanvasHelper.hxx"
+#include "PresenterComponent.hxx"
#include "PresenterConfigurationAccess.hxx"
#include "PresenterHelper.hxx"
#include <com/sun/star/awt/Point.hpp>
@@ -101,6 +102,7 @@ public:
Reference<XComponentContext> mxComponentContext;
Reference<rendering::XCanvas> mxCanvas;
Reference<drawing::XPresenterHelper> mxPresenterHelper;
+ OUString msBasePath;
ReadContext (
const Reference<XComponentContext>& rxContext,
@@ -126,6 +128,8 @@ public:
BorderSize ReadBorderSize (const Reference<container::XNameAccess>& rxNode);
+ void SetBitmapSourceExtension (const OUString& rsExtensionName);
+
private:
Any GetByName (
const Reference<container::XNameAccess>& rxNode,
@@ -332,7 +336,7 @@ void SAL_CALL PresenterTheme::disposing
PresenterConfigurationAccess aConfiguration (
mxContext,
- OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
PresenterConfigurationAccess::READ_ONLY);
return aReadContext.ReadTheme(aConfiguration, msThemeName);
@@ -442,7 +446,7 @@ bool PresenterTheme::ConvertToColor (
::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration (
new PresenterConfigurationAccess(
mxContext,
- OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
PresenterConfigurationAccess::READ_WRITE));
// Get configuration node for the view style container of the current
@@ -745,11 +749,26 @@ 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());
@@ -772,7 +791,8 @@ void PresenterTheme::Theme::Read (
? mpParentTheme->mpIconContainer
: ::boost::shared_ptr<PresenterBitmapContainer>(),
rReadContext.mxComponentContext,
- rReadContext.mxCanvas));
+ rReadContext.mxCanvas,
+ rReadContext.msBasePath));
// Read fonts.
Reference<container::XNameAccess> xFontNode(
@@ -836,7 +856,8 @@ ReadContext::ReadContext (
const Reference<rendering::XCanvas>& rxCanvas)
: mxComponentContext(rxContext),
mxCanvas(rxCanvas),
- mxPresenterHelper()
+ mxPresenterHelper(),
+ msBasePath()
{
Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager());
if (xFactory.is())
@@ -847,6 +868,9 @@ ReadContext::ReadContext (
rxContext),
UNO_QUERY_THROW);
}
+
+ // Get base path to bitmaps.
+ SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier);
}
@@ -997,6 +1021,17 @@ BorderSize ReadContext::ReadBorderSize (
}
+
+
+void ReadContext::SetBitmapSourceExtension (const OUString& rsExtensionIdentifier)
+{
+ // Get base path to bitmaps.
+ msBasePath = PresenterComponent::GetBasePath(mxComponentContext, rsExtensionIdentifier);
+}
+
+
+
+
//===== PaneStyleContainer ====================================================
void PaneStyleContainer::Read (
@@ -1081,6 +1116,7 @@ void PaneStyleContainer::ProcessPaneStyl
: ::boost::shared_ptr<PresenterBitmapContainer>(),
rReadContext.mxComponentContext,
rReadContext.mxCanvas,
+ rReadContext.msBasePath,
rReadContext.mxPresenterHelper));
}
@@ -1239,6 +1275,7 @@ void ViewStyleContainer::ProcessViewStyl
xBackgroundNode,
OUString(),
rReadContext.mxPresenterHelper,
+ rReadContext.msBasePath,
rReadContext.mxCanvas,
SharedBitmapDescriptor()));
if (pBackground.get() != NULL && pBackground->GetNormalBitmap().is())
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterToolBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterToolBar.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterToolBar.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterToolBar.cxx Tue Mar 26 12:50:55 2013
@@ -28,6 +28,7 @@
#include "PresenterBitmapContainer.hxx"
#include "PresenterCanvasHelper.hxx"
+#include "PresenterComponent.hxx"
#include "PresenterGeometryHelper.hxx"
#include "PresenterPaintManager.hxx"
#include "PresenterPaneBase.hxx"
@@ -126,6 +127,7 @@ class PresenterToolBar::Context
: private ::boost::noncopyable
{
public:
+ ::rtl::OUString msBasePath;
Reference<drawing::XPresenterHelper> mxPresenterHelper;
css::uno::Reference<css::rendering::XCanvas> mxCanvas;
};
@@ -771,9 +773,11 @@ void PresenterToolBar::CreateControls (
// Expand the macro in the bitmap file names.
PresenterConfigurationAccess aConfiguration (
mxComponentContext,
- OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
PresenterConfigurationAccess::READ_ONLY);
+ const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext));
+
mpCurrentContainerPart.reset(new ElementContainerPart());
maElementContainer.clear();
maElementContainer.push_back(mpCurrentContainerPart);
@@ -787,6 +791,7 @@ 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()
@@ -1663,6 +1668,7 @@ void ElementMode::ReadElementMode (
xIconNode,
A2S(""),
rContext.mxPresenterHelper,
+ rContext.msBasePath,
rContext.mxCanvas,
rpDefaultMode.get()!=NULL ? rpDefaultMode->mpIcon : SharedBitmapDescriptor());
}
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterWindowManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterWindowManager.cxx?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterWindowManager.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterWindowManager.cxx Tue Mar 26 12:50:55 2013
@@ -749,7 +749,7 @@ void PresenterWindowManager::RestoreView
sal_Int32 nMode (0);
PresenterConfigurationAccess aConfiguration (
mxComponentContext,
- OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
PresenterConfigurationAccess::READ_ONLY);
aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode;
switch (nMode)
@@ -778,7 +778,7 @@ void PresenterWindowManager::StoreViewMo
{
PresenterConfigurationAccess aConfiguration (
mxComponentContext,
- OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
+ OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
PresenterConfigurationAccess::READ_WRITE);
aConfiguration.GoToChild(A2S("Presenter"));
Any aValue;
Modified: openoffice/trunk/main/sdext/source/presenter/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/makefile.mk?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/makefile.mk (original)
+++ openoffice/trunk/main/sdext/source/presenter/makefile.mk Tue Mar 26 12:50:55 2013
@@ -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,18 +7,20 @@
# 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
@@ -26,19 +28,21 @@ GEN_HID=FALSE
EXTNAME=PresenterScreen
ENABLE_EXCEPTIONS=TRUE
-
-PACKAGE=org.openoffice.Office
-ABSXCSROOT=$(SOLARXMLDIR)
-XCSROOT=..
-DTDDIR=$(ABSXCSROOT)
-XSLDIR=$(ABSXCSROOT)$/processing
-PROCESSOUT=$(MISC)$/$(TARGET)
-PROCESSORDIR=$(SOLARBINDIR)
+# survive zip dependencies
+MAXLINELENGTH:=80000
# --- 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:
@@ -48,116 +52,307 @@ PROCESSORDIR=$(SOLARBINDIR)
.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
DLLPRE=
+common_build_zip=
# --- Files -------------------------------------
-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 \
+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
# --- 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/component.map
+SHL1IMPLIB= i$(SHL1TARGET)
+SHL1LIBS= $(SLB)$/$(TARGET).lib
+SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map
SHL1RPATH= OXT
-DEF1NAME= $(SHL1TARGET)
+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) \
-# Resource files
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- $(TARGET).src \
+LINKNAME:=help
+XHPLINKSRC:=$(ZIP1DIR)/help
-SRSFILELIST=\
- $(SRS)$/$(TARGET).srs \
+my_XHPFILES= \
+ presenter.xhp
-RESLIB1NAME=$(TARGET)
-RESLIB1SRSFILES= $(SRSFILELIST)
+LINKLINKFILES= \
+ $(PACKAGE)/{$(my_XHPFILES)}
+# --- Targets ----------------------------------
-PACKAGEDIR=$(subst,.,$/ $(PACKAGE))
-SPOOLDIR=$(MISC)$/registry$/spool
-
-XCUFILES= \
- Jobs.xcu \
- ProtocolHandler.xcu
+.INCLUDE : target.mk
+.INCLUDE : extension_helplink.mk
-MYXCUFILES= \
- $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-presenterscreen.xcu \
- $(SPOOLDIR)$/$(PACKAGEDIR)$/ProtocolHandler/ProtocolHandler-presenterscreen.xcu
+$(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx
+$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx
+ $(TYPE) $< | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
-# --- Targets ----------------------------------
+$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
-.INCLUDE : target.mk
+$(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' > $@
-ALLTAR : $(MYXCUFILES)
+.IF "$(ZIP1TARGETN)"!=""
+$(ZIP1TARGETN) : $(HELPLINKALLTARGETS)
-XCU_SOURCEDIR:=.
+.ENDIF # "$(ZIP1TARGETN)"!=""
-$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-presenterscreen.xcu : $(XCU_SOURCEDIR)$/Jobs.xcu
+$(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
@-$(MKDIRHIER) $(@:d)
- @$(COPY) $< $@
+ +$(COPY) $< $@
-$(SPOOLDIR)$/$(PACKAGEDIR)$/ProtocolHandler$/ProtocolHandler-presenterscreen.xcu : $(XCU_SOURCEDIR)$/ProtocolHandler.xcu
- @-$(MKDIRHIER) $(@:d)
- @$(COPY) $< $@
+$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
-ALLTAR : $(MISC)/PresenterScreen.component
+$(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
+ @-$(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
-$(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
+.INCLUDE : extension_post.mk
.ENDIF # L10N_framework
+.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
Modified: openoffice/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1461094&r1=1461093&r2=1461094&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Tue Mar 26 12:50:55 2013
@@ -1676,6 +1676,7 @@ ToFile( "ENABLE_CAIRO", "@ENABLE_CA
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" );