ooo-build r13341 - in trunk: . patches/dev300 patches/ooxml

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Jul 22 10:13:58 2008
New Revision: 13341
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13341&view=rev

Log:
2008-07-22  Rene Engelhard  <rene debian org>

        * patches/dev300/ui-desktop-integration-m25.diff
          patches/dev300/ui-desktop-integration.diff,
          patches/dev300/apply: final dev300-m26 bits. apply
          sysui-desktop-ooxml.diff only for < m26


Added:
   trunk/patches/dev300/ui-desktop-integration-m25.diff
      - copied unchanged from r13335, /trunk/patches/dev300/ui-desktop-integration.diff
   trunk/patches/ooxml/sysui-desktop-ooxml-m25.diff   (props changed)
      - copied unchanged from r13335, /trunk/patches/ooxml/sysui-desktop-ooxml.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/ui-desktop-integration.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 22 10:13:58 2008
@@ -1758,10 +1758,12 @@
 
 buildfix-oox-depends-on-unotools.diff
 
+[ OOXML < dev300-m26 ]
 # added the OOXML-related MIME types to the upstream desktop files
 # needed for the universal GO-OO build
 sysui-desktop-ooxml.diff, pmladek
 
+[ OOXML ]
 # fix build dependencies
 #FIXME still necessary? oox-token-deps.diff, pmladek
 
@@ -2562,7 +2564,10 @@
 internal-mesa-headers-mesa.diff, fridrich
 
 
-[ Lockdown ]
+[ Lockdown < dev300-m26 ]
+# Disable UI [toolbars, menus] customization
+ui-desktop-integration-m25.diff, michael
+[ Lockdown >= dev300-m26 < beb300-m0 ]
 # Disable UI [toolbars, menus] customization
 ui-desktop-integration.diff, michael
 

Modified: trunk/patches/dev300/ui-desktop-integration.diff
==============================================================================
--- trunk/patches/dev300/ui-desktop-integration.diff	(original)
+++ trunk/patches/dev300/ui-desktop-integration.diff	Tue Jul 22 10:13:58 2008
@@ -204,9 +204,9 @@
 --- framework/source/uielement/toolbarsmenucontroller.cxx	2005-03-29 20:30:44.000000000 +0530
 +++ framework/source/uielement/toolbarsmenucontroller.cxx	2005-07-11 18:09:16.732966419 +0530
 @@ -155,6 +155,7 @@
- #include <vcl/window.hxx>
  #include <svtools/menuoptions.hxx>
  #include <svtools/cmdoptions.hxx>
+ #include <comphelper/uieventslogger.hxx>
 +#include <svtools/miscopt.hxx>
  
  //_________________________________________________________________________________________________________________