ooo-build r13418 - in trunk: . patches/dev300 patches/mono

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13418 - in trunk: . patches/dev300 patches/mono
Date: Mon, 28 Jul 2008 17:42:45 +0000 (UTC)
Author: rengelhard
Date: Mon Jul 28 17:42:45 2008
New Revision: 13418
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13418&view=rev

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

        * patches/dev300/reportdesign-mention-package.diff,
          patches/dev300/debian-system-jfreereport.diff,
          patches/dev300/configures-explicit-arch.diff,
          patches/dev300/apply: update Debian(Base)Only patches for
          dev300-m27/-m28
        * patches/dev300/linkwarn-svtools-miscopts-bits.diff-m26.diff: move ..
        * patches/dev300/linkwarn-svtools-miscopts-bits-m26.diff: ..here ...
        * patches/dev300/apply: .. and adapt apply      
        * patches/mono/mono-scp2.diff,
          patches/mono/mono-scp2-m27.diff,
          patches/dev300/apply: dev300-m28 update


Added:
   trunk/patches/dev300/linkwarn-svtools-miscopts-bits-m26.diff   (props changed)
      - copied unchanged from r13416, /trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff-m26.diff
   trunk/patches/mono/mono-scp2-m27.diff   (props changed)
      - copied unchanged from r13417, /trunk/patches/mono/mono-scp2.diff
Removed:
   trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff-m26.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/dev300/debian-system-jfreereport.diff
   trunk/patches/dev300/reportdesign-mention-package.diff
   trunk/patches/mono/mono-scp2.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 28 17:42:45 2008
@@ -958,7 +958,6 @@
 
 sensible-ooomua.diff
 sensible-browser.diff
-no-fontooo-wizard.diff
 pyuno-rpath-ooodir.diff
 default-cairo-disable.diff
 gcj-32bit-runtime-path.diff, i#64888, mklose
@@ -1513,7 +1512,9 @@
 # The build
 [ Mono >= dev300-m22 < dev300-m26 < beb300-m0 ]
 mono-scp2-m25.diff, rodo
-[ Mono >= dev300-m26 < beb300-m0 ]
+[ Mono >= dev300-m26 < dev300-m28 < beb300-m0 ]
+mono-scp2-m27.diff, rodo
+[ Mono >= dev300-m28 < beb300-m0 ]
 mono-scp2.diff, rodo
 
 [ Mono >= dev300-m22 < beb300-m0 ]
@@ -1996,9 +1997,9 @@
 [ CairoFonts ]
 # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
 ooo59127.vcl.honourcairofont.diff
-vcl-cairofont-multiscreen-fix.diff, thorsten
 
 [ CairoFonts < dev300-m28 ]
+vcl-cairofont-multiscreen-fix.diff, thorsten
 vcl-cairofont-transform-fix.diff, i#90037, caolan
 
 [ GStreamer ]
@@ -2442,7 +2443,7 @@
 linkwarn-sfx2-disable-cb-persistency.diff, n#348149, thorsten
 
 [ LinkWarningDlg <= dev300-m26]
-linkwarn-svtools-miscopts-bits.diff-m26
+linkwarn-svtools-miscopts-bits-m26.diff
 
 [ LinkWarningDlg > dev300-m26]
 linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Mon Jul 28 17:42:45 2008
@@ -170,14 +170,14 @@
 --- libxml2/makefile.mk	2 Jan 2008 17:30:52 -0000	1.17.18.1
 +++ libxml2/makefile.mk	11 Apr 2008 07:54:08 -0000
 @@ -93,7 +93,7 @@
- 
- CONFIGURE_DIR=
+ CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
+ .ELSE
  CONFIGURE_ACTION=.$/configure
 -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
 +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
+ .ENDIF
  BUILD_ACTION=$(GNUMAKE)
  BUILD_FLAGS+= -j$(EXTMAXPROCESS)
- BUILD_DIR=$(CONFIGURE_DIR)
 Index: libxmlsec/makefile.mk
 ===================================================================
 RCS file: /cvs/external/libxmlsec/makefile.mk,v

Modified: trunk/patches/dev300/debian-system-jfreereport.diff
==============================================================================
--- trunk/patches/dev300/debian-system-jfreereport.diff	(original)
+++ trunk/patches/dev300/debian-system-jfreereport.diff	Mon Jul 28 17:42:45 2008
@@ -24,28 +24,28 @@
 +  file:///usr/share/java/pentaho-reporting-flow-engine.jar
 +  file:///usr/share/java/sac.jar
  UNO-Type-Path: 
-Index: util/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/dba/reportdesign/util/makefile.mk,v
-retrieving revision 1.10.2.1
-diff -u -u -r1.10.2.1 makefile.mk
---- reportdesign/util/makefile.mk    11 Jan 2008 08:21:17 -0000      1.10.2.1
-+++ reportdesign/util/makefile.mk    15 Jan 2008 01:33:52 -0000
-@@ -222,17 +222,6 @@
+retrieving revision 1.20
+diff -u -r1.20 makefile.mk
+--- reportdesign/util/makefile.mk	25 Jul 2008 07:38:25 -0000	1.20
++++ reportdesign/util/makefile.mk	25 Jul 2008 23:21:46 -0000
+@@ -225,17 +225,6 @@
  
  # .jar files from solver
  COMPONENT_EXTJARFILES = \
--	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar				\
--	$(EXTENSIONDIR)$/jcommon-1.0.10.jar					\
--	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar				\
--	$(EXTENSIONDIR)$/libfonts-0.3.3.jar					\
--	$(EXTENSIONDIR)$/libformula-0.1.14.jar					\
--	$(EXTENSIONDIR)$/liblayout-0.2.8.jar					\
--	$(EXTENSIONDIR)$/libloader-0.3.6.jar					\
--	$(EXTENSIONDIR)$/librepository-0.1.4.jar				\
--	$(EXTENSIONDIR)$/libxml-0.9.9.jar					\
--	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar		\
+-	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar							\
+-	$(EXTENSIONDIR)$/jcommon-1.0.10.jar										\
+-	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar							\
+-	$(EXTENSIONDIR)$/libfonts-0.3.3.jar										\
+-	$(EXTENSIONDIR)$/libformula-0.1.14.jar									\
+-	$(EXTENSIONDIR)$/liblayout-0.2.8.jar										\
+-	$(EXTENSIONDIR)$/libloader-0.3.6.jar										\
+-	$(EXTENSIONDIR)$/librepository-0.1.4.jar									\
+-	$(EXTENSIONDIR)$/libxml-0.9.9.jar										\
+-	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar					\
 -	$(EXTENSIONDIR)$/sac.jar                                                \
- 	$(EXTENSIONDIR)$/sun-report-builder.jar
+ 	$(EXTENSIONDIR)$/sun-report-builder.jar \
+ 	$(EXTENSIONDIR)$/reportbuilderwizard.jar
  
- COMPONENT_MANIFEST_GENERIC:=TRUE

Modified: trunk/patches/dev300/reportdesign-mention-package.diff
==============================================================================
--- trunk/patches/dev300/reportdesign-mention-package.diff	(original)
+++ trunk/patches/dev300/reportdesign-mention-package.diff	Mon Jul 28 17:42:45 2008
@@ -32,7 +32,7 @@
                 Pos = MAP_APPFONT ( DLG_WIDTH / 2 + (CELL_PADDING/2), ACTION_LINE_START) ;
 --- dbaccess/source/ui/dlg/localize.sdf-old	2008-04-29 12:45:07.000000000 +0200
 +++ dbaccess/source/ui/dlg/localize.sdf	2008-04-29 12:47:49.000000000 +0200
-@@ -7034,48 +7034,8 @@
+@@ -7202,50 +7202,8 @@
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	vi	Tái ~vá...				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	zh-CN	äè(~D)...				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	zh-TW	äè(~D)...				2002-02-02 02:02:02
@@ -48,21 +48,23 @@
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				1	eo	Por malfermi raporton vi bezonas la etendajxon %RPT_EXTENSION_NAME.\n\nAlklaku 'Elsxuti...' por elsxuti kaj instali la etendajxon.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	es	Para abrir un informe se requiere la extensiÃn %RPT_EXTENSION_NAME.\n\nHaga clic en 'Descargar...' para descargar e instalar la extensiÃn.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	et	Aruande avamiseks on vaja laiendust %RPT_EXTENSION_NAME.\n\nLaienduse allalaadimiseks ja paigaldamiseks klÃpsa 'Laadi alla...'.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	fr	L'ouverture d'un rapport requiert l'extension %RPT_EXTENSION_NAME.\n\nCliquez sur TÃlÃcharger... pour tÃlÃcharger et installer l'extension.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	fr	L'ouverture d'un rapport requiert l'extension %RPT_EXTENSION_NAME.\n\nCliquez sur 'TÃlÃcharger...' pour tÃlÃcharger et installer l'extension.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	gl	NecesÃtase a extensiÃn %RPT_EXTENSION_NAME para abrir o informe.\n\nPrema 'Descargar...' para descargar e instalar a extensiÃn.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	gu	àààààà ààààà àààà àààà %RPT_EXTENSION_NAME àààààààààà ààààà àà.\n\nàààààààààà ààààààà àààà ààà ààààààà àààà àààà 'ààààààà...' ààààà àààà.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	hr	Za otvaranje izvjeÅÄa morate imati %RPT_EXTENSION_NAME proÅirenje.\n\nKliknite na  'Preuzmi...' kako bi preuzeli i instalirali proÅirenje.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	hu	JelentÃs megnyitÃsÃhoz %RPT_EXTENSION_NAME bÅvÃtÃsre van szÃksÃg.\n\nKattintson a âLetÃltÃs...â lehetÅsÃgre a bÅvÃtÃs letÃltÃse Ãs telepÃtÃse ÃrdekÃben.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	hu	TillÃgget %RPT_EXTENSION_NAME krÃvs fÃr att du ska kunna Ãppna rapporter.\n\nKlicka pÃ Ladda ner... fÃr att hÃmta och installera tillÃgget.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	it	Per aprire un rapporto Ã necessaria l'estensione %RPT_EXTENSION_NAME.\n\nFare clic su Scarica per scaricare e installare l'estensione.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ja	To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	km	ááááááâáááâáááááááááâááá ááááâááááááááâáááááâáááááá %RPT_EXTENSION_NAME.\n\nááá 'ááááá...' ááááááâáááâáá áááâáááááâáááááâááááááÂá				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	km	ááááááâáááâáááááááááâááá ááááâááááááááâáááááâáááááá %RPT_EXTENSION_NAMEÂá\n\nááá 'ááááá...' ááááááâáááâáá áááâáááááâáááááâááááááÂá				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ko	ëêìë ìëë íìì %RPT_EXTENSION_NAMEì(ê) íìíëë.\n\n'ëìëë...'ë íëíê íììë ëìëë ë ììíëë.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	lt	Ataskaitai atverti reikalingas plÄtinys %RPT_EXTENSION_NAME.\n\nSpustelÄkite âAtsisiÅsti...â, kad atsisiÅstumÄte ir ÄdiegtumÄte plÄtinÄ.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	mk	ÐÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑ ÐÐ ÑÑÐÐÐ ÐÑÐÑÐÑÑÐÐÑÐÑÐ %RPT_EXTENSION_NAME.\n\nÐÐÐÐÐÐÑÐ ÐÐ âÐÐÐÐÐ...â ÐÐ ÐÐ ÐÐ ÑÐÐÐÐÑÐ Ð ÐÐÑÑÐÐÐÑÐÑÐ ÐÑÐÑÐÑÑÐÐÑÐÑÐ.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	mn	ÐÐÐÐÐÐ ÐÑÑÑÐÐÐ ÑÑÐÐ ÑÐÐÐ %RPT_EXTENSION_NAME ÓÑÐÓÑÐÓÐ ÑÐÐÑÐÐÐÐÐÑÐÐ.\n\nÐÐÑÐÐ ÐÐÐÑ ÐÐÐÐÐ ÓÑÐÓÑÐÓÐÐÐÐ ÑÑÑÐÐÐÑÐÐÐ 'ÐÐÑÐÑ...' ÑÐÐÑÐÐÐ ÑÑ.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	nb	Du trenger utvidelsen %RPT_EXTENSION_NAME for Ã Ãpne rapporter.\n\nTrykk pÃ ÂLast nedÂ for Ã laste ned og installere utvidelsen.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ne	ààààààààà ààààà àààààààà ààààààà %RPT_EXTENSION_NAME àààààà ààààà à\n\nààààààà ààààààà à ààààààà àààà 'ààààààà...' ààààà ààààààààà à				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	nl	U hebt de extensie %RPT_EXTENSION_NAME nodig om een rapport te kunnen openen.\n\nKlik op 'Downloaden...' om de extensie te downloaden en installeren.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	nn	Du treng utvidinga %RPT_EXTENSION_NAME for Ã opna rapportar.\n\nTrykk pÃ ÂLast nedÂ for Ã lasta ned og installera utvidinga.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	pa-IN	ààà àààààà àààààà ààààà ààààààààà %RPT_EXTENSION_NAME àààààà ààà\n\nààààààààà ààààààà ààà àààààà ààà ààààà 'ààààààà...' àààà ààààà àààà				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	pl	Do otwarcia raportu potrzebne jest rozszerzenie %RPT_EXTENSION_NAME.\n\nW celu ÅciÄgniÄcia i zainstalowania rozszerzenia kliknij 'Pobierz...'.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	pt	Para abrir um relatÃrio, Ã necessÃrio a extensÃo %RPT_EXTENSION_NAME.\n\nClique em 'Download...' para fazer o download e instalar a extensÃo.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	pt-BR	Para abrir um relatÃrio, Ã necessÃrio a extensÃo %RPT_EXTENSION_NAME.\n\nClique em 'Download...' para fazer o download e instalar a extensÃo.				2002-02-02 02:02:02
@@ -72,13 +74,13 @@
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	sk	Pre otvorenie sprÃvy potrebujete rozÅÃrenie %RPT_EXTENSION_NAME.\n\nKliknite 'StiahnuÅ...' pre stiahnutie a inÅtalÃciu rozÅÃrenia.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	sl	Äe Åelite odpreti poroÄilo, potrebujete razÅiritev %RPT_EXTENSION_NAME.\n\nKliknite 'Prenesi ...', da prenesete in namestite razÅiritev.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	sr	ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐ %RPT_EXTENSION_NAME.\n\nÐÑÐÑÐÑÐÐÑÐ âÐÑÐÑÐÐÐ...â ÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ Ð ÐÐÑÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	sv	TillÃgget %RPT_EXTENSION_NAME krÃvs fÃr att du ska kunna Ãppna rapporten.\n\nKlicka pÃ "Ladda ner" fÃr att hÃmta och installera tillÃgget.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	sv	TillÃgget %RPT_EXTENSION_NAME krÃvs fÃr att du ska kunna Ãppna rapporter.\n\nKlicka pÃ Ladda ner... fÃr att hÃmta och installera tillÃgget.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	tr	%RPT_EXTENSION_NAME eklentisi raporlarÄ aÃmak iÃin gereklidir.\n\nEklentiyi indirip yÃklemek iÃin "Ändir..." dÃÄmesine tÄklayÄn.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	uk	ÐÐÑ ÑÐÐÐÐÑÐÐÐÐÑ ÐÐÑÑÑ ÐÐÑÑÑÐÐÐ ÑÐÐÑÐÑÐÐÐÑ %RPT_EXTENSION_NAME.\n\nÐÐÑÐÑÐÑÑÑ  "ÐÐÐÐÐÑÐÐÐÑÐ..." ÐÐÑ ÐÐÐÐÐÑÐÐÐÐÐÑ ÑÐ ÐÑÑÐÐÐÐÐÐÐÐÑ ÑÐÐÑÐÑÐÐÐÑ.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	vi	Khá nÄng má bÃo cÃo nhá phán má ráng %RPT_EXTENSION_NAME.\n\nNhán vÃo Â Tái vá... Â Äá tái vá vÃ cÃi Äát phán má ráng nÃy.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	zh-CN	äæåæèæéè %RPT_EXTENSION_NAME æåã\n\nèååâäè...âæäèååèèæåã				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	zh-TW	æéèææåèé %RPT_EXTENSION_NAME æèéååèã\n\nèæää [äè...] ääèååèæåèéã				2002-02-02 02:02:02
-+dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	de	Zum Ãffnen eines Berichts wird die Erweiterung %RPT_EXTENSION_NAME benÃtigt.\n\nnInstallieren Sie dafÃr das Paket 'openoffice.org-report-builder'.				2002-02-02 02:02:02
++dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	de	Zum Ãffnen eines Berichts wird die Erweiterung %RPT_EXTENSION_NAME benÃtigt.\n\nInstallieren Sie dafÃr das Paket 'openoffice.org-report-builder'.				2002-02-02 02:02:02
 +dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	fr	L'ouverture d'un rapport requiert l'extension %RPT_EXTENSION_NAME.\n\nPour cela, installez le package 'openoffice.org-report-builder'.				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\RelationDlg.src	0	fixedline	DLG_REL_PROPERTIES	FL_CASC_DEL			84	af	Skrapopsies				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\RelationDlg.src	0	fixedline	DLG_REL_PROPERTIES	FL_CASC_DEL			84	ar	ØÙØØØØ ØÙØØÙ				2002-02-02 02:02:02

Modified: trunk/patches/mono/mono-scp2.diff
==============================================================================
--- trunk/patches/mono/mono-scp2.diff	(original)
+++ trunk/patches/mono/mono-scp2.diff	Mon Jul 28 17:42:45 2008
@@ -28,8 +28,8 @@
  STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
  
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Lib_Cli_Oootypes_Assembly
      TXT_FILE_BODY;
@@ -37,8 +37,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  File gid_File_Lib_Policy_Cli_Oootypes_Assembly
      TXT_FILE_BODY;
      Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -46,8 +46,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Lib_Policy_Cli_Oootypes_Config
      TXT_FILE_BODY;
@@ -62,8 +62,8 @@
      // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05";
  End
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  File gid_File_Dl_Cli_Uno
      TXT_FILE_BODY;
      Dir = SCP2_URE_DL_DIR;
@@ -71,8 +71,8 @@
  End
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Dl_Cli_Ure_Assembly
      TXT_FILE_BODY;
@@ -80,8 +80,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Dl_Policy_Cli_Ure_Assembly
      TXT_FILE_BODY;
@@ -89,8 +89,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Dl_Policy_Cli_Ure_Config
      TXT_FILE_BODY;
@@ -98,8 +98,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Dl_Cli_Basetypes_Assembly
      TXT_FILE_BODY;
@@ -107,8 +107,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Dl_Policy_Cli_Basetypes_Assembly
      TXT_FILE_BODY;
@@ -116,8 +116,8 @@
  End
  
  #endif
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Dl_Policy_Cli_Basetypes_Config
      TXT_FILE_BODY;
@@ -125,8 +125,8 @@
  #endif
  
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Dl_Cli_Uretypes_Assembly
      TXT_FILE_BODY;
@@ -134,8 +134,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT || defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT || defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Dl_Policy_Cli_Uretypes_Assembly
      TXT_FILE_BODY;
@@ -143,8 +143,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Dl_Policy_Cli_Uretypes_Config
      TXT_FILE_BODY;
@@ -152,8 +152,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Lib_Cli_Cppuhelper_Assembly
      TXT_FILE_BODY;
@@ -161,8 +161,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
      TXT_FILE_BODY;
@@ -170,8 +170,8 @@
  
  #endif
  
--#if defined WNT && defined MSC
-+#if (defined WNT && defined MSC) || defined ENABLE_MONO
+-#if defined WNT && defined _MSC
++#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  
  File gid_File_Lib_Policy_Cli_Cppuhelper_Config
      TXT_FILE_BODY;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]