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

[Tor Lillqvist]

 patches/dev300/offapi-typecheck-whitelist.diff |    2 
 patches/dev300/sw-dialogs-resize.diff          |   86 +++++++++----------------
 2 files changed, 35 insertions(+), 53 deletions(-)

New commits:
commit 4ce811bb61e6e1f65e8034773d74625d4097333f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 27 10:42:25 2009 +0300

    Adapt sw-dialogs-resize.diff to dev300-m56
    
    * patches/dev300/sw-dialogs-resize.diff: Adapt to dev300-m56.

diff --git a/patches/dev300/sw-dialogs-resize.diff b/patches/dev300/sw-dialogs-resize.diff
index 04945b2..61e25ca 100644
--- a/patches/dev300/sw-dialogs-resize.diff
+++ b/patches/dev300/sw-dialogs-resize.diff
@@ -40,60 +40,42 @@
  		TabStop = TRUE ;
  		Hide = TRUE ;
  		Text [ en-US ] = "Auto~Format..." ;
---- sw/source/ui/table/colwd.src.orig	2009-01-16 22:32:29.000000000 +0100
-+++ sw/source/ui/table/colwd.src	2009-01-16 22:37:01.000000000 +0100
+--- sw/source/ui/table/colwd.src
++++ sw/source/ui/table/colwd.src
 @@ -63,14 +63,14 @@
- 	FixedText FT_WIDTH
- 	{
- 		Pos = MAP_APPFONT ( 12 , 31 ) ;
--		Size = MAP_APPFONT ( 22 , 8 ) ;
-+		Size = MAP_APPFONT ( 28 , 8 ) ;
- 		Text [ en-US ] = "~Width" ;
- 		Left = TRUE ;
- 	};
- 	MetricField ED_WIDTH
- 	{
- 		Border = TRUE ;
--		Pos = MAP_APPFONT ( 41 , 30 ) ;
-+		Pos = MAP_APPFONT ( 44 , 30 ) ;
- 		Size = MAP_APPFONT ( 38 , 12 ) ;
- 		TabStop = TRUE ;
- 		Left = TRUE ;
+     FixedText FT_WIDTH
+     {
+         Pos = MAP_APPFONT ( 12 , 31 ) ;
+-        Size = MAP_APPFONT ( 35 , 8 ) ;
++        Size = MAP_APPFONT ( 41 , 8 ) ;
+         Text [ en-US ] = "~Width" ;
+         Left = TRUE ;
+     };
+     MetricField ED_WIDTH
+     {
+         Border = TRUE ;
+-        Pos = MAP_APPFONT ( 51 , 30 ) ;
++        Pos = MAP_APPFONT ( 54 , 30 ) ;
+         Size = MAP_APPFONT ( 38 , 12 ) ;
+         TabStop = TRUE ;
+         Left = TRUE ;
 @@ -101,7 +101,7 @@
- 	NumericField ED_COL
- 	{
- 		Border = TRUE ;
--		Pos = MAP_APPFONT ( 41 , 14 ) ;
-+		Pos = MAP_APPFONT ( 44 , 14 ) ;
- 		Size = MAP_APPFONT ( 38 , 12 ) ;
- 		TabStop = TRUE ;
- 		Left = TRUE ;
---- sw/source/ui/config/optdlg.src.orig	2009-01-16 22:57:46.000000000 +0100
-+++ sw/source/ui/config/optdlg.src	2009-01-16 22:59:53.000000000 +0100
+     NumericField ED_COL
+     {
+         Border = TRUE ;
+-        Pos = MAP_APPFONT ( 51 , 14 ) ;
++        Pos = MAP_APPFONT ( 54 , 14 ) ;
+         Size = MAP_APPFONT ( 38 , 12 ) ;
+         TabStop = TRUE ;
+         Left = TRUE ;
+--- sw/source/ui/config/optdlg.src
++++ sw/source/ui/config/optdlg.src
 @@ -60,7 +60,7 @@
      CheckBox CB_CROSS
- 	{
+     {
          Pos = MAP_APPFONT ( 12 , 14 ) ;
--		Size = MAP_APPFONT ( 108 , 10 ) ;
-+		Size = MAP_APPFONT ( 116 , 10 ) ;
-     	Text [ en-US ] = "Guides ~while moving";
- 	};
- 	CheckBox CB_HANDLE
-@@ -103,7 +103,7 @@
-     CheckBox CB_HRULER
- 	{
-         Pos = MAP_APPFONT ( 142 , 53 ) ;
--        Size = MAP_APPFONT ( 61 , 10 ) ;
-+        Size = MAP_APPFONT ( 62 , 10 ) ;
- 		Text [ en-US ] = "Hori~zontal ruler" ;
- 	};
-     ListBox LB_HMETRIC
-@@ -115,7 +115,7 @@
-     CheckBox CB_VRULER
- 	{
-         Pos = MAP_APPFONT ( 142 , 66 ) ;
--        Size = MAP_APPFONT ( 61 , 10 ) ;
-+        Size = MAP_APPFONT ( 62 , 10 ) ;
- 		Text [ en-US ] = "Verti~cal ruler" ;
- 	};
-     CheckBox CB_VRULER_RIGHT
+-        Size = MAP_APPFONT ( 118 , 10 ) ;
++        Size = MAP_APPFONT ( 126 , 10 ) ;
+         Text [ en-US ] = "Guides ~while moving";
+     };
+     CheckBox CB_HANDLE
commit 5b0439897b8fcf3921654bf62bd9b4020b34ae65
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 27 10:26:38 2009 +0300

    Adapt offapi-typecheck-whitelist.diff to dev300-m56
    
    * patches/dev300/offapi-typecheck-whitelist.diff: Adapt to dev300-m56.

diff --git a/patches/dev300/offapi-typecheck-whitelist.diff b/patches/dev300/offapi-typecheck-whitelist.diff
index 9659b3b..ea568bd 100644
--- a/patches/dev300/offapi-typecheck-whitelist.diff
+++ b/patches/dev300/offapi-typecheck-whitelist.diff
@@ -17,7 +17,7 @@
  #     for versioning of UNO cli type libraries
 -$(UNOTYPE_STATISTICS) : $(REGISTRYCHECKFLAG)
 +$(UNOTYPE_STATISTICS) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
-     $(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" > $@
+     $(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" "$(REGVIEWTOOL)" > $@
  
  .INCLUDE :  target.mk
 --- /dev/null	2007-09-21 21:12:45.000000000 +0200