ooo-build r12391 - in trunk: . patches/dev300

From: jannieuw svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12391 - in trunk: . patches/dev300
Date: Wed, 30 Apr 2008 10:10:02 +0100 (BST)
Author: jannieuw
Date: Wed Apr 30 09:10:01 2008
New Revision: 12391
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12391&view=rev

Log:
2008-04-30  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/cws-layoutdialogs-toolkit.diff:
	* patches/dev300/layout-plugin-toolkit.diff: Update for m10.

	* patches/dev300/apply: Re-enable them.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/cws-layoutdialogs-toolkit.diff
   trunk/patches/dev300/layout-plugin-toolkit.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Apr 30 09:10:01 2008
@@ -1813,10 +1813,10 @@
 cws-layoutdialogs-scp2.diff
 cws-layoutdialogs-svx.diff
 cws-layoutdialogs-sw.diff
-#FIXME dev300-m10: cws-layoutdialogs-toolkit.diff
+cws-layoutdialogs-toolkit.diff
 cws-layoutdialogs-transex3.diff
 
-#FIXME dev300-m10: layout-plugin-toolkit.diff
+layout-plugin-toolkit.diff
 
 [ LocalizeLayout ]
 cws-layoutdialogs-toolkit-localize.diff

Modified: trunk/patches/dev300/cws-layoutdialogs-toolkit.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-toolkit.diff	(original)
+++ trunk/patches/dev300/cws-layoutdialogs-toolkit.diff	Wed Apr 30 09:10:01 2008
@@ -1296,7 +1296,7 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
 --- toolkit/source/awt/forward.hxx	6 Mar 2008 11:38:52 -0000	1.2
 +++ toolkit/source/awt/forward.hxx	20 Mar 2008 11:56:25 -0000	1.2.6.1
-@@ -1,9 +1,42 @@
+@@ -1,3 +1,38 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1335,12 +1335,6 @@
  #ifndef AWT_FORWARD_HXX
  #define AWT_FORWARD_HXX
  
--#ifndef _COMPHELPER_UNO3_HXX_
- #include <comphelper/uno3.hxx>
--#endif
- 
- #define IMPLEMENT_FORWARD_XTYPEPROVIDER1( classname, baseclass ) \
-     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes(  ) throw (::com::sun::star::uno::RuntimeException) \
 Index: toolkit/source/awt/makefile.mk
 ===================================================================
 RCS file: /cvs/gsl/toolkit/source/awt/makefile.mk,v
@@ -1762,15 +1756,11 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.5
 --- toolkit/source/awt/vclxdialog.cxx	6 Mar 2008 11:39:55 -0000	1.2
 +++ toolkit/source/awt/vclxdialog.cxx	28 Mar 2008 13:45:13 -0000	1.2.6.5
-@@ -1,64 +1,81 @@
+@@ -1,54 +1,81 @@
 -#include "vclxdialog.hxx"
--
--#ifndef _TOOLKIT_HELPER_PROPERTY_HXX_
 -#include "toolkit/helper/property.hxx"
--#endif
--#ifndef _COM_SUN_STAR_AWT_SCROLLBARORIENTATION_HPP_
 -#include <com/sun/star/awt/ScrollBarOrientation.hpp>
--#endif
+-
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1806,12 +1796,9 @@
 + *
 + ************************************************************************/
  
+-#include <tools/debug.hxx>
 +#include "vclxdialog.hxx"
  
--#ifndef _TOOLS_DEBUG_HXX
--#include <tools/debug.hxx>
--#endif
--
 -#include <vcl/msgbox.hxx>
 -#include <vcl/wrkwin.hxx>
 -#include <vcl/syswin.hxx>
@@ -1832,19 +1819,18 @@
  
 -#include <com/sun/star/lang/SystemDependent.hpp>
 -#include <com/sun/star/awt/SystemDependentXWindow.hpp>
+-#include <toolkit/helper/vclunohelper.hxx>
 +#ifdef WNT
 +#include <tools/prewin.h>
 +#include <windows.h>
 +#include <tools/postwin.h>
 +#endif
- 
--#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
--#include <toolkit/helper/vclunohelper.hxx>
++
 +#ifdef QUARTZ
 +#include "premac.h"
 +#include <Cocoa/Cocoa.h>
 +#include "postmac.h"
- #endif
++#endif
  
 -#include <com/sun/star/awt/PosSize.hpp>
 +#include <vcl/dialog.hxx>
@@ -2139,7 +2125,7 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
 --- toolkit/source/awt/vclxdialog.hxx	6 Mar 2008 11:40:06 -0000	1.2
 +++ toolkit/source/awt/vclxdialog.hxx	28 Mar 2008 13:19:45 -0000	1.2.6.3
-@@ -1,59 +1,70 @@
+@@ -1,51 +1,70 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -2178,18 +2164,10 @@
  #ifndef LAYOUT_AWT_VCLXDIALOG_HXX
  #define LAYOUT_AWT_VCLXDIALOG_HXX
  
--#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
 -#include <toolkit/awt/vclxwindow.hxx>
--#endif
--#ifndef _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
 -#include <toolkit/helper/listenermultiplexer.hxx>
--#endif
--#ifndef _CPPUHELPER_IMPLBASE3_HXX_
 -#include <cppuhelper/implbase3.hxx>
--#endif
--#ifndef _COMPHELPER_UNO3_HXX_
 -#include <comphelper/uno3.hxx>
--#endif
 -
 +#include <com/sun/star/awt/XDialog2.hpp>
  #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
@@ -2297,7 +2275,7 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
 --- toolkit/source/awt/vclxfixedline.cxx	6 Mar 2008 11:40:27 -0000	1.2
 +++ toolkit/source/awt/vclxfixedline.cxx	28 Mar 2008 13:45:13 -0000	1.2.6.4
-@@ -1,24 +1,50 @@
+@@ -1,16 +1,48 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -2334,21 +2312,13 @@
 + ************************************************************************/
 +
  #include "vclxfixedline.hxx"
--#ifndef _TOOLKIT_HELPER_PROPERTY_HXX_
 -#include "toolkit/helper/property.hxx"
--#endif
- 
--#ifndef _TOOLS_DEBUG_HXX
 +#include <com/sun/star/awt/PosSize.hpp>
 +#include <toolkit/helper/property.hxx>
 +#include <toolkit/helper/vclunohelper.hxx>
  #include <tools/debug.hxx>
--#endif
  #include <vcl/fixed.hxx>
- 
--#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 -#include <toolkit/helper/vclunohelper.hxx>
--#endif
 -
 -#include <com/sun/star/awt/PosSize.hpp>
 +#include "forward.hxx"
@@ -2475,7 +2445,7 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
 --- toolkit/source/awt/vclxfixedline.hxx	6 Mar 2008 11:40:39 -0000	1.2
 +++ toolkit/source/awt/vclxfixedline.hxx	28 Mar 2008 13:14:17 -0000	1.2.6.2
-@@ -1,36 +1,50 @@
+@@ -1,28 +1,50 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -2514,18 +2484,10 @@
  #ifndef LAYOUT_AWT_VCLXFIXEDLINE_HXX
  #define LAYOUT_AWT_VCLXFIXEDLINE_HXX
  
--#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
 -#include <toolkit/awt/vclxwindow.hxx>
--#endif
--#ifndef _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
 -#include <toolkit/helper/listenermultiplexer.hxx>
--#endif
--#ifndef _CPPUHELPER_IMPLBASE1_HXX_
 -#include <cppuhelper/implbase1.hxx>
--#endif
--#ifndef _COMPHELPER_UNO3_HXX_
  #include <comphelper/uno3.hxx>
--#endif
 -
 -#include <com/sun/star/beans/XPropertySet.hpp>
 -
@@ -3232,18 +3194,11 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
 --- toolkit/source/awt/vclxscroller.cxx	6 Mar 2008 11:41:15 -0000	1.2
 +++ toolkit/source/awt/vclxscroller.cxx	28 Mar 2008 13:45:13 -0000	1.2.6.4
-@@ -1,32 +1,52 @@
+@@ -1,22 +1,51 @@
 -#include "vclxscroller.hxx"
--#ifndef _TOOLKIT_HELPER_PROPERTY_HXX_
 -#include "toolkit/helper/property.hxx"
--#endif
--#ifndef _COM_SUN_STAR_AWT_SCROLLBARORIENTATION_HPP_
 -#include <com/sun/star/awt/ScrollBarOrientation.hpp>
--#endif
--
--#ifndef _TOOLS_DEBUG_HXX
 -#include <tools/debug.hxx>
--#endif
 -#include <vcl/scrbar.hxx>
 +/*************************************************************************
 + *
@@ -3279,10 +3234,7 @@
 + *    MA  02110-1301  USA
 + *
 + ************************************************************************/
- 
--#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 -#include <toolkit/helper/vclunohelper.hxx>
--#endif
 +#include "vclxscroller.hxx"
  
 +#include <assert.h>
@@ -3444,7 +3396,7 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
 --- toolkit/source/awt/vclxscroller.hxx	6 Mar 2008 11:41:26 -0000	1.2
 +++ toolkit/source/awt/vclxscroller.hxx	28 Mar 2008 13:14:18 -0000	1.2.6.2
-@@ -1,37 +1,50 @@
+@@ -1,29 +1,50 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -3483,18 +3435,10 @@
  #ifndef LAYOUT_AWT_VCLXSCROLLER_HXX
  #define LAYOUT_AWT_VCLXSCROLLER_HXX
  
--#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
 -#include <toolkit/awt/vclxwindow.hxx>
--#endif
--#ifndef _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
 -#include <toolkit/helper/listenermultiplexer.hxx>
--#endif
--#ifndef _CPPUHELPER_IMPLBASE1_HXX_
 -#include <cppuhelper/implbase1.hxx>
--#endif
--#ifndef _COMPHELPER_UNO3_HXX_
  #include <comphelper/uno3.hxx>
--#endif
 -#include "../layout/bin.hxx"
 -
 -#include <com/sun/star/awt/MaxChildrenException.hpp>
@@ -3537,20 +3481,12 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
 --- toolkit/source/awt/vclxsplitter.cxx	6 Mar 2008 11:41:41 -0000	1.2
 +++ toolkit/source/awt/vclxsplitter.cxx	27 Mar 2008 13:08:18 -0000	1.2.6.3
-@@ -1,27 +1,51 @@
+@@ -1,19 +1,51 @@
 -#include "vclxsplitter.hxx"
--#ifndef _TOOLKIT_HELPER_PROPERTY_HXX_
 -#include "toolkit/helper/property.hxx"
--#endif
--
--#ifndef _TOOLS_DEBUG_HXX
 -#include <tools/debug.hxx>
--#endif
 -#include <vcl/split.hxx>
--
--#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 -#include <toolkit/helper/vclunohelper.hxx>
--#endif
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -3901,7 +3837,7 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
 --- toolkit/source/awt/vclxsplitter.hxx	6 Mar 2008 11:41:52 -0000	1.2
 +++ toolkit/source/awt/vclxsplitter.hxx	28 Mar 2008 13:45:13 -0000	1.2.6.4
-@@ -1,40 +1,59 @@
+@@ -1,32 +1,59 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -3940,18 +3876,10 @@
  #ifndef LAYOUT_AWT_VCLXSPLITTER_HXX
  #define LAYOUT_AWT_VCLXSPLITTER_HXX
  
--#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
 -#include <toolkit/awt/vclxwindow.hxx>
--#endif
--#ifndef _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
 -#include <toolkit/helper/listenermultiplexer.hxx>
--#endif
--#ifndef _CPPUHELPER_IMPLBASE1_HXX_
 -#include <cppuhelper/implbase1.hxx>
--#endif
--#ifndef _COMPHELPER_UNO3_HXX_
 -#include <comphelper/uno3.hxx>
--#endif
 -#include "../layout/container.hxx"
 -
  #include <com/sun/star/awt/MaxChildrenException.hpp>
@@ -4064,15 +3992,10 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
 --- toolkit/source/awt/vclxtabcontrol.cxx	6 Mar 2008 11:42:06 -0000	1.2
 +++ toolkit/source/awt/vclxtabcontrol.cxx	27 Mar 2008 13:08:18 -0000	1.2.6.3
-@@ -1,33 +1,51 @@
+@@ -1,21 +1,51 @@
 -#include "vclxtabcontrol.hxx"
--
--#ifndef _TOOLKIT_HELPER_PROPERTY_HXX_
 -#include "toolkit/helper/property.hxx"
--#endif
--#ifndef _COM_SUN_STAR_AWT_SCROLLBARORIENTATION_HPP_
 -#include <com/sun/star/awt/ScrollBarOrientation.hpp>
--#endif
 -
 +/*************************************************************************
 + *
@@ -4109,16 +4032,9 @@
 + *
 + ************************************************************************/
  
--#ifndef _TOOLS_DEBUG_HXX
 -#include <tools/debug.hxx>
--#endif
--#ifndef _SV_TABCTRL_HXX
 -#include <vcl/tabctrl.hxx>
--#endif
--
--#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 -#include <toolkit/helper/vclunohelper.hxx>
--#endif
 +#include "vclxtabcontrol.hxx"
  
 -#include <vcl/tabpage.hxx>
@@ -4618,7 +4534,7 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.5
 --- toolkit/source/awt/vclxtabcontrol.hxx	6 Mar 2008 11:42:19 -0000	1.2
 +++ toolkit/source/awt/vclxtabcontrol.hxx	28 Mar 2008 13:45:13 -0000	1.2.6.5
-@@ -1,46 +1,58 @@
+@@ -1,36 +1,58 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -4657,21 +4573,11 @@
  #ifndef LAYOUT_AWT_VCLXTABCONTROLLER_HXX
  #define LAYOUT_AWT_VCLXTABCONTROLLER_HXX
  
--#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
 -#include <toolkit/awt/vclxwindow.hxx>
--#endif
--#ifndef _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
 -#include <toolkit/helper/listenermultiplexer.hxx>
--#endif
--#ifndef _CPPUHELPER_IMPLBASE1_HXX_
 -#include <cppuhelper/implbase1.hxx>
--#endif
--#ifndef _COMPHELPER_UNO3_HXX_
 -#include <comphelper/uno3.hxx>
--#endif
--#ifndef _COM_SUN_STAR_AWT_XSIMPLETABCONTROLLER_HPP_
  #include <com/sun/star/awt/XSimpleTabController.hpp>
--#endif
 -#include "../layout/container.hxx"
 -
 -#include <com/sun/star/awt/MaxChildrenException.hpp>
@@ -5042,13 +4948,13 @@
 --- toolkit/source/awt/vclxwindow.cxx	29 Jan 2008 15:05:41 -0000	1.85
 +++ toolkit/source/awt/vclxwindow.cxx	20 Mar 2008 11:56:26 -0000	1.85.26.1
 @@ -82,6 +82,7 @@
- #ifndef _TOOLKIT_AWT_VCLXPOINTER_HXX_
- #include <toolkit/awt/vclxpointer.hxx>
- #endif
+ #include <com/sun/star/awt/XWindowListener2.hpp>
+ #include <com/sun/star/style/VerticalAlignment.hpp>
+ #include <toolkit/awt/vclxwindow.hxx>
 +#include <toolkit/awt/vclxwindows.hxx>
- #ifndef _TOOLKIT_HELPER_MACROS_HXX_
+ #include <toolkit/awt/vclxpointer.hxx>
  #include <toolkit/helper/macros.hxx>
- #endif
+ #include <toolkit/helper/vclunohelper.hxx>
 @@ -532,8 +533,10 @@ void VCLXWindowImpl::processEvent( const
          }
      }
@@ -9682,14 +9588,15 @@
 diff -p -u -u -p -b -w -B -r1.4 -r1.4.6.2
 --- toolkit/util/makefile.pmk	6 Mar 2008 11:55:48 -0000	1.4
 +++ toolkit/util/makefile.pmk	28 Mar 2008 09:39:07 -0000	1.4.6.2
-@@ -43,7 +43,4 @@ CFLAGS += -xldscope=hidden
+@@ -43,7 +43,7 @@ CFLAGS += -xldscope=hidden
  
  # FIXME: sprinkle some TOOLKIT_DLLPUBLIC
  
--.IF "$(ENABLE_LAYOUT)" == "TRUE"
++CFLAGS+=-I$(PRJ)/inc/layout
+ .IF "$(ENABLE_LAYOUT)" == "TRUE"
 -CFLAGS+=-I$(PRJ)/inc/layout
  CFLAGS+=-DENABLE_LAYOUT=1 -DTEST_LAYOUT=1
--.ENDIF # ENABLE_LAYOUT == TRUE
+ .ELSE
 cvs diff: Diffing toolkit/util/defs
 cvs diff: Diffing toolkit/workben
 cvs diff: Diffing toolkit/workben/layout

Modified: trunk/patches/dev300/layout-plugin-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-plugin-toolkit.diff	(original)
+++ trunk/patches/dev300/layout-plugin-toolkit.diff	Wed Apr 30 09:10:01 2008
@@ -998,18 +998,15 @@
 index 5a1de5d..206863d 100644
 --- a/workben/layout/simple-paragraph.cxx
 +++ toolkit/workben/layout/simple-paragraph.cxx
-@@ -41,7 +41,7 @@
+@@ -41,12 +41,12 @@
  
  // include ---------------------------------------------------------------
  
 -#include <stdio.h>
 +#include <cstdio>
- 
- #ifndef _SHL_HXX
  #include <tools/shl.hxx>
-@@ -53,7 +53,7 @@
+ #include <sfx2/objsh.hxx>
  #include <vcl/msgbox.hxx>
- #endif
  
 -#include <stdio.h>
 +#include <cstdio>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]