[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/linkwarn-officecfg-disable-msgbox.diff |    5 -
 patches/dev300/linkwarn-svx-warning-dlg.diff          |   48 +++++++-----------
 2 files changed, 21 insertions(+), 32 deletions(-)

New commits:
commit 6876db23abd0d98d4d0bf93dc3eccfce390dfdbd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 15:48:20 2009 +0300

    Adapt linkwarn-svx-warning-dlg.diff for dev300-m54
    
    * patches/dev300/linkwarn-svx-warning-dlg.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/linkwarn-svx-warning-dlg.diff b/patches/dev300/linkwarn-svx-warning-dlg.diff
index dc311fe..c3572c5 100644
--- a/patches/dev300/linkwarn-svx-warning-dlg.diff
+++ b/patches/dev300/linkwarn-svx-warning-dlg.diff
@@ -1,19 +1,19 @@
---- svx/inc/svx/dialogs.hrc	2008-05-08 07:03:42.000000000 +0200
-+++ svx/inc/svx/dialogs.hrc	2008-05-07 14:19:21.000000000 +0200
+--- svx/inc/svx/dialogs.hrc
++++ svx/inc/svx/dialogs.hrc
 @@ -38,7 +38,7 @@
  // Resource-Id's ------------------------------------------------------------
  
  // Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
--#define RID_SVX_FIRSTFREE                   303
-+#define RID_SVX_FIRSTFREE                   312
+-#define RID_SVX_FIRSTFREE                   305
++#define RID_SVX_FIRSTFREE                   314
  
  // ResId fuer die Hintergrund-TabPage
  #define RID_SVXPAGE_BACKGROUND              (RID_SVX_START +   1)
 @@ -437,6 +437,7 @@
- #define RID_SVXDLG_SECURITY_OPTIONS         (RID_SVX_START + 300)
- #define RID_SVXDLG_WEBCONNECTION_INFO       (RID_SVX_START + 301)
  #define RID_SVXPAGE_IMPROVEMENT             (RID_SVX_START + 302)
-+#define RID_SVXDLG_LINK_WARNING             (RID_SVX_START + 311)
+ #define RID_SVXPAGE_EVENTASSIGN			    (RID_SVX_START + 303)
+ #define RID_SVXPAGE_CONFIGGROUPBOX		    (RID_SVX_START + 304)
++#define RID_SVXDLG_LINK_WARNING             (RID_SVX_START + 313)
  // !!! please update RID_SVX_FIRSTFREE !!! see line 46
  
  // Strings ------------------------------------------------------------------
@@ -420,29 +420,21 @@ diff -urN ooo-build-anon/build/current/svx/source/dialog/linkwarn.src ooo-build/
 +};
 +
 +
---- svx/source/dialog/makefile.mk	2008-05-08 07:03:59.000000000 +0200
-+++ svx/source/dialog/makefile.mk	2008-05-07 17:19:22.000000000 +0200
+--- svx/source/dialog/makefile.mk
++++ svx/source/dialog/makefile.mk
 @@ -83,6 +83,7 @@
-         impgrf.src \
+         langbox.src \
          language.src \
          lingu.src \
 +        linkwarn.src \
-         numfmt.src \
-         numpages.src \
-         page.src \
+         passwd.src \
+         prtqry.src \
+         rubydialog.src\
 @@ -191,6 +192,7 @@
-     $(SLO)$/hldoctp.obj \
-     $(SLO)$/imapdlg.obj \
-     $(SLO)$/imapwnd.obj \
-+    $(SLO)$/linkwarn.obj \
-     $(SLO)$/measure.obj \
-     $(SLO)$/dstribut.obj \
-     $(SLO)$/measctrl.obj \
-@@ -336,6 +338,7 @@
- 	$(SLO)$/hdft.obj     \
- 	$(SLO)$/impgrf.obj   \
- 	$(SLO)$/langbox.obj \
-+    $(SLO)$/linkwarn.obj \
- 	$(SLO)$/wrapfield.obj    \
- 	$(SLO)$/pagectrl.obj \
- 	$(SLO)$/paraprev.obj \
+         $(SLO)$/hyprlink.obj \
+         $(SLO)$/imapdlg.obj \
+         $(SLO)$/imapwnd.obj \
++        $(SLO)$/linkwarn.obj \
+         $(SLO)$/impgrf.obj \
+         $(SLO)$/langbox.obj \
+         $(SLO)$/measctrl.obj \
commit adc9638bd350f4bf50ddc5f2d58e9937caa25640
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 15:31:23 2009 +0300

    Adapt linkwarn-officecfg-disable-msgbox.diff for dev300-m54
    
    * patches/dev300/linkwarn-officecfg-disable-msgbox.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/linkwarn-officecfg-disable-msgbox.diff b/patches/dev300/linkwarn-officecfg-disable-msgbox.diff
index 46c1ad5..145e088 100644
--- a/patches/dev300/linkwarn-officecfg-disable-msgbox.diff
+++ b/patches/dev300/linkwarn-officecfg-disable-msgbox.diff
@@ -1,12 +1,9 @@
-diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
-index 6ac320f..3bdbf9e 100644
 --- officecfg/registry/schema/org/openoffice/Office/Common.xcs
 +++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
-@@ -5590,7 +5590,15 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
+@@ -5590,6 +5590,15 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
  				</info>
  				<value>true</value>
  			</prop>
--
 +			<prop oor:name="ShowLinkWarningDialog" oor:type="xs:boolean">
 +				<info>
 +					<author>THB</author>