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

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14937 - in trunk: . patches/dev300
Date: Thu, 25 Dec 2008 20:50:05 +0000 (UTC)
Author: rengelhard
Date: Thu Dec 25 20:50:04 2008
New Revision: 14937
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14937&view=rev

Log:
        * patches/dev300/no-mozilla-plugin-option.diff: update for m38,
          don't rotate as DebianBaseOnly anyway


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/no-mozilla-plug-in-option.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Dec 25 20:50:04 2008
@@ -14,7 +14,7 @@
 	 Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
 	 Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
-	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
+	 Layout, VBABits, CalcErrors, Store, CJK, GCJ, Lwp, \
 	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
 	 PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo, \
 	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, UnusedMethodsRemoval, \
@@ -32,7 +32,7 @@
 	      UnUsedButNotYetRemovedFromSVN, WebDAVUpstream, \
 	      PostgreSQL, SELinux, VOSremoval, Glib2, \
 	      UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, \
-	      KDE4, MinGW
+	      KDE4, MinGW, VBAObjects
 DebianLooseSections: DebianBaseNoHelpContent
 # Optional sections
 Optional : DejaVuFonts, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
@@ -481,7 +481,7 @@
 
 [ Fixes == dev300-m37 ]
 # import/export form control's visibility
-form-control-visibility.diff, i#88878, jianhua
+#FIXME m38 form-control-visibility.diff, i#88878, jianhua
 
 [ Fixes > dev300-m37 ]
 # import/export form control's visibility
@@ -822,9 +822,9 @@
 # load, store and save the sheet protection options from and to an Excel file,
 # and use that information to constrain cell cursor movement when the sheet is
 # protected.  Also to support encryption on Excel file export.
-cws-scsheetprotection02-sc.diff,   i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-svx.diff,  i#60305, i#71468, i#84766, kohei
+#cws-scsheetprotection02-sc.diff,   i#60305, i#71468, i#84766, kohei
+#cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
+#cws-scsheetprotection02-svx.diff,  i#60305, i#71468, i#84766, kohei
 
 # Ensure that Print Preview is consistent with Print output.
 sc-print-selected-sheets.diff, n#335684, i#45497, jonp
@@ -867,7 +867,7 @@
 sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
 
 # overwrite character level font attributes when changing them at cell level.
-sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
+#sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
 
 # ignore manual breaks when the "fit to x pages wide and x pages tall" option
 # is used, for Excel interoperability.
@@ -1065,7 +1065,7 @@
 
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere
-reportdesign-mention-package.diff, rengelha
+#reportdesign-mention-package.diff, rengelha
 
 # fix the splash progressbar colors
 debian-splash.diff
@@ -1154,7 +1154,7 @@
 installer-get-path-correctly.diff, pmladek
 
 # enable build with IBM Java 1.6.0
-build-ibm-java-enable.diff, i#93114, pmladek
+#build-ibm-java-enable.diff, i#93114, pmladek
 
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
@@ -1238,7 +1238,7 @@
 default-no-startup-wizard.diff, michael
 
 # don't throw up the style dialog on 1st run
-default-no-style-dialog.diff, michael
+#default-no-style-dialog.diff, michael
 
 # pestering people serves no useful purpose
 default-no-registration.diff, michael
@@ -1651,7 +1651,7 @@
 svx-source-inc-fmundo-hxx.diff, i#68893
 svx-source-form-fmscriptingenv-cxx.diff, i#68893
 svx-source-form-makefile.diff, i#68893
-svx-source-form-fmundo-cxx.diff, i#68893
+#svx-source-form-fmundo-cxx.diff, i#68893
 
 vbaevents-services-build.diff, i#68893
 
@@ -1698,7 +1698,7 @@
 # Application.Caller
 api-application-caller.diff, n#339941, noelpwer
 
-default-autotext-and-form-name.diff, n#353687, i#85358
+#default-autotext-and-form-name.diff, n#353687, i#85358
 
 # fix --disable-vba build
 oovbaapi-disable-vba.diff
@@ -1860,7 +1860,7 @@
 sfx2-pre-and-postprocess-crash-fix.diff, n#270544, rodo
 # hack to ignore writerfilter if odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, jholesov
-sw-accept-reject-redline.diff, n#249775, Amelia Wang
+#sw-accept-reject-redline.diff, n#249775, Amelia Wang
 
 
 [ msaccess ]
@@ -1913,6 +1913,7 @@
 calc-formula-variable-separators-svx.diff,       n#447164, i#92056, kohei
 calc-formula-variable-separators-officecfg.diff, n#447164, i#92056, kohei
 
+[ CalcFixes < dev300-m38 ]
 # Fix parse failure on non-ASCII sheet names in Excel A1 and R1C1 modes.
 calc-xls-parser-sheet-name-fix-sc.diff, n#407807, i#92379, kohei
 
@@ -1929,17 +1930,17 @@
 calc-formula-datevalue-strip-time.diff, i#94765, kohei
 
 # Implement external range names.
-calc-external-defined-names-sc.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-offapi.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-officecfg.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-svtools.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-sc.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-offapi.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-officecfg.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-svtools.diff, i#3740, i#4385, n#355685, kohei
 
 # Don't adjust row height on xls load for better layout preservation and
 # faster file load.
 calc-xls-disable-adjust-row-height.diff, kohei
 
 # Support PHONETIC function to display asian phonetic guide.
-calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
+#calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
 
 # Support Excel English grammar needed for VBA and (probably) for xlsx filter.
 calc-grammar-xls-english-offapi.diff, kohei
@@ -2304,7 +2305,7 @@
 # FIXME: file more issuses when ready
 
 # teach build.pl what to do with prj/tests.lst's
-unittesting-build-pl.diff
+#unittesting-build-pl.diff
 
 # the tests
 unittesting-basebmp.diff
@@ -2598,10 +2599,10 @@
 
 # have Impress outline text boxes shrink font automatically when text
 # starts to overflow
-fit-list-to-size.diff, i#94086, thorsten
-fit-list-to-size-ui.diff, i#94086, thorsten
-fit-list-to-size-style-defaults.diff, i#94086, thorsten
-fit-list-to-size-popup.diff, i#94086, thorsten
+#fit-list-to-size.diff, i#94086, thorsten
+#fit-list-to-size-ui.diff, i#94086, thorsten
+#fit-list-to-size-style-defaults.diff, i#94086, thorsten
+#fit-list-to-size-popup.diff, i#94086, thorsten
 
 # apply this patch if you need to disable vcl grabbing your mouse -
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env

Modified: trunk/patches/dev300/no-mozilla-plug-in-option.diff
==============================================================================
--- trunk/patches/dev300/no-mozilla-plug-in-option.diff	(original)
+++ trunk/patches/dev300/no-mozilla-plug-in-option.diff	Thu Dec 25 20:50:04 2008
@@ -251,14 +251,14 @@
 -	{
 -		Pos = MAP_APPFONT ( 6 , 3 ) ;
 -        Size = MAP_APPFONT (  248 , 8  ) ;
--		Text[ en-US ] = "Mozilla Plug-in";
+-        Text[ en-US ] = "Browser Plug-in";
 -	};
 -	CheckBox CB_MOZPLUGIN_CODE
 -	{
 -		Pos = MAP_APPFONT ( 12 , 14 ) ;
 -		Size = MAP_APPFONT (  236 , 10  ) ;
 -		TabStop = TRUE ;
--		Text [ en-US ] = "~Enable" ;
+-        Text [ en-US ] = "~Display documents in browser" ;
 -	};
 -};
 -
@@ -269,11 +269,11 @@
  	HelpId = HID_OPTIONS_PROXY ;
 --- svx/source/dialog/treeopt.src	11 Apr 2008 00:17:12 -0000	1.21
 +++ svx/source/dialog/treeopt.src	16 Jun 2008 16:12:27 -0000
-@@ -186,7 +186,6 @@
+@@ -187,7 +187,6 @@
  			< "Proxy" ;  RID_SVXPAGE_INET_PROXY; > ;
  			< "Search" ;  RID_SVXPAGE_INET_SEARCH; > ;
  			< "E-mail" ;  RID_SVXPAGE_INET_MAIL; > ;
--			< "Mozilla Plug-in" ;  RID_SVXPAGE_INET_MOZPLUGIN; > ;
+-            < "Browser Plug-in" ;  RID_SVXPAGE_INET_MOZPLUGIN; > ;
  		};
  		//modified by jmeng end
  	};
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]