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

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue May  6 08:41:26 2008
New Revision: 12472
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12472&view=rev

Log:
2008-05-06  Rene Engelhard  <rene debian org>

        * patches/dev300/svx-missing-initialization-m10.diff,
          patches/dev300/svx-missing-initialization.diff,
          patches/dev300/pdfimport-no-license-m10.diff,
          patches/dev300/pdfimport-no-license.diff,
          patches/dev300/cws-layoutdialogs-toolkit.diff,
          patches/dev300/cws-layoutdialogs-toolkit-m10.diff,
          patches/dev300/static-libs-use-_pic.diff,
          patches/dev300/apply: initial dev300-m11 work, SVGImport needs some
          huge changes still
        * patches/dev300/apply: move redirect-extensions.diff into
          FixesNotForUpstream and therefore to the Common set


Added:
   trunk/patches/dev300/cws-layoutdialogs-toolkit-m10.diff
      - copied unchanged from r12469, /trunk/patches/dev300/cws-layoutdialogs-toolkit.diff
   trunk/patches/dev300/pdfimport-no-license-m10.diff
      - copied unchanged from r12469, /trunk/patches/dev300/pdfimport-no-license.diff
   trunk/patches/dev300/svx-missing-initialization-m10.diff
      - copied unchanged from r12469, /trunk/patches/dev300/svx-missing-initialization.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/cws-layoutdialogs-toolkit.diff
   trunk/patches/dev300/pdfimport-no-license.diff
   trunk/patches/dev300/static-libs-use-_pic.diff
   trunk/patches/dev300/svx-missing-initialization.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue May  6 08:41:26 2008
@@ -333,10 +333,18 @@
 libwpd.diff, fridrich
 writerperfect-nocondensedparagraphs.diff, fridrich
 
+# re-direct to plugins via http://extensions.go-oo.org/
+redirect-extensions.diff
+
 # no bogus license question when registering these extensions
 reportdesigner-no-license.diff
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
+
+[ FixesNotForUpstream < dev300-m11 ]
+pdfimport-no-license-m10.diff
+
+[ FixesNotForUpstream >= dev300-m11 ]
 pdfimport-no-license.diff
 
 [ swextFixes ]
@@ -383,9 +391,11 @@
 # more secure permissions for the user directory by default
 desktop-safer-user-dir-perm.diff, i#62858, pmladek
 
+[ Fixes < dev300-m11 ]
 # fixes some wrong usages of the function AddBytes that would malform the xml output
 sax-writer.diff, i#66693, pmladek
 
+[ Fixes ]
 # Added support for "application/octet-stream" mime type in package manager
 desktop-application-octet-stream-mime-type.diff, i#73301, flr
 
@@ -426,9 +436,15 @@
 # convert kind of correctly nested positioned tables
 # sw-nested-positionned-tables-ww8-import-fix.diff, i#86988, fridrich
 
+[ Fixes < dev300-m11 ]
+# init all members in svx's line geometry creator
+svx-missing-initialization-m10.diff, i#86163, thorsten
+
+[ Fixes >= dev300-m11 ]
 # init all members in svx's line geometry creator
 svx-missing-initialization.diff, i#86163, thorsten
 
+[ Fixes ]
 # init all members in VirDev's ctor
 vcl-virdev-missing-initialisation.diff, i#88535, thorsten
 
@@ -802,8 +818,6 @@
 # use --hash-style=gnu linking when supported
 # disabled for Debian as Debian policy (for now) is to use=both
 speed-hash-style.diff, pmladek
-# re-direct to plugins via http://extensions.go-oo.org/
-redirect-extensions.diff
 
 
 [ CustomUserConfig ]
@@ -1101,6 +1115,7 @@
 # fix build with vba as extension
 buildfix-vba-as-extn.diff, i#86937, hmth
 
+[ BuildBits < dev300-m11 ]
 # fix build with gcc-4.3 on ix86
 gcc-4.3-bridges.diff, i#86551, pmladek
 
@@ -1847,7 +1862,14 @@
 cws-layoutdialogs-scp2.diff
 cws-layoutdialogs-svx.diff
 cws-layoutdialogs-sw.diff
+
+[ LayoutDialogs < dev300-m11 ]
+cws-layoutdialogs-toolkit-m10.diff
+
+[ LayoutDialogs >= dev300-m11 ]
 cws-layoutdialogs-toolkit.diff
+
+[ LayoutDialogs ]
 cws-layoutdialogs-transex3.diff
 
 layout-plugin-toolkit.diff

Modified: trunk/patches/dev300/cws-layoutdialogs-toolkit.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-toolkit.diff	(original)
+++ trunk/patches/dev300/cws-layoutdialogs-toolkit.diff	Tue May  6 08:41:26 2008
@@ -4955,17 +4955,6 @@
  #include <toolkit/awt/vclxpointer.hxx>
  #include <toolkit/helper/macros.hxx>
  #include <toolkit/helper/vclunohelper.hxx>
-@@ -532,8 +533,10 @@ void VCLXWindowImpl::processEvent( const
-         }
-     }
-     else
-+    {
-         DBG_ERROR( "VCLXWindowImpl::processEvent: what kind of event *is* this (3)?" );
- }
-+}
- 
- //--------------------------------------------------------------------
- void SAL_CALL VCLXWindowImpl::acquire()
 @@ -2330,14 +2333,6 @@ void VCLXWindow::setProperty( const ::rt
  		WindowType nWinType = GetWindow()->GetType();
  		switch ( nWinType )

Modified: trunk/patches/dev300/pdfimport-no-license.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-no-license.diff	(original)
+++ trunk/patches/dev300/pdfimport-no-license.diff	Tue May  6 08:41:26 2008
@@ -27,17 +27,16 @@
  ZIP1TARGET=		pdfimport
  ZIP1DIR=		$(MISC)$/pdfimport
  ZIP1EXT=		.oxt
-@@ -143,10 +137,6 @@
- 	@@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
+@@ -176,9 +176,6 @@
+     .ENDIF
+ .ENDIF         # "$(PACKMS)"!=""
+ .ENDIF 
 -$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
 -	@@-$(MKDIRHIER) $(@:d)
 -	$(GNUCOPY) $< $@
--
+ 
  $(MISC)$/pdfimport$/%.xcu : config$/%.xcu
  	@@-$(MKDIRHIER) $(@:d)
- 	$(GNUCOPY) $< $@
 Index: source/pdfimport/config/description.xml
 ===================================================================
 RCS file: /cvs/framework/filter/source/pdfimport/config/description.xml,v
@@ -45,13 +44,14 @@
 diff -u -u -r1.1.4.2 description.xml
 --- filter/source/pdfimport/config/description.xml	23 Jan 2008 15:16:33 -0000	1.1.4.2
 +++ filter/source/pdfimport/config/description.xml	5 Apr 2008 14:26:25 -0000
-@@ -7,9 +7,4 @@
- 	<dependencies>
- 		<OpenOffice.org-minimal-version value="2.3" d:name="OpenOffice.org 2.3"/>
- 	</dependencies>
+@@ -10,10 +10,5 @@
+ 	  <dependencies>
+ 		<OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/>
+   </dependencies>
 -	<registration>
 -        <simple-license accept-by="admin" default-license-id="lic-en-US">
 -            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
 -        </simple-license>
 -    </registration>
+   <platform value="UPDATED_SUPPORTED_PLATFORM" />
  </description>

Modified: trunk/patches/dev300/static-libs-use-_pic.diff
==============================================================================
--- trunk/patches/dev300/static-libs-use-_pic.diff	(original)
+++ trunk/patches/dev300/static-libs-use-_pic.diff	Tue May  6 08:41:26 2008
@@ -28,19 +28,12 @@
  .ELSE
  AGGLIB=-lagg$(OFFICEUPD)$(DLLPOSTFIX)
  .ENDIF
-@@ -321,13 +321,13 @@
- SABLOT3RDLIB=-lsablot
- APP3RDLIB=-lapp
- SAMPLE3RDLIB=-lsample
--HNJLIB=-lhnj
-+HNJLIB*=-lhnj
- MYSPELLLIB=-lmyspell
- COSVLIB=-lcosv
+@@ -335,7 +335,7 @@
  UDMLIB=-ludm
  HUNSPELLLIB*=-lhunspell
  ULINGULIB=-lulingu
 -MYTHESLIB=-lmythes
 +MYTHESLIB*=-lmythes
  PYUNOLIB=-lpyuno
-
- .ELSE                          # "$(GUI)"=="UNX"
+ LPSOLVELIB=-llpsolve55
+ SOFFICELIB=-lsoffice

Modified: trunk/patches/dev300/svx-missing-initialization.diff
==============================================================================
--- trunk/patches/dev300/svx-missing-initialization.diff	(original)
+++ trunk/patches/dev300/svx-missing-initialization.diff	Tue May  6 08:41:26 2008
@@ -35,15 +35,3 @@
  	pHeaderFooterEntry		( NULL ),
  	pSolverContainer		( NULL ),
 
---- svx/source/inc/svdoimp.hxx	26 Nov 2007 14:51:11 -0000	1.11
-+++ svx/source/inc/svdoimp.hxx	28 Mar 2008 19:15:52 -0000
-@@ -258,7 +258,8 @@ public:
- 		basegfx::B2DPolyPolygon& rPoLi)
- 	:	mrLineAttr(rAttr),
- 		maAreaPolyPolygon(rPoPo),
--		maLinePolyPolygon(rPoLi)
-+		maLinePolyPolygon(rPoLi),
-+       mbLineDraft(false)
- 	{
- 	}
-