Author: damjan
Date: Wed Mar 16 03:50:45 2016
New Revision: 1735184

URL: http://svn.apache.org/viewvc?rev=1735184&view=rev
Log:
Merge from branches/gbuild:
* r1409617: sd2gbuild: removed unneded Package_misc.mk
* r1409614: sd2gbuild: removed not needed effects.xsl
* r1409613: sd2gbuild: cleanup after migration to gbuild
* r1409612: sd2gbuild: migrated sd to gbuild
* r1409611: sd2gbuild: migrated sd to gbuild
* r1409608: sd2gbuild: migrated module sd to gbuild

Also updated lists of files (deleted and added by eg. sidebar)
and had to rename
main/default_images/sd/res/imagelst
to
main/default_images/sd/imglst
to get it to build with gbuild (sw did the same).

BUILDS

Build updates by: me


Added:
    openoffice/branches/gbuild-reintegration/main/default_images/sd/imglst/
      - copied from r1735183, 
openoffice/branches/gbuild-reintegration/main/default_images/sd/res/imagelst/
    openoffice/branches/gbuild-reintegration/main/sd/AllLangResTarget_sd.mk
      - copied, changed from r1409614, 
incubator/ooo/branches/gbuild/main/sd/AllLangResTarget_sd.mk
    openoffice/branches/gbuild-reintegration/main/sd/JunitTest_sd_unoapi.mk
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/JunitTest_sd_unoapi.mk
    openoffice/branches/gbuild-reintegration/main/sd/Library_sd.mk
      - copied, changed from r1409614, 
incubator/ooo/branches/gbuild/main/sd/Library_sd.mk
    openoffice/branches/gbuild-reintegration/main/sd/Library_sdd.mk
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/Library_sdd.mk
    openoffice/branches/gbuild-reintegration/main/sd/Library_sdfilt.mk
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/Library_sdfilt.mk
    openoffice/branches/gbuild-reintegration/main/sd/Library_sdui.mk
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/Library_sdui.mk
    openoffice/branches/gbuild-reintegration/main/sd/Makefile
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/Makefile
    openoffice/branches/gbuild-reintegration/main/sd/Module_sd.mk
      - copied, changed from r1409614, 
incubator/ooo/branches/gbuild/main/sd/Module_sd.mk
    openoffice/branches/gbuild-reintegration/main/sd/Package_misc.mk
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/Package_misc.mk
    openoffice/branches/gbuild-reintegration/main/sd/Package_uiconfig.mk
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/Package_uiconfig.mk
    openoffice/branches/gbuild-reintegration/main/sd/Package_xml.mk
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/Package_xml.mk
    openoffice/branches/gbuild-reintegration/main/sd/prj/makefile.mk
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/prj/makefile.mk
    
openoffice/branches/gbuild-reintegration/main/sd/source/filter/ppt/pptatom.cxx
      - copied unchanged from r1735183, 
openoffice/branches/gbuild-reintegration/main/sd/source/filter/ppt/pptatom.cpp
    openoffice/branches/gbuild-reintegration/main/sd/source/filter/sddetect.cxx
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/source/filter/sddetect.cxx
    openoffice/branches/gbuild-reintegration/main/sd/xml/sd.xml
      - copied unchanged from r1409614, 
incubator/ooo/branches/gbuild/main/sd/xml/sd.xml
Removed:
    
openoffice/branches/gbuild-reintegration/main/default_images/sd/res/imagelst/
    
openoffice/branches/gbuild-reintegration/main/sd/source/filter/ppt/pptatom.cpp
Modified:
    openoffice/branches/gbuild-reintegration/   (props changed)
    openoffice/branches/gbuild-reintegration/main/Repository.mk
    
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
    openoffice/branches/gbuild-reintegration/main/sd/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/sd/prj/d.lst
    openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/popup.src
    openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/res_bmp.src
    openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/strings.src
    openoffice/branches/gbuild-reintegration/main/sd/source/ui/dlg/ins_paste.cxx
    openoffice/branches/gbuild-reintegration/main/sd/source/ui/dlg/sdabstdlg.cxx
    openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/res_bmp.hrc
    
openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx

Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 16 03:50:45 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409579,1409582,1409584,1409586-1409587,1409589-1409600,1409602,1409604-1409607
+/incubator/ooo/branches/gbuild:1409313-1409579,1409582,1409584,1409586-1409587,1409589-1409600,1409602,1409604-1409614,1409617
 /openoffice/branches/AOO400:1503684
 /openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
 /openoffice/branches/alg_writerframes:1556289-1579189

Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Wed Mar 16 
03:50:45 2016
@@ -95,6 +95,10 @@ $(eval $(call gb_Helper_register_librari
        sw \
        swd \
        swui \
+       sd \
+       sdd \
+       sdui \
+       sdfilt \
        textconversiondlgs \
        ootk \
        tl \

Modified: 
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
 Wed Mar 16 03:50:45 2016
@@ -90,6 +90,8 @@ my_components = \
     component/vbahelper/util/msforms \
     component/sax/source/expatwrap/expwrap \
     component/sax/source/fastparser/fastsax \
+    component/sd/util/sd \
+    component/sd/util/sdd \
     component/sfx2/util/sfx \
     component/sot/util/sot \
     component/svgio/svgio \
@@ -162,9 +164,7 @@ my_components = \
     scd \
     scn \
     scriptframe \
-    sd \
     sdbc2 \
-    sdd \
     slideshow \
     spl \
     srtrs1 \

Copied: openoffice/branches/gbuild-reintegration/main/sd/AllLangResTarget_sd.mk 
(from r1409614, incubator/ooo/branches/gbuild/main/sd/AllLangResTarget_sd.mk)
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/AllLangResTarget_sd.mk?p2=openoffice/branches/gbuild-reintegration/main/sd/AllLangResTarget_sd.mk&p1=incubator/ooo/branches/gbuild/main/sd/AllLangResTarget_sd.mk&r1=1409614&r2=1735184&rev=1735184&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/AllLangResTarget_sd.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/AllLangResTarget_sd.mk Wed 
Mar 16 03:50:45 2016
@@ -57,7 +57,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/
        sd/source/ui/app/strings.src \
        sd/source/ui/dlg/animobjs.src \
        sd/source/ui/dlg/brkdlg.src \
-       sd/source/ui/dlg/celltempl.src \
        sd/source/ui/dlg/copydlg.src \
        sd/source/ui/dlg/custsdlg.src \
        sd/source/ui/dlg/dlgass.src \

Copied: openoffice/branches/gbuild-reintegration/main/sd/Library_sd.mk (from 
r1409614, incubator/ooo/branches/gbuild/main/sd/Library_sd.mk)
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/Library_sd.mk?p2=openoffice/branches/gbuild-reintegration/main/sd/Library_sd.mk&p1=incubator/ooo/branches/gbuild/main/sd/Library_sd.mk&r1=1409614&r2=1735184&rev=1735184&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Library_sd.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/Library_sd.mk Wed Mar 16 
03:50:45 2016
@@ -71,6 +71,7 @@ $(eval $(call gb_Library_add_linked_libs
        drawinglayer \
        editeng \
        i18nisolang1 \
+       ootk \
        sal \
        sb \
        sfx \
@@ -80,7 +81,6 @@ $(eval $(call gb_Library_add_linked_libs
        svt \
        svx \
        svxcore \
-       tk \
        tl \
        ucbhelper \
        utl \
@@ -280,28 +280,9 @@ $(eval $(call gb_Library_add_exception_o
        sd/source/ui/accessibility/AccessibleViewForwarder \
        sd/source/ui/accessibility/AccessibleOutlineEditSource \
        sd/source/ui/accessibility/AccessiblePageShape \
-       sd/source/ui/accessibility/AccessibleScrollPanel \
        sd/source/ui/accessibility/AccessibleSlideSorterView \
        sd/source/ui/accessibility/AccessibleSlideSorterObject \
-       sd/source/ui/accessibility/AccessibleTreeNode \
        sd/source/ui/accessibility/SdShapeTypes \
-       sd/source/ui/toolpanel/ControlContainer \
-       sd/source/ui/toolpanel/ScrollPanel \
-       sd/source/ui/toolpanel/SubToolPanel \
-       sd/source/ui/toolpanel/TitleBar \
-       sd/source/ui/toolpanel/TitledControl \
-       sd/source/ui/toolpanel/TaskPaneControlFactory \
-       sd/source/ui/toolpanel/TaskPaneFocusManager \
-       sd/source/ui/toolpanel/TaskPaneShellManager \
-       sd/source/ui/toolpanel/TaskPaneTreeNode \
-       sd/source/ui/toolpanel/ToolPanel \
-       sd/source/ui/toolpanel/ToolPanelViewShell \
-       sd/source/ui/toolpanel/ToolPanelFactory \
-       sd/source/ui/toolpanel/ToolPanelUIElement \
-       sd/source/ui/toolpanel/LayoutMenu \
-       sd/source/ui/toolpanel/TestMenu \
-       sd/source/ui/toolpanel/TestPanel \
-       sd/source/ui/toolpanel/SlideSorterCacheDisplay \
        sd/source/ui/tools/AsynchronousCall \
        sd/source/ui/tools/ConfigurationAccess \
        sd/source/ui/tools/IconCache \
@@ -312,23 +293,6 @@ $(eval $(call gb_Library_add_exception_o
        sd/source/ui/tools/SdGlobalResourceContainer \
        sd/source/ui/tools/SlotStateListener \
        sd/source/ui/tools/TimerBasedTaskExecution \
-       sd/source/ui/toolpanel/controls/AllMasterPagesSelector \
-       sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector \
-       sd/source/ui/toolpanel/controls/DocumentHelper \
-       sd/source/ui/toolpanel/controls/MasterPageObserver \
-       sd/source/ui/toolpanel/controls/MasterPagesPanel \
-       sd/source/ui/toolpanel/controls/MasterPagesSelector \
-       sd/source/ui/toolpanel/controls/MasterPageContainer \
-       sd/source/ui/toolpanel/controls/MasterPageContainerFiller \
-       sd/source/ui/toolpanel/controls/MasterPageContainerProviders \
-       sd/source/ui/toolpanel/controls/MasterPageContainerQueue \
-       sd/source/ui/toolpanel/controls/MasterPageDescriptor \
-       sd/source/ui/toolpanel/controls/PreviewValueSet \
-       sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages \
-       sd/source/ui/toolpanel/controls/RecentMasterPagesSelector \
-       sd/source/ui/toolpanel/controls/CustomAnimationPanel \
-       sd/source/ui/toolpanel/controls/SlideTransitionPanel \
-       sd/source/ui/toolpanel/controls/TableDesignPanel \
        sd/source/ui/func/fuformatpaintbrush \
        sd/source/ui/func/fuhhconv \
        sd/source/ui/func/undoheaderfooter \
@@ -465,7 +429,6 @@ $(eval $(call gb_Library_add_exception_o
        sd/source/ui/framework/factories/FullScreenPane \
        sd/source/ui/framework/factories/Pane \
        sd/source/ui/framework/factories/PresentationFactory \
-       sd/source/ui/framework/factories/TaskPanelFactory \
        sd/source/ui/framework/factories/ViewShellWrapper \
        sd/source/ui/framework/module/CenterViewFocusModule \
        sd/source/ui/framework/module/DrawModule \
@@ -486,7 +449,29 @@ $(eval $(call gb_Library_add_exception_o
        sd/source/ui/presenter/PresenterPreviewCache \
        sd/source/ui/presenter/PresenterTextView \
        sd/source/ui/presenter/SlideRenderer \
+       sd/source/ui/sidebar/AllMasterPagesSelector \
+       sd/source/ui/sidebar/CurrentMasterPagesSelector \
+       sd/source/ui/sidebar/CustomAnimationPanel \
+       sd/source/ui/sidebar/DocumentHelper \
+       sd/source/ui/sidebar/LayoutMenu \
+       sd/source/ui/sidebar/MasterPageContainer \
+       sd/source/ui/sidebar/MasterPageContainerFiller \
+       sd/source/ui/sidebar/MasterPageContainerProviders \
+       sd/source/ui/sidebar/MasterPageContainerQueue \
+       sd/source/ui/sidebar/MasterPageDescriptor \
+       sd/source/ui/sidebar/MasterPageObserver \
+       sd/source/ui/sidebar/MasterPagesSelector \
+       sd/source/ui/sidebar/NavigatorWrapper \
+       sd/source/ui/sidebar/PanelBase \
+       sd/source/ui/sidebar/PanelFactory \
+       sd/source/ui/sidebar/PreviewValueSet \
+       sd/source/ui/sidebar/RecentlyUsedMasterPages \
+       sd/source/ui/sidebar/RecentMasterPagesSelector \
+       sd/source/ui/sidebar/SlideTransitionPanel \
 ))
+# SIDEBAR_TO_BE_REMOVED
+# sd/source/ui/accessibility/AccessibleScrollPanel.cxx
+# sd/source/ui/accessibility/AccessibleTreeNode
 
 # the following source file can't be compiled with optimization by some 
compilers (crash or endless loop):
 # Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC

Copied: openoffice/branches/gbuild-reintegration/main/sd/Module_sd.mk (from 
r1409614, incubator/ooo/branches/gbuild/main/sd/Module_sd.mk)
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/Module_sd.mk?p2=openoffice/branches/gbuild-reintegration/main/sd/Module_sd.mk&p1=incubator/ooo/branches/gbuild/main/sd/Module_sd.mk&r1=1409614&r2=1735184&rev=1735184&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/Module_sd.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/Module_sd.mk Wed Mar 16 
03:50:45 2016
@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,sd,\
        Library_sdui \
        Library_sdd \
        Library_sdfilt \
-       Package_misc \
        Package_uiconfig \
        Package_xml \
 ))

Modified: openoffice/branches/gbuild-reintegration/main/sd/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/prj/build.lst?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/prj/build.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/prj/build.lst Wed Mar 16 
03:50:45 2016
@@ -1,47 +1,2 @@
 sd      sd      :    filter L10N:l10n animations svx sfx2 stoc canvas 
LIBXSLT:libxslt NULL
-sd     sd                                                                      
        usr1    -       all     sd_mkout NULL
-sd     sd\inc                                                                  
nmake           -       all     sd_inc NULL
-sd     sd\prj                                                                  
get             -       all     sd_prj NULL
-sd     sd\source\ui\inc                                                get     
        -       all     sd_sinc NULL
-sd     sd\res                                                                  
get             -       all     sd_res NULL
-sd     sd\res\imagelst                                                 get     
        -       all     sd_resil NULL
-sd     sd\sdi                                                                  
nmake   -       all     sd_sdi NULL
-sd     sd\source\helper                                                nmake   
-       all sd_helper sd_inc NULL
-sd     sd\source\ui\func                                               nmake   
-       all     sd_func sd_sdi sd_inc NULL
-sd     sd\source\ui\view                                               nmake   
-       all     sd_view sd_sdi sd_inc NULL
-sd     sd\source\ui\app                                                nmake   
-       all     sd_app sd_sdi sd_inc NULL
-sd     sd\source\ui\dlg                                                nmake   
-       all     sd_dlg sd_sdi sd_inc NULL
-sd     sd\source\core                                                  nmake   
-       all     sd_core sd_sdi sd_inc NULL
-sd     sd\source\core\undo                                             nmake   
-       all     sd_undo sd_core sd_inc NULL
-sd     sd\source\core\text                                             nmake   
-       all sd_text sd_inc NULL
-sd     sd\source\core\annotations                              nmake   -       
all sd_annotations sd_inc NULL
-sd     sd\source\ui\docshell                                   nmake   -       
all     sd_docsh sd_sdi sd_inc NULL
-sd     sd\source\ui\unoidl                                             nmake   
-       all     sd_unid sd_sdi sd_inc NULL
-sd     sd\source\ui\accessibility                              nmake   -       
all     sd_accessibility sd_inc NULL
-sd     sd\source\ui\tools                                      nmake   -       
all     sd_tools sd_inc NULL
-sd     sd\source\ui\sidebar                            nmake   -       all     
sd_sidebar sd_sdi sd_inc NULL
-sd     sd\source\ui\slidesorter\shell                  nmake   -       all     
sd_slsshell sd_sdi sd_inc NULL
-sd     sd\source\ui\slidesorter\model                  nmake   -       all     
sd_slsmodel sd_inc NULL
-sd     sd\source\ui\slidesorter\view                   nmake   -       all     
sd_slsview sd_inc NULL
-sd     sd\source\ui\slidesorter\controller             nmake   -       all     
sd_slscontroller sd_sdi sd_inc NULL
-sd     sd\source\ui\slidesorter\cache                  nmake   -       all     
sd_slscache sd_inc NULL
-sd     sd\source\ui\controller                                 nmake   -       
all     sd_controller sd_inc NULL
-sd     sd\source\ui\notes                                              nmake   
-       all     sd_notes sd_inc NULL
-sd     sd\source\ui\table                                              nmake   
-       all     sd_table sd_sdi sd_inc NULL
-sd     sd\source\filter\ppt                                    nmake   -       
all     sd_ppt sd_inc NULL
-sd     sd\source\filter                                                nmake   
-       all     sd_filt sd_sdi sd_ppt sd_inc NULL
-sd     sd\source\filter\cgm                                    nmake   -       
all     sd_cgm sd_inc NULL
-sd     sd\source\filter\eppt                                   nmake   -       
all     sd_eppt sd_inc NULL
-sd     sd\source\filter\grf                                    nmake   -       
all     sd_grf sd_inc NULL
-sd     sd\source\filter\xml                                    nmake   -       
all     sd_xml sd_inc NULL
-sd     sd\source\filter\html                                   nmake   -       
all     sd_html sd_inc NULL
-sd     sd\source\ui\animations                                 nmake   -       
all sd_animations sd_inc NULL
-sd     sd\source\ui\slideshow                                  nmake   -       
all sd_slideshow sd_sdi sd_inc NULL
-sd     sd\source\ui\presenter                  nmake   -       all 
sd_presenter sd_inc NULL
-sd     sd\source\ui\framework\configuration    nmake   -       all 
sd_framework_configuration sd_inc NULL
-sd     sd\source\ui\framework\module           nmake   -       all 
sd_framework_module sd_inc NULL
-sd     sd\source\ui\framework\factories        nmake   -       all 
sd_framework_factories sd_inc NULL
-sd     sd\source\ui\framework\tools            nmake   -       all 
sd_framework_tools sd_inc NULL
-sd     sd\source\ui\annotations                                nmake   -       
all sd_uiannotations sd_inc NULL
-sd     sd\util                                                                 
nmake   -       all     sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt 
sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility 
sd_animations sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller 
sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo 
sd_helper sd_framework_configuration sd_framework_module sd_framework_tools 
sd_framework_factories sd_text sd_annotations sd_uiannotations sd_sidebar NULL
-sd sd\qa\unoapi nmake - all sd_qa_unoapi NULL
+sd sd\prj nmake - all sd_prj   NULL

Modified: openoffice/branches/gbuild-reintegration/main/sd/prj/d.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/prj/d.lst?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/prj/d.lst Wed Mar 16 
03:50:45 2016
@@ -48,12 +48,6 @@ mkdir: %_DEST%\inc%_EXT%\sd
 
 ..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
 
-..\uiconfig\sdraw\menubar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar\*.xml
-..\uiconfig\simpress\menubar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar\*.xml
-..\uiconfig\sdraw\toolbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar\*.xml
-..\uiconfig\simpress\toolbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar\*.xml
-..\uiconfig\sdraw\statusbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar\*.xml
-..\uiconfig\simpress\statusbar\*.xml 
%_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar\*.xml
 
 ..\%__SRC%\misc\sd.component %_DEST%\xml%_EXT%\sd.component
 ..\%__SRC%\misc\sdd.component %_DEST%\xml%_EXT%\sdd.component

Modified: 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/popup.src
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/popup.src?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/popup.src 
(original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/popup.src 
Wed Mar 16 03:50:45 2016
@@ -21,19 +21,2705 @@
 
 
 
- // TEXTOBJ
- // Impress:
-#include "popup2.src"
- // Draw (Graphic):
-#undef SD_POPUP
-#define SD_POPUP RID_GRAPHIC_TEXTOBJ_POPUP
-#include "popup2.src"
-#ifndef _GLOBLMN_HRC
+#define DEFINE_SLOTID_FOR_NUMBER_BULLETS       SID_OUTLINE_BULLET
+
+#include <svx/dialogs.hrc>
 #include <svx/globlmn.hrc>
-#endif
+
+#include "app.hrc"
 #include "helpids.h"
+#include "res_bmp.hrc"
+
+#define SEPARATOR       MenuItem { Separator = TRUE; };
+#define DUMMY 333
+
+// 
------------------------------------------------------------------------------------------------
+// slot defines
+// 
------------------------------------------------------------------------------------------------
+
+ #define MN_CHANGEBEZIER \
+    MenuItem\
+    {\
+        Identifier = SID_CHANGEBEZIER ; \
+        HelpId = CMD_SID_CHANGEBEZIER ; \
+        Text [ en-US ] = "To ~Curve" ; \
+       };
+
+#define MN_CHANGEPOLYGON \
+    MenuItem\
+    {\
+        Identifier = SID_CHANGEPOLYGON ; \
+        HelpId = CMD_SID_CHANGEPOLYGON ; \
+        Text [ en-US ] = "To ~Polygon" ; \
+       };
+
+#define MN_CONVERT_TO_CONTOUR \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_CONTOUR ; \
+        HelpId = CMD_SID_CONVERT_TO_CONTOUR ; \
+               Text [ en-US ] = "To C~ontour";\
+       };
+
+#define MN_CONVERT_TO_3D \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_3D ; \
+        HelpId = CMD_SID_CONVERT_TO_3D ; \
+        Text [ en-US ] = "To 3~D" ; \
+       };
+
+#define MN_CONVERT_TO_BITMAP \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_BITMAP ; \
+        HelpId = CMD_SID_CONVERT_TO_BITMAP ; \
+        Text [ en-US ] = "To ~Bitmap" ; \
+       };
+
+#define MN_CONVERT_TO_METAFILE \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_METAFILE ; \
+        HelpId = CMD_SID_CONVERT_TO_METAFILE ; \
+        Text [ en-US ] = "To ~Metafile" ; \
+       };
+
+#define MN_CONVERT_TO_3D_LATHE_FAST \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_3D_LATHE_FAST ; \
+        HelpId = CMD_SID_CONVERT_TO_3D_LATHE_FAST ; \
+        Text [ en-US ] = "To 3D ~Rotation Object" ; \
+       };
+
+#define MN_VERTICAL \
+    MenuItem\
+    {\
+        Identifier = SID_VERTICAL ; \
+        HelpId = CMD_SID_VERTICAL ; \
+        Text [ en-US ] = "~Vertically" ; \
+       };
+
+#define MN_HORIZONTAL \
+    MenuItem\
+    {\
+        Identifier = SID_HORIZONTAL ; \
+        HelpId = CMD_SID_HORIZONTAL ; \
+        Text [ en-US ] = "~Horizontally" ; \
+       };
+
+#define MN_3D_WIN \
+    MenuItem\
+    {\
+        Identifier = SID_3D_WIN ; \
+        HelpId = CMD_SID_3D_WIN ; \
+        Text [ en-US ] = "~3D Effects" ; \
+       };
+
+#define MN_PRESENTATION_LAYOUT \
+    MenuItem\
+    {\
+        Identifier = SID_PRESENTATION_LAYOUT ; \
+        HelpId = CMD_SID_PRESENTATION_LAYOUT ; \
+        Text [ en-US ] = "~Slide Design" ; \
+       };
+
+#define MN_DIA \
+    MenuItem\
+    {\
+        Identifier = SID_SLIDE_TRANSITIONS_PANEL ; \
+        HelpId = CMD_SID_SLIDE_TRANSITIONS_PANEL ; \
+        Text [ en-US ] = "Slide ~Transition" ; \
+       };
+
+#define MN_SHOW_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_SHOW_SLIDE ; \
+        HelpId = CMD_SID_SHOW_SLIDE ; \
+        Text [ en-US ] = "~Show Slide" ; \
+       };
+
+#define MN_HIDE_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_HIDE_SLIDE ; \
+        HelpId = CMD_SID_HIDE_SLIDE ; \
+        Text [ en-US ] = "~Hide Slide" ; \
+       };
+
+#define MN_GROUP_IMPRESS \
+    MenuItem\
+    {\
+        Identifier = SID_GROUP ; \
+        HelpId = CMD_SID_GROUP ; \
+        Text [ en-US ] = "~Group" ; \
+       };
+
+#define MN_UNGROUP_IMPRESS \
+    MenuItem\
+    {\
+        Identifier = SID_UNGROUP ; \
+        HelpId = CMD_SID_UNGROUP ; \
+        Text [ en-US ] = "~Ungroup" ; \
+       };
+
+#define MN_ENTER_GROUP_IMPRESS \
+    MenuItem\
+    {\
+        Identifier = SID_ENTER_GROUP ; \
+        HelpId = CMD_SID_ENTER_GROUP ; \
+        Text [ en-US ] = "~Edit Group" ; \
+       };
+
+#define MN_LEAVE_GROUP_IMPRESS \
+    MenuItem\
+    {\
+        Identifier = SID_LEAVE_GROUP ; \
+        HelpId = CMD_SID_LEAVE_GROUP ; \
+        Text [ en-US ] = "E~xit group" ; \
+       };
+
+#define MNSUB_GROUP \
+    MenuItem\
+    {\
+        Identifier = MN_SUB_GROUP ; \
+        HelpID = HID_MN_SUB_GROUP ; \
+        Command = ".uno:GroupMenu" ; \
+        Text [ en-US ] = "~Group" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_GROUP_IMPRESS\
+                MN_UNGROUP_IMPRESS\
+                MN_ENTER_GROUP_IMPRESS\
+                MN_LEAVE_GROUP_IMPRESS\
+            };\
+        };\
+       };
+
+#define MN_DISTRIBUTE \
+    MenuItem\
+    {\
+        Identifier = SID_DISTRIBUTE_DLG ; \
+        HelpId = CMD_SID_DISTRIBUTE_DLG ; \
+        Text [ en-US ] = "~Distribution..." ; \
+       };
+
+#define MN_DRAWINGMODE \
+    MenuItem\
+    {\
+        Identifier = SID_DRAWINGMODE ; \
+        HelpId = CMD_SID_DRAWINGMODE ; \
+        Check = TRUE ; \
+        Text [ en-US ] = "~Drawing View" ; \
+       };
+
+#define MN_OUTLINEMODE \
+    MenuItem\
+    {\
+        Identifier = SID_OUTLINEMODE ; \
+        HelpId = CMD_SID_OUTLINEMODE ; \
+        Check = TRUE ; \
+        Text [ en-US ] = "~Outline View" ; \
+       };
+
+#define MN_DIAMODE \
+    MenuItem\
+    {\
+        Identifier = SID_DIAMODE ; \
+        HelpId = CMD_SID_DIAMODE ; \
+        Check = TRUE ; \
+        Text [ en-US ] = "~Slide Sorter" ; \
+       };
+
+#define MN_PRESENTATION \
+    MenuItem\
+    {\
+        Identifier = SID_PRESENTATION ; \
+        HelpId = CMD_SID_PRESENTATION ; \
+        Text [ en-US ] = "Slide Sho~w" ; \
+       };
+
+#define MN_CAPTUREPOINT \
+    MenuItem\
+    {\
+        Identifier = SID_CAPTUREPOINT ; \
+        HelpId = CMD_SID_CAPTUREPOINT ; \
+        Text [ en-US ] = "~Insert Snap Point/Line..." ; \
+       };
+
+#define MN_SET_SNAPITEM \
+    MenuItem\
+    {\
+        Identifier = SID_SET_SNAPITEM ; \
+        HelpId = CMD_SID_SET_SNAPITEM ; \
+        Text [ en-US ] = "~Edit..." ; \
+       };
+
+#define MN_DELETE_SNAPITEM \
+    MenuItem\
+    {\
+        Identifier = SID_DELETE_SNAPITEM ; \
+        HelpId = CMD_SID_DELETE_SNAPITEM ; \
+        Text [ en-US ] = "~Delete" ; \
+       };
+
+ // Seiten-Attribute
+#define MN_MODIFY_PAGE \
+    MenuItem\
+    {\
+        Identifier = SID_MODIFYPAGE ; \
+        HelpId = CMD_SID_MODIFYPAGE ; \
+        Text [ en-US ] = "Slide ~Layout" ; \
+       };
+
+#define MN_FORMAT_PAGE \
+    MenuItem\
+    {\
+        Identifier = SID_PAGESETUP ; \
+        HelpId = CMD_SID_PAGESETUP ; \
+        Text [ en-US ] = "~Page Setup..." ; \
+       };
+
+
+#define MN_INSERT_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_INSERTPAGE ; \
+        HelpId = CMD_SID_INSERTPAGE ; \
+        Text [ en-US ] = "~New Slide" ; \
+    };
+
+#define MN_INSERT_MASTER \
+    MenuItem\
+    {\
+        Identifier = SID_INSERT_MASTER_PAGE ; \
+        HelpId = CMD_SID_INSERT_MASTER_PAGE ; \
+        Text [ en-US ] = "~New Master" ; \
+    };
+
+#define MN_INSERT_PAGE \
+    MenuItem\
+    {\
+        Identifier = SID_INSERTPAGE ; \
+        HelpId = CMD_SID_INSERTPAGE ; \
+        Text [ en-US ] = "~New Page" ; \
+    };
+#define MN_SELECT_BACKGROUND \
+    MenuItem\
+    {\
+        Identifier = SID_SELECT_BACKGROUND ; \
+        HelpId = CMD_SID_SELECT_BACKGROUND ; \
+        Text [ en-US ] = "Set Background Picture for Slide ..." ; \
+    };
+#define MN_DISPLAY_MASTER_BACKGROUND \
+    MenuItem\
+    {\
+        Identifier = SID_DISPLAY_MASTER_BACKGROUND ; \
+        HelpId = CMD_SID_DISPLAY_MASTER_BACKGROUND ; \
+        Text [ en-US ] = "Display Background of Master" ; \
+    };
+#define MN_DISPLAY_MASTER_OBJECTS \
+    MenuItem\
+    {\
+        Identifier = SID_DISPLAY_MASTER_OBJECTS ; \
+        HelpId = CMD_SID_DISPLAY_MASTER_OBJECTS ; \
+        Text [ en-US ] = "Display Objects from Master" ; \
+    };
+
+
+#define MN_PAGE_MENU \
+    MenuItem\
+    {\
+        Identifier = DUMMY + 3 ; \
+        Command = ".uno:PageMenu" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_FORMAT_PAGE\
+                MN_PRESENTATION_LAYOUT\
+                               MN_RENAME_PAGE\
+                SEPARATOR\
+                MN_INSERT_PAGE\
+                MN_DELETE_PAGE\
+            };\
+        };\
+        Text [ en-US ] = "Pag~e" ; \
+       };
+
+#define MN_SLIDE_MENU \
+    MenuItem\
+    {\
+        Identifier = DUMMY + 8 ; \
+        Command = ".uno:PageMenu" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_FORMAT_PAGE\
+                MN_PRESENTATION_LAYOUT\
+                MN_MODIFY_PAGE\
+                MN_SELECT_BACKGROUND\
+                               MN_RENAME_SLIDE\
+                SEPARATOR\
+                MN_DISPLAY_MASTER_BACKGROUND\
+                MN_DISPLAY_MASTER_OBJECTS\
+                SEPARATOR\
+                MN_INSERT_SLIDE\
+                MN_DELETE_SLIDE\
+            };\
+        };\
+        Text [ en-US ] = "Slid~e" ; \
+       };
+
+ // Layer
+#define MN_RENAME_LAYER \
+    MenuItem\
+    {\
+        Identifier = SID_RENAMELAYER ; \
+        HelpId = CMD_SID_RENAMELAYER ; \
+        Text [ en-US ] = "~Rename Layer..." ; \
+       };
+
+#define MN_DELETE_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_DELETE_PAGE ; \
+        HelpId = CMD_SID_DELETE_PAGE ; \
+        Text [ en-US ] = "D~elete Slide" ; \
+    };
+
+#define MN_DELETE_MASTER \
+    MenuItem\
+    {\
+        Identifier = SID_DELETE_MASTER_PAGE ; \
+        HelpId = CMD_SID_DELETE_MASTER_PAGE ; \
+        Text [ en-US ] = "D~elete Master" ; \
+    };
+
+
+
+#define MN_DELETE_PAGE \
+    MenuItem\
+    {\
+        Identifier = SID_DELETE_PAGE ; \
+        HelpId = CMD_SID_DELETE_PAGE ; \
+        Text [ en-US ] = "D~elete Page" ; \
+       };
+
+#define MN_RENAME_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_RENAMEPAGE ; \
+        HelpId = CMD_SID_RENAMEPAGE ; \
+        Text [ en-US ] = "~Rename Slide" ; \
+    };
+
+#define MN_RENAME_MASTER \
+    MenuItem\
+    {\
+        Identifier = SID_RENAME_MASTER_PAGE ; \
+        HelpId = CMD_SID_RENAME_MASTER_PAGE ; \
+        Text [ en-US ] = "~Rename Master" ; \
+    };
+
+#define MN_RENAME_PAGE \
+    MenuItem\
+    {\
+        Identifier = SID_RENAMEPAGE ; \
+        HelpId = CMD_SID_RENAMEPAGE ; \
+        Text [ en-US ] = "~Rename Page" ; \
+    };
+
+ // Grafik-Attribute
+#define MN_LINE \
+    MenuItem\
+    {\
+        Identifier = SID_ATTRIBUTES_LINE ; \
+        HelpId = CMD_SID_ATTRIBUTES_LINE ; \
+        Text [ en-US ] = "L~ine..." ; \
+       };
+
+#define MN_AREA \
+    MenuItem\
+    {\
+        Identifier = SID_ATTRIBUTES_AREA ; \
+        HelpId = CMD_SID_ATTRIBUTES_AREA ; \
+        Text [ en-US ] = "~Area..." ; \
+       };
+
+#define MN_TEXTATTR \
+    MenuItem\
+    {\
+        Identifier = SID_TEXTATTR_DLG ; \
+        HelpId = CMD_SID_TEXTATTR_DLG ; \
+        Text [ en-US ] = "~Text..." ; \
+       };
+
+#define MN_CONNECTION \
+    MenuItem\
+    {\
+        Identifier = SID_CONNECTION_DLG ; \
+        HelpId = CMD_SID_CONNECTION_DLG ; \
+        Text [ en-US ] = "~Connector..." ; \
+       };
+
+#define MN_NEW_ROUTING \
+    MenuItem\
+    {\
+        Identifier = SID_CONNECTION_NEW_ROUTING ; \
+        HelpId = CMD_SID_CONNECTION_NEW_ROUTING ; \
+        Text [ en-US ] = "Reset ~Routing" ; \
+       };
+
+#define MN_MEASURE \
+    MenuItem\
+    {\
+        Identifier = SID_MEASURE_DLG ; \
+        HelpId = CMD_SID_MEASURE_DLG ; \
+        Text [ en-US ] = "Dimen~sions..." ; \
+       };
+
+#define MN_TRANSFORM \
+    MenuItem\
+    {\
+        Identifier = SID_ATTR_TRANSFORM ; \
+        HelpId = CMD_SID_ATTR_TRANSFORM ; \
+        Text [ en-US ] = "Position and Si~ze..." ; \
+       };
+
+#define MN_EDIT_POINTS \
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_EDIT ; \
+        HelpId = CMD_SID_BEZIER_EDIT ; \
+        Text [ en-US ] = "Edit ~Points" ; \
+       };
+
+ // Anordnung
+#define MN_POSITION \
+    MenuItem\
+    {\
+        Identifier = SID_POSITION ; \
+        HelpId = CMD_SID_POSITION ; \
+        Command = ".uno:ObjectPosition"; \
+        Text [ en-US ] = "Arra~nge" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_FRAME_TO_TOP ; \
+                    HelpId = CMD_SID_FRAME_TO_TOP ; \
+                    Text [ en-US ] = "~Bring to Front" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_MOREFRONT ; \
+                    HelpId = CMD_SID_MOREFRONT ; \
+                    Text [ en-US ] = "Bring ~Forward" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_MOREBACK ; \
+                    HelpId = CMD_SID_MOREBACK ; \
+                    Text [ en-US ] = "Send Back~ward" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_FRAME_TO_BOTTOM ; \
+                    HelpId = CMD_SID_FRAME_TO_BOTTOM ; \
+                    Text [ en-US ] = "~Send to Back" ; \
+                               };\
+                MenuItem\
+                {\
+                    Separator = TRUE ; \
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_BEFORE_OBJ ; \
+                    HelpId = CMD_SID_BEFORE_OBJ ; \
+                    Text [ en-US ] = "In Front of ~Object" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_BEHIND_OBJ ; \
+                    HelpId = CMD_SID_BEHIND_OBJ ; \
+                    Text [ en-US ] = "Be~hind Object" ; \
+                               };\
+                MenuItem\
+                {\
+                    Separator = TRUE ; \
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_REVERSE_ORDER ; \
+                    HelpId = CMD_SID_REVERSE_ORDER ; \
+                    Text [ en-US ] = "~Reverse" ; \
+                               };\
+            };\
+        };\
+       };
+
+ // Text-Elemente
+#define MN_CHAR \
+    MenuItem\
+    {\
+        Identifier = SID_CHAR_DLG ; \
+        HelpId = CMD_SID_CHAR_DLG ; \
+        Text [ en-US ] = "C~haracter..." ; \
+       };
+
+#define MN_CHAR_PARAGRAPH \
+    MN_CHAR \
+    MenuItem {\
+        Identifier = SID_PARA_DLG;\
+        HelpId = CMD_SID_PARA_DLG;\
+        Text [ en-US ] = "P~aragraph...";\
+       };
+
+#define MN_TEXT_ATTR\
+    MenuItem\
+    {\
+        Identifier = SID_ATTR_CHAR_FONT ; \
+        HelpId = CMD_SID_ATTR_CHAR_FONT ; \
+        Text [ en-US ] = "~Font" ; \
+       };\
+    MenuItem\
+    {\
+        Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \
+        HelpId = CMD_SID_ATTR_CHAR_FONTHEIGHT ; \
+        Text [ en-US ] = "~Size" ; \
+       };\
+    MenuItem\
+    {\
+        Identifier = DUMMY ; \
+        Command = ".uno:StyleMenu" ; \
+        Text [ en-US ] = "St~yle" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_WEIGHT ; \
+                    HelpId = CMD_SID_ATTR_CHAR_WEIGHT ; \
+                    Text [ en-US ] = "Bold" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_POSTURE ; \
+                    HelpId = CMD_SID_ATTR_CHAR_POSTURE ; \
+                    Text [ en-US ] = "Italic" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_OVERLINE ; \
+                    HelpId = CMD_SID_ATTR_CHAR_OVERLINE ; \
+                    Text [ en-US ] = "Overline" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_UNDERLINE ; \
+                    HelpId = CMD_SID_ATTR_CHAR_UNDERLINE ; \
+                    Text [ en-US ] = "Underline" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_STRIKEOUT ; \
+                    HelpId = CMD_SID_ATTR_CHAR_STRIKEOUT ; \
+                    Text [ en-US ] = "Strikethrough" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_SHADOWED ; \
+                    HelpId = CMD_SID_ATTR_CHAR_SHADOWED ; \
+                    Text [ en-US ] = "Shadow" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_CONTOUR ; \
+                    HelpId = CMD_SID_ATTR_CHAR_CONTOUR ; \
+                    Text [ en-US ] = "~Contour" ; \
+                               };\
+            };\
+        };\
+       };
+
+#define MN_LINESPACING_ATTR\
+    MenuItem\
+    {\
+        Identifier = DUMMY + 1 ; \
+        Command = ".uno:LineSpacingMenu" ; \
+        Text [ en-US ] = "~Line Spacing" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_LINESPACE_10 ; \
+                    HelpId = CMD_SID_ATTR_PARA_LINESPACE_10 ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "Single Line Spacing" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_LINESPACE_15 ; \
+                    HelpId = CMD_SID_ATTR_PARA_LINESPACE_15 ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "1.5 Lines" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_LINESPACE_20 ; \
+                    HelpId = CMD_SID_ATTR_PARA_LINESPACE_20 ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "~Double" ; \
+                               };\
+            };\
+        };\
+       };
+
+#define MN_BULLET \
+    MenuItem\
+    {\
+        Identifier = SID_CHARMAP ; \
+        HelpId = CMD_SID_CHARMAP ; \
+        Text [ en-US ] = "S~pecial Character..." ; \
+       };
+
+ // Text-Ausrichtung
+#define MN_TEXT_ALIGN\
+    MenuItem\
+    {\
+        Identifier = DUMMY + 2 ; \
+        Command = ".uno:AlignTextMenu" ; \
+        Text [ en-US ] = "A~lignment" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_LEFT ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "~Left" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_RIGHT ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "~Right" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_CENTER ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "~Centered" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "Justified" ; \
+                               };\
+            };\
+        };\
+       };
+
+ // Objekt-Ausrichtung
+#define MN_OBJECT_ALIGN \
+    MenuItem\
+    {\
+        Identifier = SID_OBJECT_ALIGN ; \
+        Command = ".uno:AlignObjetMenu" ; \
+        HelpId = CMD_SID_OBJECT_ALIGN ; \
+        Text [ en-US ] = "Al~ignment" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_LEFT ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_LEFT ; \
+                    Text [ en-US ] = "~Left" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_CENTER ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_CENTER ; \
+                    Text [ en-US ] = "~Centered" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_RIGHT ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_RIGHT ; \
+                    Text [ en-US ] = "~Right" ; \
+                               };\
+                SEPARATOR\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_UP ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_UP ; \
+                    Text [ en-US ] = "~Top" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_MIDDLE ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_MIDDLE ; \
+                    Text [ en-US ] = "C~enter" ; \
+                               };\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_DOWN ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_DOWN ; \
+                    Text [ en-US ] = "~Bottom" ; \
+                               };\
+            };\
+        };\
+       };
+
+ // Bezier-Funktionen
+#define MN_CLOSE_OBJECT \
+    MenuItem\
+    {\
+        Identifier = SID_OBJECT_CLOSE ; \
+        HelpId = CMD_SID_OBJECT_CLOSE ; \
+        Text [ en-US ] = "Close ~Object" ; \
+       };
+
+#define MN_BEZIER \
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_EDIT ; \
+        HelpId = CMD_SID_BEZIER_EDIT ; \
+        Text [ en-US ] = "Edit ~Points" ; \
+       };\
+    SEPARATOR\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_MOVE ; \
+        HelpId = CMD_SID_BEZIER_MOVE ; \
+        Text [ en-US ] = "~Move Points" ; \
+       };\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_INSERT ; \
+        HelpId = CMD_SID_BEZIER_INSERT ; \
+        Text [ en-US ] = "Insert ~Points" ; \
+       };\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_DELETE ; \
+        HelpId = CMD_SID_BEZIER_DELETE ; \
+        Text [ en-US ] = "~Delete Points" ; \
+       };\
+    SEPARATOR\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_CLOSE ; \
+        HelpId = CMD_SID_BEZIER_CLOSE ; \
+        Text [ en-US ] = "Close ~Object" ; \
+       };\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_CUTLINE ; \
+        HelpId = CMD_SID_BEZIER_CUTLINE ; \
+        Text [ en-US ] = "~Split Curve" ; \
+       };\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_CONVERT ; \
+        HelpId = CMD_SID_BEZIER_CONVERT ; \
+        Text [ en-US ] = "Con~vert to Curve" ; \
+       };\
+    SEPARATOR\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_EDGE ; \
+        HelpId = CMD_SID_BEZIER_EDGE ; \
+        Text [ en-US ] = "~Corner" ; \
+       };\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_SMOOTH ; \
+        HelpId = CMD_SID_BEZIER_SMOOTH ; \
+        Text [ en-US ] = "Smoot~h" ; \
+       };\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_SYMMTR ; \
+        HelpId = CMD_SID_BEZIER_SYMMTR ; \
+        Text [ en-US ] = "S~ymmetric" ; \
+       };\
+    SEPARATOR\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_ELIMINATE_POINTS ; \
+        HelpId = CMD_SID_BEZIER_ELIMINATE_POINTS ; \
+        Text [ en-US ] = "~Reduce Points" ; \
+       };
+
+ // Gruppen-/Kombination-Funktionen
+#define MN_GROUP \
+    MenuItem\
+    {\
+        Identifier = SID_GROUP ; \
+        HelpId = CMD_SID_GROUP ; \
+        Text [ en-US ] = "~Group" ; \
+       };
+
+#define MN_UNGROUP \
+    MenuItem\
+    {\
+        Identifier = SID_UNGROUP ; \
+        HelpId = CMD_SID_UNGROUP ; \
+        Text [ en-US ] = "~Ungroup" ; \
+       };
+
+#define MN_COMBINE \
+    MenuItem\
+    {\
+        Identifier = SID_COMBINE ; \
+        HelpId = CMD_SID_COMBINE ; \
+        Text [ en-US ] = "Comb~ine" ; \
+       };
+
+#define MN_DISMANTLE \
+    MenuItem\
+    {\
+        Identifier = SID_DISMANTLE ; \
+        HelpId = CMD_SID_DISMANTLE ; \
+        Text [ en-US ] = "~Split" ; \
+       };
+
+#define MN_ENTER_GROUP \
+    MenuItem\
+    {\
+        Identifier = SID_ENTER_GROUP ; \
+        HelpId = CMD_SID_ENTER_GROUP ; \
+        Text [ en-US ] = "~Enter Group" ; \
+       };
+
+#define MN_LEAVE_GROUP \
+    MenuItem\
+    {\
+        Identifier = SID_LEAVE_GROUP ; \
+        HelpId = CMD_SID_LEAVE_GROUP ; \
+        Text [ en-US ] = "E~xit Group" ; \
+       };
+
+#define MN_NAME_GROUP \
+    MenuItem\
+    {\
+        Identifier = SID_NAME_GROUP ; \
+        HelpId = CMD_SID_NAME_GROUP ; \
+        Text [ en-US ] = "Name..." ; \
+       };
+
+#define MN_OBJECT_TITLE_DESCRIPTION \
+    MenuItem\
+    {\
+        Identifier = SID_OBJECT_TITLE_DESCRIPTION; \
+        HelpId = CMD_SID_OBJECT_TITLE_DESCRIPTION; \
+        Text [ en-US ] = "Description..." ; \
+       };
+
+#define MN_EFFECT \
+    MenuItem\
+    {\
+        Identifier = SID_CUSTOM_ANIMATION_PANEL ; \
+        HelpId = CMD_SID_CUSTOM_ANIMATION_PANEL ; \
+               Text [ en-US ] = "Custom Animation..." ; \
+       };
+
+#define MN_ACTION \
+    MenuItem\
+    {\
+        Identifier = SID_ANIMATION_EFFECTS ; \
+        HelpId = CMD_SID_ANIMATION_EFFECTS ; \
+        Text [ en-US ] = "Int~eraction..." ; \
+       };
+
+#define MN_PRESENTATIONOBJECT \
+    MenuItem\
+    {\
+        Identifier = SID_PRESENTATIONOBJECT ; \
+        HelpId = CMD_SID_PRESENTATIONOBJECT ; \
+        Text [ en-US ] = "Presentation ~Object..." ; \
+       };
+
+#define MN_SET_DEFAULT\
+    MenuItem\
+    {\
+        Identifier = SID_SET_DEFAULT ; \
+        HelpId = CMD_SID_SET_DEFAULT ; \
+        Text [ en-US ] = "~Default" ; \
+       };
+
+#define MN_FONTWORK\
+    MenuItem\
+    {\
+        Identifier = SID_FONTWORK ; \
+        HelpId = CMD_SID_FONTWORK ; \
+        Text [ en-US ] = "F~ontwork" ; \
+       };
+
+#define MN_OLE_OBJECT\
+    MenuItem\
+    {\
+        Identifier = SID_OBJECT ; \
+        HelpId = CMD_SID_OBJECT ; \
+        Text [ en-US ] = "~OLE Object" ; \
+       };
+
+#define MN_ORIGINAL_SIZE\
+    MenuItem\
+    {\
+        Identifier = SID_ORIGINAL_SIZE ; \
+        HelpId = CMD_SID_ORIGINAL_SIZE ; \
+        Text [ en-US ] = "~Original Size" ; \
+       };
+
+#define MN_SAVEGRAPHIC\
+    MenuItem\
+    {\
+        Identifier = SID_SAVEGRAPHIC ; \
+        HelpId = CMD_SID_SAVEGRAPHIC ; \
+               Text [ en-US ] = "Save as Picture..." ; \
+       };
+
+#define MN_CROP\
+       MenuItem\
+       {\
+               Identifier = SID_ATTR_GRAF_CROP ; \
+               HelpId = CMD_SID_ATTR_GRAF_CROP ; \
+               Text [ en-US ] = "Crop Picture..." ; \
+       };
+
+#define MN_NAVIGATOR\
+    MenuItem\
+    {\
+               Identifier = SID_NAVIGATOR ; \
+               Command = ".uno:Navigator" ; \
+               HelpId = CMD_SID_NAVIGATOR ; \
+               Text [ en-US ] = "Na~vigator" ; \
+       };
+
+#define MN_GLUE_INSERT_POINT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_INSERT_POINT ; \
+        HelpId = CMD_SID_GLUE_INSERT_POINT ; \
+        Text [ en-US ] = "Insert ~Point" ; \
+       };
+
+#define MN_GLUE_ESC_DIR_LEFT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_ESCDIR_LEFT ; \
+        HelpId = CMD_SID_GLUE_ESCDIR_LEFT ; \
+        Text [ en-US ] = "~Left" ; \
+       };
+
+#define MN_GLUE_ESC_DIR_TOP\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_ESCDIR_TOP ; \
+        HelpId = CMD_SID_GLUE_ESCDIR_TOP ; \
+        Text [ en-US ] = "~Top" ; \
+       };
+
+#define MN_GLUE_ESC_DIR_RIGHT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_ESCDIR_RIGHT ; \
+        HelpId = CMD_SID_GLUE_ESCDIR_RIGHT ; \
+        Text [ en-US ] = "~Right" ; \
+       };
+
+#define MN_GLUE_ESC_DIR_BOTTOM\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_ESCDIR_BOTTOM ; \
+        HelpId = CMD_SID_GLUE_ESCDIR_BOTTOM ; \
+        Text [ en-US ] = "~Bottom" ; \
+       };
+
+#define MN_GLUE_PERCENT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_PERCENT ; \
+        HelpId = CMD_SID_GLUE_PERCENT ; \
+        Text [ en-US ] = "~Adapt Position to Object" ; \
+       };
+
+#define MN_GLUE_HORZALIGN_LEFT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_HORZALIGN_LEFT ; \
+        HelpId = CMD_SID_GLUE_HORZALIGN_LEFT ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed ~Horizontal Left" ; \
+       };
+
+#define MN_GLUE_HORZALIGN_CENTER\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_HORZALIGN_CENTER ; \
+        HelpId = CMD_SID_GLUE_HORZALIGN_CENTER ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed Horizontal ~Center" ; \
+       };
+
+#define MN_GLUE_HORZALIGN_RIGHT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_HORZALIGN_RIGHT ; \
+        HelpId = CMD_SID_GLUE_HORZALIGN_RIGHT ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed Hori~zontal Right" ; \
+       };
+
+#define MN_GLUE_VERTALIGN_TOP\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_VERTALIGN_TOP ; \
+        HelpId = CMD_SID_GLUE_VERTALIGN_TOP ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed ~Vertical Top" ; \
+       };
+
+#define MN_GLUE_VERTALIGN_CENTER\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_VERTALIGN_CENTER ; \
+        HelpId = CMD_SID_GLUE_VERTALIGN_CENTER ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed V~ertical Center" ; \
+       };
+
+#define MN_GLUE_VERTALIGN_BOTTOM\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_VERTALIGN_BOTTOM ; \
+        HelpId = CMD_SID_GLUE_VERTALIGN_BOTTOM ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed Ver~tical Bottom" ; \
+       };
+
+#define MN_GRID_VISIBLE\
+    MenuItem\
+    {\
+        Identifier = SID_GRID_VISIBLE ; \
+        HelpId = CMD_SID_GRID_VISIBLE ; \
+        Text [ en-US ] = "~Visible Grid" ; \
+       };
+
+#define MN_GRID_USE\
+    MenuItem\
+    {\
+        Identifier = SID_GRID_USE ; \
+        HelpId = CMD_SID_GRID_USE; \
+               Text [ en-US ] = "Snap to Grid"; \
+       };
+
+#define MN_GRID_FRONT\
+    MenuItem\
+    {\
+        Identifier = SID_GRID_FRONT ; \
+        HelpId = CMD_SID_GRID_FRONT ; \
+        Text [ en-US ] = "Grid to ~Front" ; \
+       };
+
+#define MN_GRID \
+    MenuItem\
+    {\
+        Identifier = DUMMY + 5 ; \
+        Command = ".uno:GridMenu" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_GRID_VISIBLE\
+                MN_GRID_USE\
+                MN_GRID_FRONT\
+            };\
+        };\
+               Text [ en-US ] = "~Grid";\
+       };
+
+#define MN_HELPLINES_VISIBLE\
+    MenuItem\
+    {\
+        Identifier = SID_HELPLINES_VISIBLE ; \
+        HelpId = CMD_SID_HELPLINES_VISIBLE ; \
+        Text [ en-US ] = "~Snap Lines Visible" ; \
+       };
+
+#define MN_HELPLINES_USE\
+    MenuItem\
+    {\
+        Identifier = SID_HELPLINES_USE ; \
+        HelpId = CMD_SID_HELPLINES_USE ; \
+               Text [ en-US ] = "Snap to Snap Lines"; \
+       };
+
+#define MN_HELPLINES_FRONT\
+    MenuItem\
+    {\
+        Identifier = SID_HELPLINES_FRONT ; \
+        HelpId = CMD_SID_HELPLINES_FRONT ; \
+        Text [ en-US ] = "Snap Lines to Front" ; \
+       };
+
+#define MN_HELPLINES \
+    MenuItem\
+    {\
+        Identifier = DUMMY + 6 ; \
+        Command = ".uno:SnapLinesMenu" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_HELPLINES_VISIBLE\
+                MN_HELPLINES_USE\
+                MN_HELPLINES_FRONT\
+            };\
+        };\
+               Text [ en-US ] = "~Snap Lines";\
+       };
+
+#define MN_CONTROL_SHOW_BROWSER\
+    MenuItem\
+    {\
+        Identifier = SID_SHOW_BROWSER ; \
+        HelpId = CMD_SID_SHOW_BROWSER ; \
+        Text [ en-US ] = "Propert~ies..." ; \
+       };
+
+#define MN_CONVERT_TO_1BIT_THRESHOLD\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_1BIT_THRESHOLD ; \
+        HelpId = CMD_SID_CONVERT_TO_1BIT_THRESHOLD ; \
+        Text [ en-US ] = "1Bit ~Threshold" ; \
+       };
+
+#define MN_CONVERT_TO_1BIT_MATRIX\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_1BIT_MATRIX ; \
+        HelpId = CMD_SID_CONVERT_TO_1BIT_MATRIX ; \
+        Text [ en-US ] = "1 Bit ~Dithering" ; \
+       };
+
+#define MN_CONVERT_TO_4BIT_GRAYS\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_4BIT_GRAYS ; \
+        HelpId = CMD_SID_CONVERT_TO_4BIT_GRAYS ; \
+        Text [ en-US ] = "4 Bit G~rayscales" ; \
+       };
+
+#define MN_CONVERT_TO_4BIT_COLORS\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_4BIT_COLORS ; \
+        HelpId = CMD_SID_CONVERT_TO_4BIT_COLORS ; \
+        Text [ en-US ] = "4 Bit ~Color Palette" ; \
+       };
+
+#define MN_CONVERT_TO_8BIT_GRAYS\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_8BIT_GRAYS ; \
+        HelpId = CMD_SID_CONVERT_TO_8BIT_GRAYS ; \
+        Text [ en-US ] = "8 Bit Gr~ayscales" ; \
+       };
+
+#define MN_CONVERT_TO_8BIT_COLORS\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_8BIT_COLORS ; \
+        HelpId = CMD_SID_CONVERT_TO_8BIT_COLORS ; \
+        Text [ en-US ] = "8 Bit C~olor Palette" ; \
+       };
+
+#define MN_CONVERT_TO_24BIT\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_24BIT ; \
+        HelpId = CMD_SID_CONVERT_TO_24BIT ; \
+        Text [ en-US ] = "24 Bit ~True Colors" ; \
+       };
+
+#define MN_COLORRESOLUTION \
+    MenuItem\
+    {\
+        Identifier = DUMMY + 4 ; \
+        Command = ".uno:ColorResMenu" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_CONVERT_TO_1BIT_THRESHOLD\
+                MN_CONVERT_TO_1BIT_MATRIX\
+                MN_CONVERT_TO_4BIT_GRAYS\
+                MN_CONVERT_TO_4BIT_COLORS\
+                MN_CONVERT_TO_8BIT_GRAYS\
+                MN_CONVERT_TO_8BIT_COLORS\
+                MN_CONVERT_TO_24BIT\
+            };\
+        };\
+        Text [ en-US ] = "~Color Resolution" ; \
+       };
+
+#define MNSUB_CONVERT \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT ; \
+        Command = ".uno:ConvertMenu" ; \
+        HelpId = HID_MN_SUB_CONVERT ; \
+        Text [ en-US ] = "Con~vert" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_CHANGEBEZIER\
+                MN_CHANGEPOLYGON\
+                MN_CONVERT_TO_CONTOUR\
+                MN_CONVERT_TO_3D\
+                MN_CONVERT_TO_3D_LATHE_FAST\
+                               MN_CONVERT_TO_BITMAP\
+                               MN_CONVERT_TO_METAFILE\
+            };\
+        };\
+       };
+
+#define MNSUB_MIRROR \
+    MenuItem\
+    {\
+        Identifier = SID_MIRROR ; \
+        HelpId = HID_MN_SUB_MIRROR ; \
+        Command = ".uno:MirrorMenu" ; \
+        Text [ en-US ] = "~Flip" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_VERTICAL\
+                MN_HORIZONTAL\
+            };\
+        };\
+       };
+
+#define MNSUB_ROTATE \
+    MenuItem\
+    {\
+               Identifier = SID_OBJECT_ROTATE ; \
+               HelpId = CMD_SID_OBJECT_ROTATE ; \
+               Text [ en-US ] = "~Rotate";\
+       };
+
+#define MN_CONNECT \
+    MenuItem\
+    {\
+        Identifier = SID_CONNECT ; \
+        HelpId = CMD_SID_CONNECT ; \
+        Text [ en-US ] = "C~onnect" ; \
+       };
+
+#define MN_BREAK \
+    MenuItem\
+    {\
+        Identifier = SID_BREAK ; \
+        HelpId = CMD_SID_BREAK ; \
+        Text [ en-US ] = "~Break" ; \
+       };
+
+#define MN_STYLEDT \
+    MenuItem\
+    {\
+        Identifier = SID_STYLE_EDIT ; \
+        HelpId = CMD_SID_STYLE_EDIT ; \
+        Text [ en-US ] = "Edit Style..." ; \
+       };
+
+#define MN_EDIT_HYPERLINK \
+    MenuItem\
+    {\
+        Identifier = SID_EDIT_HYPERLINK ; \
+        HelpId = CMD_SID_EDIT_HYPERLINK ; \
+        Text [ en-US ] = "H~yperlink..." ; \
+       };
+
+#define MN_POINT_EDITMODE \
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_EDIT ; \
+        HelpId = CMD_SID_BEZIER_EDIT ; \
+               Text [ en-US ] = "Poi~nts";\
+       };
+
+#define MN_GLUE_EDITMODE \
+    MenuItem\
+    {\
+               Identifier = SID_GLUE_EDITMODE ; \
+               HelpId = CMD_SID_GLUE_EDITMODE ; \
+               Text [ en-US ] = "~Glue Points";\
+       };
+
+#define MN_LAYER_EDITMODE \
+    MenuItem\
+       {\
+        Identifier = DUMMY + 7 ; \
+        Command = ".uno:LayerMenu" ; \
+               Text [ en-US ] =  "La~yer"; \
+        SubMenu        = Menu \
+               {\
+            ItemList = \
+            {\
+                               MenuItem \
+                               {\
+                                       Identifier = SID_INSERTLAYER ; \
+                                       HelpId = CMD_SID_INSERTLAYER ; \
+                                       Text [ en-US ] = "~Insert";\
+                               };\
+                               MenuItem \
+                               {\
+                                       Identifier = SID_MODIFYLAYER ; \
+                                       HelpId = CMD_SID_MODIFYLAYER ; \
+                                       Text [ en-US ] = "~Modify";\
+                               };\
+                               MenuItem \
+                               {\
+                                       Identifier = SID_DELETE_LAYER ; \
+                                       HelpId = CMD_SID_DELETE_LAYER ; \
+                                       Text [ en-US ] = "Delete";\
+                               };\
+                               MenuItem \
+                               {\
+                                       Identifier = SID_RENAMELAYER ; \
+                                       HelpId = CMD_SID_RENAMELAYER ; \
+                                       Text [ en-US ] = "~Rename";\
+                               }; \
+            };\
+        };\
+       };
+
+// 
------------------------------------------------------------------------------------------------
+// impress popups
+// 
------------------------------------------------------------------------------------------------
+
+Menu RID_DRAW_TEXTOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_SET_DEFAULT
+               SEPARATOR
+               MN_LINE
+               MN_AREA
+               MN_TEXTATTR
+               MN_TRANSFORM
+               MN_FONTWORK
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// GEOMOBJ_POPUP
+//
+       Menu RID_DRAW_GEOMOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TEXTATTR
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// Customshape POPUP
+//
+       Menu RID_DRAW_CUSTOMSHAPE_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TEXTATTR
+               MN_TRANSFORM
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               // #i37263#
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+               SEPARATOR
+               MN_STYLEDT
+               SEPARATOR               
+       };
+};
+
+//
+// 3DOSCENE_POPUP
+//
+       Menu RID_DRAW_3DSCENE_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TRANSFORM
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_ENTER_GROUP
+               MN_3D_WIN
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+       };
+};
+
+//
+// 3DOSCENE2_POPUP
+//
+       Menu RID_DRAW_3DSCENE2_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TRANSFORM
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_ENTER_GROUP
+               MN_LEAVE_GROUP
+               MN_3D_WIN
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+       };
+};
+
+//
+// 3DOBJ_POPUP
+//
+Menu RID_DRAW_3DOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TRANSFORM
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_3D_WIN
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// GROUPOBJ_POPUP
+//
+Menu RID_DRAW_GROUPOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_UNGROUP
+               MN_ENTER_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+       };
+};
+
+//
+// LINEOBJ_POPUP
+//
+Menu RID_DRAW_LINEOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// EDGEOBJ_POPUP
+//
+Menu RID_DRAW_EDGEOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_NEW_ROUTING
+               SEPARATOR
+               MN_LINE
+               MN_CONNECTION
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// MEASUREOBJ_POPUP
+//
+Menu RID_DRAW_MEASUREOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_TEXTATTR
+               MN_MEASURE
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// POLYLINEOBJ_POPUP
+//
+Menu RID_DRAW_POLYLINEOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               MN_CLOSE_OBJECT
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               MN_BREAK
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// NOSEL_POPUP
+//
+Menu RID_DRAW_NOSEL_POPUP
+{
+       ItemList =
+       {
+               MN_SLIDE_MENU
+               SEPARATOR
+               MN_CAPTUREPOINT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               SEPARATOR
+               MN_NAVIGATOR
+               SEPARATOR
+               MN_GRID
+               SEPARATOR
+               MN_HELPLINES
+               SEPARATOR
+               MN_OUTLINEMODE
+               MN_DIAMODE
+               MN_PRESENTATION
+       };
+};
+
+//
+// MULTISELECTION_POPUP
+//
+Menu RID_DRAW_MULTISELECTION_POPUP
+{
+       ItemList =
+       {
+               MN_SET_DEFAULT
+               SEPARATOR
+               MN_LINE
+               MN_AREA
+               MN_TRANSFORM
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_GROUP
+               MN_UNGROUP
+               MN_LEAVE_GROUP
+               MN_COMBINE
+               MNSUB_FORMEN
+               MN_DISMANTLE
+               MN_CONNECT
+               MN_BREAK
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+       };
+};
+
+//
+// GRAPHIC_POPUP
+//
+Menu RID_DRAW_GRAPHIC_POPUP
+{
+       ItemList =
+       {
+               MN_TRANSFORM
+               MN_ORIGINAL_SIZE
+               MN_LINE
+               MN_AREA
+               MN_TEXTATTR
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_CROP
+               MN_OBJECT_ALIGN
+               MN_POSITION
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               MN_BREAK
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+               SEPARATOR
+               MN_STYLEDT
+               SEPARATOR
+               MN_SAVEGRAPHIC
+       };
+};
+
+//
+// OLE2_POPUP
+//
+Menu RID_DRAW_OLE2_POPUP
+{
+       ItemList =
+       {
+               MN_TRANSFORM
+               MN_ORIGINAL_SIZE
+               MN_OLE_OBJECT
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MN_BREAK
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+       };
+};
+
+
+//
+// PAGETAB_POPUP
+//
+Menu RID_DRAW_PAGETAB_POPUP
+{
+       ItemList =
+       {
+               MN_INSERT_SLIDE
+               MN_DELETE_SLIDE
+               MN_MODIFY_PAGE
+               MN_RENAME_PAGE
+       };
+};
+
+//
+// Media_POPUP
+//
+Menu RID_DRAW_MEDIA_POPUP
+{
+       ItemList =
+       {
+               MN_TRANSFORM
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MN_BREAK
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+       };
+};
+
+//
+// Table shape context menu
+//
+Menu RID_DRAW_TABLE_POPUP
+{
+       ItemList =
+       {
+               MN_SET_DEFAULT
+               SEPARATOR
+               MN_TRANSFORM
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MenuItem
+               {
+                       Identifier = SID_FORMAT_TABLE_DLG;
+                       HelpId = CMD_SID_FORMAT_TABLE_DLG;
+                       Text [ en-US ] = "~Table...";
+               };
+               MenuItem
+               {
+                       Identifier = DUMMY + 10 ;
+                       Command = ".uno:CellMenu" ;
+                       Text [ en-US ] = "~Cell" ;
+                       SubMenu = Menu
+                       {
+                               ItemList =
+                               {
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_MERGE_CELLS;
+                                               HelpId = 
CMD_SID_TABLE_MERGE_CELLS;
+                                               Text [ en-US ] = "~Merge";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_SPLIT_CELLS;
+                                               HelpId = 
CMD_SID_TABLE_SPLIT_CELLS;
+                                               Text [ en-US ] = "~Split...";
+                                       };
+                                       SEPARATOR
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_VERT_NONE;
+                                               HelpId = 
CMD_SID_TABLE_VERT_NONE;
+                                               Text [ en-US ] = "~Top";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_VERT_CENTER;
+                                               HelpId = 
CMD_SID_TABLE_VERT_CENTER;
+                                               Text [ en-US ] = "C~enter";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_VERT_BOTTOM;
+                                               HelpId = 
CMD_SID_TABLE_VERT_BOTTOM;
+                                               Text [ en-US ] = "~Bottom";
+                                       };
+                               };
+                       };
+               };
+               MenuItem
+               {
+                       Identifier = DUMMY + 11 ;
+                       Command = ".uno:RowMenu" ;
+                       Text [ en-US ] = "~Row" ;
+                       SubMenu = Menu
+                       {
+                               ItemList =
+                               {
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_DISTRIBUTE_ROWS;
+                                               HelpId = 
CMD_SID_TABLE_DISTRIBUTE_ROWS;
+                                               Text [ en-US ] = "Space 
~Equally";
+                                       };
+                                       SEPARATOR
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_SELECT_ROW;
+                                               HelpId = 
CMD_SID_TABLE_SELECT_ROW;
+                                               Text [ en-US ] = "~Select";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_INSERT_ROW_DLG;
+                                               HelpId = 
CMD_SID_TABLE_INSERT_ROW_DLG;
+                                               Text [ en-US ] = "~Insert...";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_DELETE_ROW;
+                                               HelpId = 
CMD_SID_TABLE_DELETE_ROW;
+                                               Text [ en-US ] = "~Delete";
+                                       };
+                               };
+                       };
+               };
+               MenuItem
+               {
+                       Identifier = DUMMY + 12 ;
+                       Command = ".uno:ColumnMenu" ;
+                       Text [ en-US ] = "Colu~mn" ;
+                       SubMenu = Menu
+                       {
+                               ItemList =
+                               {
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_DISTRIBUTE_COLUMNS;
+                                               HelpId = 
CMD_SID_TABLE_DISTRIBUTE_COLUMNS;
+                                               Text [ en-US ] = "Space 
~Equally";
+                                       };
+                                       SEPARATOR
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_SELECT_COL;
+                                               HelpId = 
CMD_SID_TABLE_SELECT_COL;
+                                               Text [ en-US ] = "~Select";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_INSERT_COL_DLG;
+                                               HelpId = 
CMD_SID_TABLE_INSERT_COL_DLG;
+                                               Text [ en-US ] = "~Insert...";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_DELETE_COL;
+                                               HelpId = 
CMD_SID_TABLE_DELETE_COL;
+                                               Text [ en-US ] = "~Delete";
+                                       };
+                               };
+                       };
+               };
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_EFFECT
+               MN_ACTION
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+// 
------------------------------------------------------------------------------------------------
+// draw popups
+// 
------------------------------------------------------------------------------------------------
+
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ 
+//
+// TEXTOBJ_POPUP
+//
+Menu RID_GRAPHIC_TEXTOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_SET_DEFAULT
+               SEPARATOR
+               MN_LINE
+               MN_AREA
+               MN_TEXTATTR
+               MN_TRANSFORM
+               MN_FONTWORK
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// GEOMOBJ_POPUP
+//
+Menu RID_GRAPHIC_GEOMOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TEXTATTR
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// Customshape POPUP
+//
+Menu RID_GRAPHIC_CUSTOMSHAPE_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TEXTATTR
+               MN_TRANSFORM
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               // #i37263#
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_STYLEDT
+               SEPARATOR
+               
+       };
+};
+
+//
+// 3DOSCENE_POPUP
+//
+Menu RID_GRAPHIC_3DSCENE_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TRANSFORM
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_ENTER_GROUP
+               MN_3D_WIN
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+       };
+};
+
+//
+// 3DOSCENE2_POPUP
+//
+Menu RID_GRAPHIC_3DSCENE2_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TRANSFORM
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_ENTER_GROUP
+               MN_LEAVE_GROUP
+               MN_3D_WIN
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+       };
+};
+
+//
+// 3DOBJ_POPUP
+//
+Menu RID_GRAPHIC_3DOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TRANSFORM
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_3D_WIN
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// GROUPOBJ_POPUP
+//
+Menu RID_GRAPHIC_GROUPOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_AREA
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_UNGROUP
+               MN_ENTER_GROUP
+       };
+};
+
+//
+// LINEOBJ_POPUP
+//
+Menu RID_GRAPHIC_LINEOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// EDGEOBJ_POPUP
+//
+Menu RID_GRAPHIC_EDGEOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_NEW_ROUTING
+               SEPARATOR
+               MN_LINE
+               MN_CONNECTION
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+//
+// MEASUREOBJ_POPUP
+//
+Menu RID_GRAPHIC_MEASUREOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_TEXTATTR
+               MN_MEASURE
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+
+//
+// POLYLINEOBJ_POPUP
+//
+Menu RID_GRAPHIC_POLYLINEOBJ_POPUP
+{
+       ItemList =
+       {
+               MN_LINE
+               MN_TRANSFORM
+               MN_EDIT_POINTS
+               MN_CLOSE_OBJECT
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               MN_DISMANTLE
+               MN_BREAK
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
 
-#define DEFINE_SLOTID_FOR_NUMBER_BULLETS       SID_OUTLINE_BULLET
+//
+// NOSEL_POPUP
+//
+Menu RID_GRAPHIC_NOSEL_POPUP
+{
+       ItemList =
+       {
+               MN_PAGE_MENU
+               SEPARATOR
+               MN_CAPTUREPOINT
+               SEPARATOR
+               MN_LEAVE_GROUP
+               SEPARATOR
+               MN_NAVIGATOR
+               SEPARATOR
+               MN_GRID
+               SEPARATOR
+               MN_HELPLINES
+       };
+};
+
+//
+// MULTISELECTION_POPUP
+//
+Menu RID_GRAPHIC_MULTISELECTION_POPUP
+{
+       ItemList =
+       {
+               MN_SET_DEFAULT
+               SEPARATOR
+               MN_LINE
+               MN_AREA
+               MN_TRANSFORM
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_GROUP
+               MN_UNGROUP
+               MN_LEAVE_GROUP
+               MN_COMBINE
+               MNSUB_FORMEN
+               MN_DISMANTLE
+               MN_CONNECT
+               MN_BREAK
+       };
+};
+
+//
+// GRAPHIC_POPUP
+//
+Menu RID_GRAPHIC_GRAPHIC_POPUP
+{
+       ItemList =
+       {
+               MN_TRANSFORM
+               MN_ORIGINAL_SIZE
+               MN_LINE
+               MN_AREA
+               MN_TEXTATTR
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MN_CROP
+               MN_OBJECT_ALIGN
+               MN_POSITION
+               MN_DISTRIBUTE
+               MNSUB_MIRROR
+               MNSUB_CONVERT
+               MN_BREAK
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_STYLEDT
+               SEPARATOR
+               MN_SAVEGRAPHIC
+       };
+};
+
+//
+// OLE2_POPUP
+//
+Menu RID_GRAPHIC_OLE2_POPUP
+{
+       ItemList =
+       {
+               MN_TRANSFORM
+               MN_ORIGINAL_SIZE
+               MN_OLE_OBJECT
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MN_BREAK
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+       };
+};
+
+
+//
+// PAGETAB_POPUP
+//
+Menu RID_GRAPHIC_PAGETAB_POPUP
+{
+       ItemList =
+       {
+               MN_INSERT_PAGE
+               MN_DELETE_PAGE
+               MN_RENAME_PAGE
+       };
+};
+
+//
+// Media_POPUP
+//
+Menu RID_GRAPHIC_MEDIA_POPUP
+{
+       ItemList =
+       {
+               MN_TRANSFORM
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MN_BREAK
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+       };
+};
+
+//
+// Table shape context menu
+//
+Menu RID_GRAPHIC_TABLE_POPUP
+{
+       ItemList =
+       {
+               MN_SET_DEFAULT
+               SEPARATOR
+               MN_TRANSFORM
+               SEPARATOR
+               MN_CHAR_PARAGRAPH
+               SEPARATOR
+               MenuItem
+               {
+                       Identifier = SID_FORMAT_TABLE_DLG;
+                       HelpId = CMD_SID_FORMAT_TABLE_DLG;
+                       Text [ en-US ] = "~Table...";
+               };
+               MenuItem
+               {
+                       Identifier = DUMMY + 10 ;
+                       Command = ".uno:CellMenu" ;
+                       Text [ en-US ] = "~Cell" ;
+                       SubMenu = Menu
+                       {
+                               ItemList =
+                               {
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_MERGE_CELLS;
+                                               HelpId = 
CMD_SID_TABLE_MERGE_CELLS;
+                                               Text [ en-US ] = "~Merge";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_SPLIT_CELLS;
+                                               HelpId = 
CMD_SID_TABLE_SPLIT_CELLS;
+                                               Text [ en-US ] = "~Split...";
+                                       };
+                                       SEPARATOR
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_VERT_NONE;
+                                               HelpId = 
CMD_SID_TABLE_VERT_NONE;
+                                               Text [ en-US ] = "~Top";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_VERT_CENTER;
+                                               HelpId = 
CMD_SID_TABLE_VERT_CENTER;
+                                               Text [ en-US ] = "C~enter";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_VERT_BOTTOM;
+                                               HelpId = 
CMD_SID_TABLE_VERT_BOTTOM;
+                                               Text [ en-US ] = "~Bottom";
+                                       };
+                               };
+                       };
+               };
+               MenuItem
+               {
+                       Identifier = DUMMY + 11 ;
+                       Command = ".uno:RowMenu" ;
+                       Text [ en-US ] = "~Row" ;
+                       SubMenu = Menu
+                       {
+                               ItemList =
+                               {
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_DISTRIBUTE_ROWS;
+                                               HelpId = 
CMD_SID_TABLE_DISTRIBUTE_ROWS;
+                                               Text [ en-US ] = "Space 
~Equally";
+                                       };
+                                       SEPARATOR
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_SELECT_ROW;
+                                               HelpId = 
CMD_SID_TABLE_SELECT_ROW;
+                                               Text [ en-US ] = "~Select";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_INSERT_ROW_DLG;
+                                               HelpId = 
CMD_SID_TABLE_INSERT_ROW_DLG;
+                                               Text [ en-US ] = "~Insert...";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_DELETE_ROW;
+                                               HelpId = 
CMD_SID_TABLE_DELETE_ROW;
+                                               Text [ en-US ] = "~Delete";
+                                       };
+                               };
+                       };
+               };
+               MenuItem
+               {
+                       Identifier = DUMMY + 12 ;
+                       Command = ".uno:ColumnMenu" ;
+                       Text [ en-US ] = "Colu~mn" ;
+                       SubMenu = Menu
+                       {
+                               ItemList =
+                               {
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_DISTRIBUTE_COLUMNS;
+                                               HelpId = 
CMD_SID_TABLE_DISTRIBUTE_COLUMNS;
+                                               Text [ en-US ] = "Space 
~Equally";
+                                       };
+                                       SEPARATOR
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_SELECT_COL;
+                                               HelpId = 
CMD_SID_TABLE_SELECT_COL;
+                                               Text [ en-US ] = "~Select";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_INSERT_COL_DLG;
+                                               HelpId = 
CMD_SID_TABLE_INSERT_COL_DLG;
+                                               Text [ en-US ] = "~Insert...";
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = 
SID_TABLE_DELETE_COL;
+                                               HelpId = 
CMD_SID_TABLE_DELETE_COL;
+                                               Text [ en-US ] = "~Delete";
+                                       };
+                               };
+                       };
+               };
+               SEPARATOR
+               MN_POSITION
+               MN_OBJECT_ALIGN
+               MN_DISTRIBUTE
+               MNSUB_CONVERT
+               SEPARATOR
+               MN_OBJECT_TITLE_DESCRIPTION
+               MN_NAME_GROUP
+               SEPARATOR
+               MN_STYLEDT
+       };
+};
+
+
+// 
------------------------------------------------------------------------------------------------
+// common popups
+// 
------------------------------------------------------------------------------------------------
 
 Menu RID_DRAW_TEXTOBJ_INSIDE_POPUP
 {
@@ -213,20 +2899,6 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP
        };
 };
 
-Menu RID_DRAW_CONTROL_POPUP
-{
-       ItemList =
-       {
-               MN_TRANSFORM
-               MN_CONTROL_SHOW_BROWSER
-               SEPARATOR
-               MN_POSITION
-               MN_OBJECT_ALIGN
-               SEPARATOR
-               MN_LEAVE_GROUP
-               MN_DISMANTLE
-       };
-};
 Menu RID_FORM_CONTROL_POPUP
 {
        ItemList =
@@ -241,12 +2913,9 @@ Menu RID_FORM_CONTROL_POPUP
                SEPARATOR
                MN_LEAVE_GROUP
                MN_DISMANTLE
-
-               //-#i68101#----------------------
                SEPARATOR
                MN_OBJECT_TITLE_DESCRIPTION
                MN_NAME_GROUP
-               //-#i68101#----------------------
        };
 };
 
@@ -364,7 +3033,6 @@ Menu RID_MASTERPAGE_POPUP
                MN_TRANSFORM
                SEPARATOR
                MN_CHAR_PARAGRAPH
-                //     MN_PRESENTATIONOBJECT
                SEPARATOR
                MN_POSITION
        };
@@ -403,21 +3071,6 @@ Menu RID_BEZIER_POPUP
 };
 
 
-Menu RID_DRAW_BMP_CONVERT_POPUP
-{
-       ItemList =
-       {
-               MN_CONVERT_TO_1BIT_THRESHOLD
-               MN_CONVERT_TO_1BIT_MATRIX
-               MN_CONVERT_TO_4BIT_GRAYS
-               MN_CONVERT_TO_4BIT_COLORS
-               MN_CONVERT_TO_8BIT_GRAYS
-               MN_CONVERT_TO_8BIT_COLORS
-               MN_CONVERT_TO_24BIT
-       };
-};
-
-
 Menu RID_LAYERTAB_POPUP
 {
        ItemList =
@@ -426,21 +3079,18 @@ Menu RID_LAYERTAB_POPUP
                {
                        Identifier = SID_INSERTLAYER ;
                        HelpId = CMD_SID_INSERTLAYER ;
-                       /* ### ACHTUNG: Neuer Text in Resource? ~Ebene 
einfügen... : ~Ebene einf³gen... */
                        Text [ en-US ] = "~Insert Layer..." ;
                };
                MenuItem
                {
                        Identifier = SID_MODIFYLAYER ;
                        HelpId = CMD_SID_MODIFYLAYER ;
-                       /* ### ACHTUNG: Neuer Text in Resource? E~bene 
ändern... : E~bene õndern... */
                        Text [ en-US ] = "Modify La~yer..." ;
                };
                MenuItem
                {
                        Identifier = SID_DELETE_LAYER ;
                        HelpId = CMD_SID_DELETE_LAYER ;
-                       /* ### ACHTUNG: Neuer Text in Resource? Ebe~ne 
löschen... : Ebe~ne l÷schen... */
                        Text [ en-US ] = "Delete ~Layer..." ;
                };
                MN_RENAME_LAYER

Modified: 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/res_bmp.src
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/res_bmp.src?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/res_bmp.src 
(original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/res_bmp.src 
Wed Mar 16 03:50:45 2016
@@ -420,24 +420,25 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
                {
                        SfxStyleFamiliesRes1
             StyleFamily = SFX_STYLE_FAMILY_PARA ;
-                       FilterList  =
+               FilterList [ en-US ] =
                        {
-                               < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
-                               < STR_STYLE_FILTER_USED ; SFXSTYLEBIT_USED ; > ;
-                               < STR_STYLE_FILTER_USERDEF ; 
SFXSTYLEBIT_USERDEF ; > ;
+                               < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
+                               < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
+                               < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
                        };
                };
                SfxStyleFamilyItem RID_PRESENTATIONSTYLEFAMILY
                {
                        SfxStyleFamiliesRes2
             StyleFamily = SFX_STYLE_FAMILY_PSEUDO ;
-                       FilterList =
+               FilterList [ en-US ] =
                        {
-                               < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
+                               < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
                        };
                };              
        };
        #define STYLE_IMAGE_LISTEF \
+               MaskColor = IMAGE_MASK_STDCOLOR; \
                IdList = \
                { \
                        1; 2; \
@@ -447,13 +448,11 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
        ImageList 1     // == BMP_COLOR_NORMAL + 1
        {
                Prefix = "sf";
-               MaskColor = IMAGE_MASK_STDCOLOR;
                STYLE_IMAGE_LISTEF
        };
        ImageList 2     // == BMP_COLOR_HIGHCONTRAST + 1
        {
                Prefix = "sfh";
-               MaskColor = IMAGE_MASK_STDCOLOR_HC;
                STYLE_IMAGE_LISTEF
        };
        #undef STYLE_IMAGE_LISTEF

Modified: 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/strings.src
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/strings.src?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/strings.src 
(original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/app/strings.src 
Wed Mar 16 03:50:45 2016
@@ -21,8 +21,10 @@
 
 
 #include "strings.hrc"
+#include "sdstring.hrc"
 #include "glob.hrc"
 #include "helpids.h"
+#include "sdstring.hrc"
 
 String STR_DRAW_TOOLBOX
 {
@@ -1265,3 +1267,49 @@ String STR_INSERT_MOVIE
 {
        Text [ en-US ] = "Insert Movie";
 };
+
+String RID_DRAW_VIEWER_TOOLBOX
+{
+       Text [ en-US ] = "Function Bar (viewing mode)" ;
+};
+
+String RID_GRAPHIC_VIEWER_TOOLBOX
+{
+       Text [ en-US ] = "Function Bar (viewing mode)" ;
+};
+
+String RID_DRAW_MEDIA_TOOLBOX
+{
+       Text [ en-US ] = "Media Playback" ;
+};
+
+String RID_DRAW_TABLE_TOOLBOX
+{
+       TEXT [ de ] = "Tabelle" ;
+       Text [ en-US ] = "Table" ;
+};
+
+String STR_SAR_NOT_FOUND
+{
+       Text [ en-US ] = "Search key not found.";
+};
+
+String STR_SAR_WRAP_FORWARD
+{
+       Text [ en-US ] = "%PRODUCTNAME Impress has searched to the end of the 
presentation. Do you want to continue at the beginning?";
+};
+
+String STR_SAR_WRAP_BACKWARD
+{
+       Text [ en-US ] = "%PRODUCTNAME Impress has searched to the beginning of 
the presentation. Do you want to continue at the end?";
+};
+
+String STR_SAR_WRAP_FORWARD_DRAW
+{
+       Text [ en-US ] = "%PRODUCTNAME Draw has searched to the end of the 
document. Do you want to continue at the beginning?";
+};
+
+String STR_SAR_WRAP_BACKWARD_DRAW
+{
+       Text [ en-US ] = "%PRODUCTNAME Draw has searched to the beginning of 
the document. Do you want to continue at the end?";
+};

Modified: 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/dlg/ins_paste.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/dlg/ins_paste.cxx?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/dlg/ins_paste.cxx 
(original)
+++ 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/dlg/ins_paste.cxx 
Wed Mar 16 03:50:45 2016
@@ -24,6 +24,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
+#include "sdresid.hxx"
+
 #ifdef SD_DLLIMPLEMENTATION
 #undef SD_DLLIMPLEMENTATION
 #endif

Modified: 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/dlg/sdabstdlg.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/dlg/sdabstdlg.cxx?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/dlg/sdabstdlg.cxx 
(original)
+++ 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/dlg/sdabstdlg.cxx 
Wed Mar 16 03:50:45 2016
@@ -25,10 +25,10 @@
 #include "precompiled_sd.hxx"
 
 #include "sdabstdlg.hxx"
-#include "sduilib.hxx"
 
 #include <osl/module.hxx>
 #include <tools/string.hxx>
+#include <vcl/unohelp.hxx>
 
 typedef SdAbstractDialogFactory* (__LOADONCALLAPI 
*SdFuncPtrCreateDialogFactory)();
 
@@ -38,7 +38,8 @@ SdAbstractDialogFactory* SdAbstractDialo
 {
     SdFuncPtrCreateDialogFactory fp = 0;
        static ::osl::Module aDialogLibrary;
-       if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, 
String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
+       static const ::rtl::OUString 
sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True));
+       if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, 
String( sLibName ) ) )
         fp = ( SdAbstractDialogFactory* (__LOADONCALLAPI*)() )
                        aDialogLibrary.getFunctionSymbol( 
::rtl::OUString::createFromAscii("CreateDialogFactory") );
        if ( fp )

Modified: 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/res_bmp.hrc
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/res_bmp.hrc?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/res_bmp.hrc 
(original)
+++ openoffice/branches/gbuild-reintegration/main/sd/source/ui/inc/res_bmp.hrc 
Wed Mar 16 03:50:45 2016
@@ -254,7 +254,7 @@
 #define RID_DRAW_3DOBJ_POPUP                           RID_APP_START+59
 #define RID_DRAW_MEASUREOBJ_POPUP                      RID_APP_START+60
 #define RID_DRAW_EDGEOBJ_POPUP                         RID_APP_START+61
-#define RID_DRAW_BMP_CONVERT_POPUP                     RID_APP_START+62
+//#define RID_DRAW_BMP_CONVERT_POPUP                   RID_APP_START+62
 #define RID_DRAW_POLYLINEOBJ_POPUP                     RID_APP_START+63
 #define RID_DRAW_3DSCENE_POPUP                         RID_APP_START+64
 #define RID_DRAW_3DSCENE2_POPUP                                RID_APP_START+65
@@ -328,7 +328,7 @@
 
 #define RID_DRAW_SNAPOBJECT_POPUP                      RID_APP_START+390
 #define RID_DRAW_GLUEPOINT_POPUP                       RID_APP_START+392
-#define RID_DRAW_CONTROL_POPUP                         RID_APP_START+393
+//#define RID_DRAW_CONTROL_POPUP                               
RID_APP_START+393
 #define RID_FORM_CONTROL_POPUP                         RID_APP_START+394
 
 #define RID_GRAPHICSTYLEFAMILY         RID_APP_START+395

Modified: 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx?rev=1735184&r1=1735183&r2=1735184&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx
 Wed Mar 16 03:50:45 2016
@@ -25,7 +25,6 @@
 
 #include "SlideSorter.hxx"
 
-#include "SlideSorterChildWindow.hrc"
 #include "SlideSorterViewShell.hxx"
 #include "controller/SlideSorterController.hxx"
 #include "controller/SlsScrollBarManager.hxx"


Reply via email to