openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1468300 [2/3] - 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/regi...
Date Tue, 16 Apr 2013 03:57:45 GMT
Propchange: openoffice/trunk/main/default_images/presenter/LabelMouseOverLeft.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/LabelMouseOverRight.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/LabelMouseOverRight.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/LabelMouseOverRight.png?p2=openoffice/trunk/main/default_images/presenter/LabelMouseOverRight.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/LabelMouseOverRight.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/LabelMouseOverRight.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownDisabled.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownDisabled.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownDisabled.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownDisabled.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownMouseOver.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownMouseOver.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownMouseOver.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownMouseOver.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownNormal.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownNormal.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownNormal.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownNormal.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownSelected.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownSelected.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownSelected.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarArrowDownSelected.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpDisabled.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpDisabled.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpDisabled.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpDisabled.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpMouseOver.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpMouseOver.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpMouseOver.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpMouseOver.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpNormal.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpNormal.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpNormal.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpNormal.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpSelected.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpSelected.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpSelected.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarArrowUpSelected.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarPagerMiddleMouseOver.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarPagerMiddleMouseOver.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarPagerMiddleMouseOver.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarPagerMiddleMouseOver.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarPagerMiddleNormal.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarPagerMiddleNormal.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarPagerMiddleNormal.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarPagerMiddleNormal.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarThumbBottomMouseOver.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarThumbBottomMouseOver.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarThumbBottomMouseOver.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarThumbBottomMouseOver.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarThumbBottomNormal.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarThumbBottomNormal.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarThumbBottomNormal.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarThumbBottomNormal.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarThumbMiddleMouseOver.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarThumbMiddleMouseOver.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarThumbMiddleMouseOver.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarThumbMiddleMouseOver.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarThumbMiddleNormal.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarThumbMiddleNormal.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarThumbMiddleNormal.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarThumbMiddleNormal.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarThumbTopMouseOver.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarThumbTopMouseOver.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarThumbTopMouseOver.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarThumbTopMouseOver.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ScrollbarThumbTopNormal.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ScrollbarThumbTopNormal.png?p2=openoffice/trunk/main/default_images/presenter/ScrollbarThumbTopNormal.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ScrollbarThumbTopNormal.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Copied: openoffice/trunk/main/default_images/presenter/ViewBackground.png (from r1468299, openoffice/trunk/main/sdext/source/presenter/bitmaps/ViewBackground.png)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/presenter/ViewBackground.png?p2=openoffice/trunk/main/default_images/presenter/ViewBackground.png&p1=openoffice/trunk/main/sdext/source/presenter/bitmaps/ViewBackground.png&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
Binary files - no diff available.

Propchange: openoffice/trunk/main/default_images/presenter/ViewBackground.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: openoffice/trunk/main/extensions.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions.lst?rev=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/extensions.lst (original)
+++ openoffice/trunk/main/extensions.lst Tue Apr 16 03:57:41 2013
@@ -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"

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=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/simpress/04/makefile.mk (original)
+++ openoffice/trunk/main/helpcontent2/source/text/simpress/04/makefile.mk Tue Apr 16 03:57:41 2013
@@ -40,7 +40,8 @@ MODULE  = simpress
 
 # this list matches the *.xhp files to process
 XHPFILES = \
-   01020000.xhp 
+   01020000.xhp \
+   presenter.xhp
 	
 # --- Targets ------------------------------------------------------
 

Copied: openoffice/trunk/main/helpcontent2/source/text/simpress/04/presenter.xhp (from r1468299, openoffice/trunk/main/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/simpress/04/presenter.xhp?p2=openoffice/trunk/main/helpcontent2/source/text/simpress/04/presenter.xhp&p1=openoffice/trunk/main/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp (original)
+++ openoffice/trunk/main/helpcontent2/source/text/simpress/04/presenter.xhp Tue Apr 16 03:57:41 2013
@@ -27,16 +27,16 @@
 
 <meta>
       <topic id="textpresenterxml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit" l10n="NEW">@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts</title>
-         <filename>/com.sun.PresenterScreen-PLATFORMID/presenter.xhp</filename>
+         <title xml-lang="en-US" id="tit" l10n="NEW">Presenter Screen Keyboard Shortcuts</title>
+         <filename>/text/simpress/04/presenter.xhp</filename>
       </topic>
    </meta>
    <body>
 <bookmark xml-lang="en-US" branch="hid/com.sun.PresenterScreen" id="bm_id3138439" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id0921200912285678"><bookmark_value>@PRESENTEREXTENSIONPRODUCTNAME@ shortcuts</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0921200912285678"><bookmark_value>Presenter Screen shortcuts</bookmark_value>
 </bookmark>
-<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the @PRESENTEREXTENSIONPRODUCTNAME@, you can use the following keys:</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">Presenter Screen Keyboard Shortcuts</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the Presenter Screen, you can use the following keys:</paragraph>
       <table id="tbl_id0921200901051232">
          <tablerow>
             <tablecell>
@@ -152,7 +152,7 @@
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104566" role="tablecontent" l10n="NEW">Show the @PRESENTEREXTENSIONPRODUCTNAME@</paragraph>
+               <paragraph xml-lang="en-US" id="par_id0921200901104566" role="tablecontent" l10n="NEW">Show the Presenter Screen</paragraph>
             </tablecell>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id0921200901104544" role="tablecontent" l10n="NEW">Ctrl-'1'</paragraph>

Modified: openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk?rev=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk (original)
+++ openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk Tue Apr 16 03:57:41 2013
@@ -234,6 +234,7 @@ 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 \

Copied: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu (from r1468299, openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu?p2=openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu&p1=openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu Tue Apr 16 03:57:41 2013
@@ -22,7 +22,7 @@
 
 
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
-<oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:package="org.openoffice.Office.extension" oor:name="PresenterScreen">
+<oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:package="org.openoffice.Office" oor:name="PresenterScreen">
   <node oor:name="PresenterScreenSettings">
     <node oor:name="ToolBars">
       <node oor:name="ToolBar" oor:op="replace">
@@ -33,7 +33,7 @@
             <node oor:name="Normal">
               <prop oor:name="Text"><value xml:lang="en-US">Previous</value></prop>
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousNormal.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlidePreviousNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:PrevSlide</value></prop>
               <node oor:name="Font">
@@ -45,7 +45,7 @@
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlidePreviousMouseOver.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -53,7 +53,7 @@
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlidePreviousDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -63,7 +63,7 @@
             <node oor:name="Normal">
               <prop oor:name="Text"><value xml:lang="en-US">Next</value></prop>
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextNormal.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonEffectNextNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:NextEffect</value></prop>
               <node oor:name="Font">
@@ -75,7 +75,7 @@
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonEffectNextMouseOver.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -83,7 +83,7 @@
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonEffectNextDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -93,7 +93,7 @@
             <node oor:name="Normal">
               <prop oor:name="Text"><value xml:lang="en-US">Notes</value></prop>
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesNormal.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowNotes</value></prop>
               <node oor:name="Font">
@@ -105,7 +105,7 @@
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesMouseOver.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -113,7 +113,7 @@
             </node>
             <node oor:name="Selected">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesSelected.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesSelected.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -122,7 +122,7 @@
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -132,7 +132,7 @@
             <node oor:name="Normal">
               <prop oor:name="Text"><value xml:lang="en-US">Slides</value></prop>
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterNormal.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowSlideSorter</value></prop>
               <node oor:name="Font">
@@ -144,7 +144,7 @@
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterMouseOver.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -152,7 +152,7 @@
             </node>
             <node oor:name="Selected">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterSelected.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterSelected.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -161,7 +161,7 @@
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -223,7 +223,7 @@
             <node oor:name="Normal">
               <prop oor:name="Text"><value xml:lang="en-US">Help</value></prop>
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpNormal.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowHelp</value></prop>
               <node oor:name="Font">
@@ -235,7 +235,7 @@
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpMouseOver.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -243,7 +243,7 @@
             </node>
             <node oor:name="Selected">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpSelected.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpSelected.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -252,7 +252,7 @@
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -277,18 +277,18 @@
             <prop oor:name="Type"><value>Button</value></prop>
             <node oor:name="Normal">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonPlusNormal.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonPlusNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:GrowNotesFont</value></prop>
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonPlusMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonPlusMouseOver.png</value></prop>
               </node>
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonPlusDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonPlusDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -297,18 +297,18 @@
             <prop oor:name="Type"><value>Button</value></prop>
             <node oor:name="Normal">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonMinusNormal.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonMinusNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShrinkNotesFont</value></prop>
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonMinusMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonMinusMouseOver.png</value></prop>
               </node>
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonMinusDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonMinusDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -342,35 +342,35 @@
       <node oor:name="Bitmaps">
         <node oor:name="up" oor:op="replace">
           <prop oor:name="Name"><value>Up</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarArrowUpNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarArrowUpMouseOver.png</value></prop>
-          <prop oor:name="DisabledFileName"><value>bitmaps/ScrollbarArrowUpDisabled.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarArrowUpNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarArrowUpMouseOver.png</value></prop>
+          <prop oor:name="DisabledFileName"><value>private:graphicrepository/presenter/ScrollbarArrowUpDisabled.png</value></prop>
         </node>
         <node oor:name="down" oor:op="replace">
           <prop oor:name="Name"><value>Down</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarArrowDownNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarArrowDownMouseOver.png</value></prop>
-          <prop oor:name="DisabledFileName"><value>bitmaps/ScrollbarArrowDownDisabled.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarArrowDownNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarArrowDownMouseOver.png</value></prop>
+          <prop oor:name="DisabledFileName"><value>private:graphicrepository/presenter/ScrollbarArrowDownDisabled.png</value></prop>
         </node>
         <node oor:name="pagervertical" oor:op="replace">
           <prop oor:name="Name"><value>PagerVertical</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarPagerMiddleNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarPagerMiddleMouseOver.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarPagerMiddleNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarPagerMiddleMouseOver.png</value></prop>
         </node>
         <node oor:name="thumbtop" oor:op="replace">
           <prop oor:name="Name"><value>ThumbTop</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarThumbTopNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarThumbTopMouseOver.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarThumbTopNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarThumbTopMouseOver.png</value></prop>
         </node>
         <node oor:name="thumbbottom" oor:op="replace">
           <prop oor:name="Name"><value>ThumbBottom</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarThumbBottomNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarThumbBottomMouseOver.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarThumbBottomNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarThumbBottomMouseOver.png</value></prop>
         </node>
         <node oor:name="thumbvertical" oor:op="replace">
           <prop oor:name="Name"><value>ThumbVertical</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarThumbMiddleNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarThumbMiddleMouseOver.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarThumbMiddleNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarThumbMiddleMouseOver.png</value></prop>
         </node>
       </node>
     </node>
@@ -383,28 +383,28 @@
       </node>
       <node oor:name="CurrentSlideBorderBitmaps">
         <node oor:name="TopLeft" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTopLeft.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideTopLeft.png</value></prop>
         </node>
         <node oor:name="Top" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTop.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideTop.png</value></prop>
         </node>
         <node oor:name="TopRight" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTopRight.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideTopRight.png</value></prop>
         </node>
         <node oor:name="Left" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideLeft.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideLeft.png</value></prop>
         </node>
         <node oor:name="Right" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideRight.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideRight.png</value></prop>
         </node>
         <node oor:name="BottomLeft" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottomLeft.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideBottomLeft.png</value></prop>
         </node>
         <node oor:name="Bottom" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottom.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideBottom.png</value></prop>
         </node>
         <node oor:name="BottomRight" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottomRight.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideBottomRight.png</value></prop>
         </node>
       </node>
     </node>
@@ -630,39 +630,39 @@
             </node>
             <node oor:name="BorderBitmapList">
               <node oor:name="Top" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderTop.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderTop.png</value></prop>
                 <prop oor:name="YOffset"><value>6</value></prop>
               </node>
               <node oor:name="TopLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderTopLeft.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderTopLeft.png</value></prop>
                 <prop oor:name="XOffset"><value>6</value></prop>
                 <prop oor:name="YOffset"><value>6</value></prop>
               </node>
               <node oor:name="TopRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderTopRight.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderTopRight.png</value></prop>
                 <prop oor:name="XOffset"><value>-6</value></prop>
                 <prop oor:name="YOffset"><value>6</value></prop>
               </node>
               <node oor:name="Left" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderLeft.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderLeft.png</value></prop>
                 <prop oor:name="XOffset"><value>6</value></prop>
               </node>
               <node oor:name="Right" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderRight.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderRight.png</value></prop>
                 <prop oor:name="XOffset"><value>-6</value></prop>
               </node>
               <node oor:name="BottomLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderBottomLeft.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderBottomLeft.png</value></prop>
                 <prop oor:name="XOffset"><value>6</value></prop>
                 <prop oor:name="YOffset"><value>-6</value></prop>
               </node>
               <node oor:name="BottomRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderBottomRight.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderBottomRight.png</value></prop>
                 <prop oor:name="XOffset"><value>-6</value></prop>
                 <prop oor:name="YOffset"><value>-6</value></prop>
               </node>
               <node oor:name="Bottom" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderBottom.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderBottom.png</value></prop>
                 <prop oor:name="YOffset"><value>-6</value></prop>
               </node>
             </node>
@@ -684,39 +684,39 @@
             </node>
             <node oor:name="BorderBitmapList">
               <node oor:name="Top" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveTop.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderActiveTop.png</value></prop>
                 <prop oor:name="YOffset"><value>6</value></prop>
               </node>
               <node oor:name="TopLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveTopLeft.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderActiveTopLeft.png</value></prop>
                 <prop oor:name="XOffset"><value>6</value></prop>
                 <prop oor:name="YOffset"><value>6</value></prop>
               </node>
               <node oor:name="TopRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveTopRight.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderActiveTopRight.png</value></prop>
                 <prop oor:name="XOffset"><value>-6</value></prop>
                 <prop oor:name="YOffset"><value>6</value></prop>
               </node>
               <node oor:name="Left" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveLeft.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderActiveLeft.png</value></prop>
                 <prop oor:name="XOffset"><value>6</value></prop>
               </node>
               <node oor:name="Right" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveRight.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderActiveRight.png</value></prop>
                 <prop oor:name="XOffset"><value>-6</value></prop>
               </node>
               <node oor:name="BottomLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottomLeft.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderActiveBottomLeft.png</value></prop>
                 <prop oor:name="XOffset"><value>6</value></prop>
                 <prop oor:name="YOffset"><value>-6</value></prop>
               </node>
               <node oor:name="BottomRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottomRight.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderActiveBottomRight.png</value></prop>
                 <prop oor:name="XOffset"><value>-6</value></prop>
                 <prop oor:name="YOffset"><value>-6</value></prop>
               </node>
               <node oor:name="Bottom" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottom.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderActiveBottom.png</value></prop>
                 <prop oor:name="YOffset"><value>-6</value></prop>
               </node>
             </node>
@@ -739,37 +739,37 @@
             </node>
             <node oor:name="BorderBitmapList">
               <node oor:name="Top" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarTop.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderToolbarTop.png</value></prop>
                 <prop oor:name="YOffset"><value>4</value></prop>
               </node>
               <node oor:name="TopLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarTopLeft.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderToolbarTopLeft.png</value></prop>
                 <prop oor:name="XOffset"><value>4</value></prop>
                 <prop oor:name="YOffset"><value>4</value></prop>
               </node>
               <node oor:name="TopRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarTopRight.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderToolbarTopRight.png</value></prop>
                 <prop oor:name="XOffset"><value>-4</value></prop>
                 <prop oor:name="YOffset"><value>4</value></prop>
               </node>
               <node oor:name="Left" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarLeft.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderToolbarLeft.png</value></prop>
                 <prop oor:name="XOffset"><value>4</value></prop>
               </node>
               <node oor:name="Right" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarRight.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderToolbarRight.png</value></prop>
                 <prop oor:name="XOffset"><value>-4</value></prop>
               </node>
               <node oor:name="BottomLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarLeft.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderToolbarLeft.png</value></prop>
                 <prop oor:name="XOffset"><value>4</value></prop>
               </node>
               <node oor:name="BottomRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarRight.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderToolbarRight.png</value></prop>
                 <prop oor:name="XOffset"><value>-4</value></prop>
               </node>
               <node oor:name="Bottom" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarBottom.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderToolbarBottom.png</value></prop>
                 <prop oor:name="YOffset"><value>-4</value></prop>
               </node>
             </node>
@@ -786,7 +786,7 @@
             </node>
             <node oor:name="BorderBitmapList">
               <node oor:name="BottomCallout" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottomCallout.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderActiveBottomCallout.png</value></prop>
                 <prop oor:name="YOffset"><value>-6</value></prop>
                 <prop oor:name="XHotSpot"><value>49</value></prop>
                 <prop oor:name="YHotSpot"><value>41</value></prop>
@@ -804,7 +804,7 @@
               </prop>
             </node>
             <node oor:name="Background">
-              <prop oor:name="NormalFileName"><value>bitmaps/ViewBackground.png</value></prop>
+              <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ViewBackground.png</value></prop>
               <prop oor:name="HorizontalTexturingMode"><value>Repeat</value></prop>
               <prop oor:name="VerticalTexturingMode"><value>Repeat</value></prop>
               <prop oor:name="ReplacementColor"><value>33000000</value></prop>
@@ -836,7 +836,7 @@
           </node>
         </node>
         <node oor:name="Background">
-          <prop oor:name="NormalFileName"><value>bitmaps/Background.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/Background.png</value></prop>
           <prop oor:name="ReplacementColor"><value>E4EFF9</value></prop>
           <prop oor:name="HorizontalTexturingMode"><value>Repeat</value></prop>
           <prop oor:name="VerticalTexturingMode"><value>Stretch</value></prop>
@@ -844,33 +844,33 @@
         <node oor:name="Bitmaps">
           <node oor:name="ButtonFrameLeft" oor:op="replace">
             <prop oor:name="Name"><value>ButtonFrameLeft</value></prop>
-            <prop oor:name="NormalFileName"><value>bitmaps/ButtonFrameLeftNormal.png</value></prop>
-            <prop oor:name="MouseOverFileName"><value>bitmaps/ButtonFrameLeftMouseOver.png</value></prop>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonFrameLeftNormal.png</value></prop>
+            <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ButtonFrameLeftMouseOver.png</value></prop>
             <prop oor:name="YOffset"><value>2</value></prop>
           </node>
           <node oor:name="ButtonFrameCenter" oor:op="replace">
             <prop oor:name="Name"><value>ButtonFrameCenter</value></prop>
-            <prop oor:name="NormalFileName"><value>bitmaps/ButtonFrameCenterNormal.png</value></prop>
-            <prop oor:name="MouseOverFileName"><value>bitmaps/ButtonFrameCenterMouseOver.png</value></prop>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonFrameCenterNormal.png</value></prop>
+            <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ButtonFrameCenterMouseOver.png</value></prop>
             <prop oor:name="YOffset"><value>2</value></prop>
           </node>
           <node oor:name="ButtonFrameRight" oor:op="replace">
             <prop oor:name="Name"><value>ButtonFrameRight</value></prop>
-            <prop oor:name="NormalFileName"><value>bitmaps/ButtonFrameRightNormal.png</value></prop>
-            <prop oor:name="MouseOverFileName"><value>bitmaps/ButtonFrameRightMouseOver.png</value></prop>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonFrameRightNormal.png</value></prop>
+            <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ButtonFrameRightMouseOver.png</value></prop>
             <prop oor:name="YOffset"><value>2</value></prop>
           </node>
           <node oor:name="LabelLeft" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverLeft.png</value></prop>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/LabelMouseOverLeft.png</value></prop>
           </node>
           <node oor:name="LabelCenter" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverCenter.png</value></prop>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/LabelMouseOverCenter.png</value></prop>
           </node>
           <node oor:name="LabelRight" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverRight.png</value></prop>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/LabelMouseOverRight.png</value></prop>
           </node>
           <node oor:name="MousePointerNextEffect" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideNextNormal.png</value></prop>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideNextNormal.png</value></prop>
           </node>
         </node>
         <node oor:name="Fonts">

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=1468300&r1=1468299&r2=1468300&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 Apr 16 03:57:41 2013
@@ -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 \

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=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/makefile.mk (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/makefile.mk Tue Apr 16 03:57:41 2013
@@ -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 \

Copied: openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs (from r1468299, openoffice/trunk/main/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs?p2=openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs&p1=openoffice/trunk/main/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs (original)
+++ openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs Tue Apr 16 03:57:41 2013
@@ -21,7 +21,7 @@
  ***********************************************************-->
 
 
-<oor:component-schema xml:lang="en-US" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:package="org.openoffice.Office.extension" oor:name="PresenterScreen">
+<oor:component-schema xml:lang="en-US" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:package="org.openoffice.Office" oor:name="PresenterScreen">
   <info>
     <author>AF</author>
     <desc>Configuration of the Presenter Screen extension.</desc>
@@ -159,6 +159,7 @@
       </prop>
     </group>
     <group oor:name="ToolBarDescription">
+      <info><desc>Describes a ToolBar.</desc></info>
       <node-ref oor:name="Font" oor:node-type="Font">
         <info><desc>Font used for displaying the text.</desc></info>
       </node-ref>
@@ -173,6 +174,7 @@
       </prop>
     </group>
     <group oor:name="ToolBarEntry">
+      <info><desc>Describes a ToolBar entry.</desc></info>
       <prop oor:name="Name" oor:type="xs:string">
         <info><desc>Name of the entry.  May be used to have mode dependant entries.</desc></info>
       </prop>
@@ -199,6 +201,7 @@
       </set>
     </group>
     <group oor:name="Button">
+      <info><desc>Describes a Button.</desc></info>
       <prop oor:name="Name" oor:type="xs:string">
         <info><desc>Name of the button that is used to look up the button.</desc></info>
       </prop>
@@ -216,6 +219,7 @@
       </prop>
     </group>
     <group oor:name="HelpEntry">
+      <info><desc>Describes a Help entry.</desc></info>
       <prop oor:name="Left" oor:type="xs:string">
         <info><desc>Typically a list of keyboard key names.</desc></info>
       </prop>
@@ -284,8 +288,9 @@
       </prop>
     </group>
     <group oor:name="PresenterString">
-      <info><desc></desc></info>
+      <info><desc>A Presenter string</desc></info>
       <prop oor:name="String" oor:type="xs:string">
+        <info><desc>The localized string.</desc></info>
       </prop>
     </group>
     <group oor:name="ViewDescription">

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=1468300&r1=1468299&r2=1468300&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 Apr 16 03:57:41 2013
@@ -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
 

Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Tue Apr 16 03:57:41 2013
@@ -175,7 +175,8 @@ my_components = \
     xmx \
     xsltdlg \
     xstor \
-    PresentationMinimizer
+    PresentationMinimizer \
+    PresenterScreen
 
 .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=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packregistry/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packregistry/makefile.mk Tue Apr 16 03:57:41 2013
@@ -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 = \

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=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Tue Apr 16 03:57:41 2013
@@ -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);

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=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Tue Apr 16 03:57:41 2013
@@ -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,

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=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/presenter/PresenterHelper.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/presenter/PresenterHelper.cxx Tue Apr 16 03:57:41 2013
@@ -35,6 +35,7 @@
 #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;
@@ -263,18 +264,17 @@ Reference<rendering::XBitmap> SAL_CALL P
 
     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();
         }
     }
 

Modified: openoffice/trunk/main/sdext/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/prj/build.lst?rev=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/prj/build.lst (original)
+++ openoffice/trunk/main/sdext/prj/build.lst Tue Apr 16 03:57:41 2013
@@ -2,9 +2,7 @@ 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\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

Modified: openoffice/trunk/main/sdext/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/prj/d.lst?rev=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/prj/d.lst (original)
+++ openoffice/trunk/main/sdext/prj/d.lst Tue Apr 16 03:57:41 2013
@@ -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

Copied: openoffice/trunk/main/sdext/source/presenter/Jobs.xcu (from r1468299, openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/Jobs.xcu?p2=openoffice/trunk/main/sdext/source/presenter/Jobs.xcu&p1=openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
    (empty)

Modified: openoffice/trunk/main/sdext/source/presenter/PresenterAccessibility.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterAccessibility.cxx?rev=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterAccessibility.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterAccessibility.cxx Tue Apr 16 03:57:41 2013
@@ -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<PresenterAccessible::Acce
     {
         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;

Modified: openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.cxx?rev=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.cxx Tue Apr 16 03:57:41 2013
@@ -25,7 +25,6 @@
 #include "precompiled_sdext.hxx"
 
 #include "PresenterBitmapContainer.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterConfigurationAccess.hxx"
 
 #include <com/sun/star/deployment/XPackageInformationProvider.hpp>
@@ -69,11 +68,9 @@ 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)
 {
@@ -82,7 +79,7 @@ PresenterBitmapContainer::PresenterBitma
     // Get access to the configuration.
     PresenterConfigurationAccess aConfiguration (
         rxComponentContext,
-        A2S("org.openoffice.Office.extension.PresenterScreen"),
+        A2S("org.openoffice.Office.PresenterScreen"),
         PresenterConfigurationAccess::READ_ONLY);
     Reference<container::XNameAccess> xBitmapList (
         aConfiguration.GetConfigurationNode(rsConfigurationBase),
@@ -100,11 +97,9 @@ 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)
 {
@@ -193,7 +188,6 @@ 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)
 {
@@ -210,7 +204,6 @@ SharedBitmapDescriptor PresenterBitmapCo
                 pBitmap = LoadBitmap(
                     xBitmapProperties,
                     rxPresenterHelper,
-                    rsBasePath,
                     rxCanvas,
                     rpDefault);
         }
@@ -237,7 +230,6 @@ void PresenterBitmapContainer::ProcessBi
     maIconContainer[sName] = LoadBitmap(
         rxProperties,
         mxPresenterHelper,
-        msBasePath,
         mxCanvas,
         SharedBitmapDescriptor());
 }
@@ -248,7 +240,6 @@ 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)
 {
@@ -268,7 +259,7 @@ SharedBitmapDescriptor PresenterBitmapCo
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::Normal,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -277,7 +268,7 @@ SharedBitmapDescriptor PresenterBitmapCo
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::MouseOver,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -286,7 +277,7 @@ SharedBitmapDescriptor PresenterBitmapCo
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::ButtonDown,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -295,7 +286,7 @@ SharedBitmapDescriptor PresenterBitmapCo
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::Disabled,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -304,7 +295,7 @@ SharedBitmapDescriptor PresenterBitmapCo
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::Mask,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(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=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.hxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterBitmapContainer.hxx Tue Apr 16 03:57:41 2013
@@ -103,14 +103,12 @@ 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);
 
@@ -125,7 +123,6 @@ 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);
 
@@ -133,7 +130,6 @@ 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;
 
@@ -145,7 +141,6 @@ 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=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterClock.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterClock.cxx Tue Apr 16 03:57:41 2013
@@ -25,7 +25,6 @@
 #include "precompiled_sdext.hxx"
 
 #include "PresenterClock.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterConfigurationAccess.hxx"
 #include "PresenterGeometryHelper.hxx"
 #include <com/sun/star/awt/InvalidateStyle.hpp>
@@ -202,7 +201,6 @@ namespace {
         void LoadBitmap (
             const OUString& rsKey,
             const ::std::vector<Any>& rValues,
-            const OUString& rsBitmapPath,
             const Reference<container::XNameAccess>& rxBitmapLoader);
         void ScaleBitmaps (void);
     };
@@ -1036,7 +1034,7 @@ void AnalogBitmapPainter::PrepareBitmaps
         // 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<container::XNameAccess> xTheme (GetTheme(aConfiguration));
@@ -1118,17 +1116,6 @@ 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);
@@ -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<Any>& rValues,
-    const OUString& rsBitmapPath,
     const Reference<container::XNameAccess>& rxBitmapLoader)
 {
     if (rValues.size() == 3)
@@ -1195,7 +1180,7 @@ void AnalogBitmapPainter::LoadBitmap (
         rValues[2] >>= pDescriptor->maOffset.Y;
 
         pDescriptor->mxBitmap = Reference<rendering::XBitmap>(
-            rxBitmapLoader->getByName(rsBitmapPath+sFileName), UNO_QUERY);
+            rxBitmapLoader->getByName(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=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterConfigurationAccess.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterConfigurationAccess.cxx Tue Apr 16 03:57:41 2013
@@ -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<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=1468300&r1=1468299&r2=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterHelpView.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterHelpView.cxx Tue Apr 16 03:57:41 2013
@@ -385,7 +385,7 @@ void PresenterHelpView::ReadHelpStrings 
     mpTextContainer.reset(new TextContainer());
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
     Reference<container::XNameAccess> xStrings (
         aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")),

Copied: openoffice/trunk/main/sdext/source/presenter/PresenterScreen.component (from r1468299, openoffice/trunk/main/sdext/source/presenter/PresenterExtensionIdentifier.txx)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterScreen.component?p2=openoffice/trunk/main/sdext/source/presenter/PresenterScreen.component&p1=openoffice/trunk/main/sdext/source/presenter/PresenterExtensionIdentifier.txx&r1=1468299&r2=1468300&rev=1468300&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterExtensionIdentifier.txx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterScreen.component Tue Apr 16 03:57:41 2013
@@ -1,5 +1,6 @@
-/**************************************************************
- * 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
  * 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,31 +8,23 @@
  * 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
+ *
+ ***********************************************************-->
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.Draw.framework.PresenterScreenJob">
+    <service name="com.sun.star.drawing.framework.PresenterScreenJob"/>
+  </implementation>
+  <implementation name="vnd.sun.star.sdext.presenter.PresenterProtocolHandler">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+</component>



Mime
View raw message