ooo-build r14971 - in trunk: . patches/dev300
- From: rengelhard svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14971 - in trunk: . patches/dev300
- Date: Tue, 30 Dec 2008 16:21:38 +0000 (UTC)
Author: rengelhard
Date: Tue Dec 30 16:21:38 2008
New Revision: 14971
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14971&view=rev
Log:
2008-12-30 Rene Engelhard <rene debian org>
* patches/dev300/apply: reenable oosplash-etc-openoffice-sofficerc.diff
* patches/dev300/reportesign-mention-package.diff: update for m38
and adapt to DOS-lineends *sigh*
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/reportdesign-mention-package.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Tue Dec 30 16:21:38 2008
@@ -1066,7 +1066,7 @@
no-mozilla-plug-in-option.diff
# read variables from /etc/openoffice/sofficerc, since /usr/lib/openoffice/sofficerc
# just refers to it
-#FIXME_m37 oosplash-etc-openoffice-sofficerc.diff
+oosplash-etc-openoffice-sofficerc.diff
# build using -O2 on x86 and sparc according to Debian policy.
debian-opt.diff
ubuntu-soffice-config.diff, mklose
Modified: trunk/patches/dev300/reportdesign-mention-package.diff
==============================================================================
--- trunk/patches/dev300/reportdesign-mention-package.diff (original)
+++ trunk/patches/dev300/reportdesign-mention-package.diff Tue Dec 30 16:21:38 2008
@@ -5,31 +5,33 @@
diff -u -u -r1.3 ExtensionNotPresent.src
--- dbaccess/source/ui/dlg/ExtensionNotPresent.src 2 Aug 2007 14:26:39 -0000 1.3
+++ dbaccess/source/ui/dlg/ExtensionNotPresent.src 8 Aug 2007 12:34:08 -0000
-@@ -41,7 +41,7 @@
-
- String RID_STR_EXTENSION_NOT_PRESENT
- {
-- Text [ en-US ] = "To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension.";
-+ Text [ en-US ] = "To open a report you require the extension %RPT_EXTENSION_NAME.\n\nFor this, install the package 'openoffice.org-report-builder'.";
- };
- // To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name
- // String RID_STR_EXTENSION_NAME
-@@ -76,15 +76,6 @@
- // Text will set outside from RID_STR_EXTENSION_NOT_PRESENT
- };
-
-- PushButton PB_DOWNLOAD
-- {
-- Pos = MAP_APPFONT ( DLG_WIDTH / 2 - (CELL_PADDING/2) - BUTTON_WIDTH, ACTION_LINE_START ) ;
-- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
-- DefButton = TRUE ;
-- TabStop = TRUE ;
-- Text [ en-US ] = "~Download..." ;
-- };
--
- CancelButton PB_CANCEL
- {
- Pos = MAP_APPFONT ( DLG_WIDTH / 2 + (CELL_PADDING/2), ACTION_LINE_START) ;
+@@ -37,8 +37,8 @@
+ String RID_STR_EXTENSION_NOT_PRESENT
+ {
+ // #i96130# use hard coded name
+- Text [ en-US ] = "To open a report you require the extension Sunâ Report Builder.\n\nClick 'Download...' to download and install the extension.";
+- // OLD: Text [ en-US ] = "To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension.";
++ Text [ en-US ] = "To open a report you require the extension Sunâ Report Builder.\n\nor this, install the package 'openoffice.org-report-builder'.";
++ // OLD: Text [ en-US ] = "To open a report you require the extension %RPT_EXTENSION_NAME.\n\nor this, install the package 'openoffice.org-report-builder'.";
+ };
+ // To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name
+ // String RID_STR_EXTENSION_NAME
+@@ -73,15 +73,6 @@
+ // Text will set outside from RID_STR_EXTENSION_NOT_PRESENT
+ };
+
+- PushButton PB_DOWNLOAD
+- {
+- Pos = MAP_APPFONT ( DLG_WIDTH / 2 - (CELL_PADDING/2) - BUTTON_WIDTH, ACTION_LINE_START ) ;
+- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
+- DefButton = TRUE ;
+- TabStop = TRUE ;
+- Text [ en-US ] = "~Download..." ;
+- };
+-
+ CancelButton PB_CANCEL
+ {
+ 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
@@ -7279,50 +7279,9 @@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]