ooo-build r12110 - in trunk: . patches/dev300 patches/src680

From: jannieuw svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12110 - in trunk: . patches/dev300 patches/src680
Date: Sat, 5 Apr 2008 13:19:40 +0100 (BST)
Author: jannieuw
Date: Sat Apr  5 13:19:40 2008
New Revision: 12110
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12110&view=rev

Log:
2008-04-05  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/cws-layoutdialogs-svx.diff:
	* patches/dev300/cws-layoutdialogs-toolkit.diff:
	* patches/src680/cws-layoutdialogs-svx.diff:
	* patches/src680/cws-layoutdialogs-sw.diff:
	* patches/src680/cws-layoutdialogs-toolkit.diff:
	* patches/src680/cws-layoutdialogs-transex3.diff: Update from CWS.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-layoutdialogs-svx.diff
   trunk/patches/dev300/cws-layoutdialogs-toolkit.diff
   trunk/patches/src680/cws-layoutdialogs-svx.diff
   trunk/patches/src680/cws-layoutdialogs-sw.diff
   trunk/patches/src680/cws-layoutdialogs-toolkit.diff
   trunk/patches/src680/cws-layoutdialogs-transex3.diff

Modified: trunk/patches/dev300/cws-layoutdialogs-svx.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-svx.diff	(original)
+++ trunk/patches/dev300/cws-layoutdialogs-svx.diff	Sat Apr  5 13:19:40 2008
@@ -99,9 +99,10 @@
 RCS file: svx/uiconfig/layout/delzip
 diff -N svx/uiconfig/layout/delzip
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ svx/uiconfig/layout/delzip	31 Mar 2008 15:01:30 -0000	1.1.2.1
-@@ -0,0 +1,1 @@
++++ svx/uiconfig/layout/delzip	3 Apr 2008 08:39:33 -0000	1.1.2.2
+@@ -0,0 +1 @@
 +empty
+\ No newline at end of file
 Index: svx/uiconfig/layout/layout.mk
 ===================================================================
 RCS file: svx/uiconfig/layout/layout.mk
@@ -647,7 +648,7 @@
 RCS file: svx/uiconfig/layout/makefile.mk
 diff -N svx/uiconfig/layout/makefile.mk
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ svx/uiconfig/layout/makefile.mk	31 Mar 2008 15:01:53 -0000	1.1.2.3
++++ svx/uiconfig/layout/makefile.mk	3 Apr 2008 16:47:47 -0000	1.1.2.4
 @@ -0,0 +1,54 @@
 +#*************************************************************************
 +#
@@ -708,9 +709,12 @@
 RCS file: svx/uiconfig/layout/zoom.xml
 diff -N svx/uiconfig/layout/zoom.xml
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ svx/uiconfig/layout/zoom.xml	28 Mar 2008 11:19:37 -0000	1.1.2.1
-@@ -0,0 +1,56 @@
++++ svx/uiconfig/layout/zoom.xml	4 Apr 2008 09:14:29 -0000	1.1.2.2
+@@ -0,0 +1,59 @@
 +<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
 +
 +<modaldialog xmlns="http://openoffice.org/2007/layout";
 +             xmlns:cnt="http://openoffice.org/2007/layout/container";

Modified: trunk/patches/dev300/cws-layoutdialogs-toolkit.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-toolkit.diff	(original)
+++ trunk/patches/dev300/cws-layoutdialogs-toolkit.diff	Sat Apr  5 13:19:40 2008
@@ -7414,10 +7414,10 @@
 ===================================================================
 RCS file: /cvs/gsl/toolkit/source/layout/root.cxx,v
 retrieving revision 1.2
-retrieving revision 1.2.6.6
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.6
+retrieving revision 1.2.6.7
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.7
 --- toolkit/source/layout/root.cxx	6 Mar 2008 11:47:44 -0000	1.2
-+++ toolkit/source/layout/root.cxx	28 Mar 2008 16:31:30 -0000	1.2.6.6
++++ toolkit/source/layout/root.cxx	3 Apr 2008 08:03:18 -0000	1.2.6.7
 @@ -1,6 +1,49 @@
 +/*************************************************************************
 + *
@@ -7468,7 +7468,7 @@
  #include <com/sun/star/xml/sax/XParser.hpp>
  
  #include "helper.hxx"
-@@ -42,6 +85,37 @@ LayoutRoot::~LayoutRoot()
+@@ -42,6 +86,37 @@ LayoutRoot::~LayoutRoot()
      }
  }
  
@@ -7506,7 +7506,7 @@
  // XInitialization
  void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArguments )
      throw ( uno::Exception,
-@@ -66,36 +140,36 @@ void SAL_CALL LayoutRoot::initialize( co
+@@ -66,36 +141,36 @@ void SAL_CALL LayoutRoot::initialize( co
  
      uno::Reference< xml::sax::XParser > xParser
          ( mxFactory->createInstance(
@@ -7554,7 +7554,7 @@
      ImportContext *pCtx = new ImportContext( *this );
  
      uno::Reference< xml::input::XRoot > xRoot( pCtx );
-@@ -103,17 +177,31 @@ void SAL_CALL LayoutRoot::initialize( co
+@@ -103,17 +178,31 @@ void SAL_CALL LayoutRoot::initialize( co
      aArgs[0] <<= xRoot;
      uno::Reference< xml::sax::XDocumentHandler > xDocHandler
          (mxFactory->createInstanceWithArguments
@@ -7588,7 +7588,7 @@
  
  // XLayoutContainer
  uno::Reference< awt::XLayoutContainer > LayoutRoot::getLayoutContainer() throw (uno::RuntimeException)
-@@ -249,7 +337,7 @@ LayoutWidget *LayoutRoot::create( OUStri
+@@ -249,7 +338,7 @@ LayoutWidget *LayoutRoot::create( OUStri
      return pWidget;
  }
  
@@ -7597,7 +7597,7 @@
    uno::Reference< awt::XLayoutConstrains > LayoutRoot::getToplevel()
    {
    if ( mpToplevel )
-@@ -265,7 +353,7 @@ LayoutWidget *LayoutRoot::create( OUStri
+@@ -265,7 +354,7 @@ LayoutWidget *LayoutRoot::create( OUStri
    rRef = i->second;
    return rRef;
    }
@@ -9595,6 +9595,27 @@
  #endif // WRAPPER_HXX
 cvs diff: Diffing toolkit/src2xml
 cvs diff: Diffing toolkit/src2xml/source
+Index: toolkit/src2xml/source/src2xml.py
+===================================================================
+RCS file: /cvs/gsl/toolkit/src2xml/source/src2xml.py,v
+retrieving revision 1.2
+retrieving revision 1.2.6.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+--- toolkit/src2xml/source/src2xml.py	6 Mar 2008 11:54:56 -0000	1.2
++++ toolkit/src2xml/source/src2xml.py	4 Apr 2008 09:13:34 -0000	1.2.6.1
+@@ -183,7 +183,11 @@ def post_process (s):
+     s = s.replace (' def-button="true"', ' default="true"')
+     return s
+ 
+-XML_HEADER = '<?xml version="1.0" encoding="UTF-8"?>\n'
++XML_HEADER = '''<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated XML files are generated from this template by
++     transex3/layout/tralay.  !-->
++'''
+ 
+ def do_one_file (file_name, options):
+     str = XML_HEADER
 cvs diff: Diffing toolkit/test
 cvs diff: Diffing toolkit/test/accessibility
 cvs diff: Diffing toolkit/test/accessibility/ov
@@ -11539,9 +11560,12 @@
 RCS file: toolkit/workben/layout/recover.xml
 diff -N toolkit/workben/layout/recover.xml
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ toolkit/workben/layout/recover.xml	20 Mar 2008 11:56:32 -0000	1.1.2.1
-@@ -0,0 +1,64 @@
++++ toolkit/workben/layout/recover.xml	4 Apr 2008 09:13:34 -0000	1.1.2.2
+@@ -0,0 +1,67 @@
 +<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
 +
 +<modaldialog xmlns="http://openoffice.org/2007/layout";
 +             xmlns:cnt="http://openoffice.org/2007/layout/container";
@@ -11828,11 +11852,16 @@
 ===================================================================
 RCS file: /cvs/gsl/toolkit/workben/layout/wordcount.xml,v
 retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
 --- toolkit/workben/layout/wordcount.xml	6 Mar 2008 12:07:20 -0000	1.2
-+++ toolkit/workben/layout/wordcount.xml	20 Mar 2008 11:56:32 -0000	1.2.6.1
-@@ -3,7 +3,7 @@
++++ toolkit/workben/layout/wordcount.xml	4 Apr 2008 09:13:34 -0000	1.2.6.2
+@@ -1,9 +1,12 @@
+ <?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
+ 
  <modaldialog xmlns="http://openoffice.org/2007/layout";
               xmlns:cnt="http://openoffice.org/2007/layout/container";
               help-id="HID_DLG_WORDCOUNT"
@@ -12295,11 +12324,15 @@
 ===================================================================
 RCS file: /cvs/gsl/toolkit/workben/layout/zoom.xml,v
 retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
 --- toolkit/workben/layout/zoom.xml	6 Mar 2008 12:09:26 -0000	1.2
-+++ toolkit/workben/layout/zoom.xml	20 Mar 2008 11:56:32 -0000	1.2.6.1
-@@ -2,19 +2,17 @@
++++ toolkit/workben/layout/zoom.xml	4 Apr 2008 09:13:34 -0000	1.2.6.2
+@@ -1,20 +1,21 @@
+ <?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
  
  <modaldialog xmlns="http://openoffice.org/2007/layout";
               xmlns:cnt="http://openoffice.org/2007/layout/container";
@@ -12323,7 +12356,7 @@
  	<hbox cnt:expand="false" cnt:fill="true">
  	    <align cnt:expand="false" cnt:fill="true">
  		<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" _label="Variable"/>
-@@ -26,6 +24,27 @@
+@@ -26,6 +27,27 @@
  			 right="true"
  			 cnt:expand="false"/>
  	</hbox>

Modified: trunk/patches/src680/cws-layoutdialogs-svx.diff
==============================================================================
--- trunk/patches/src680/cws-layoutdialogs-svx.diff	(original)
+++ trunk/patches/src680/cws-layoutdialogs-svx.diff	Sat Apr  5 13:19:40 2008
@@ -98,9 +98,10 @@
 RCS file: svx/uiconfig/layout/delzip
 diff -N svx/uiconfig/layout/delzip
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ svx/uiconfig/layout/delzip	31 Mar 2008 15:01:30 -0000	1.1.2.1
-@@ -0,0 +1,1 @@
++++ svx/uiconfig/layout/delzip	3 Apr 2008 08:39:33 -0000	1.1.2.2
+@@ -0,0 +1 @@
 +empty
+\ No newline at end of file
 Index: svx/uiconfig/layout/layout.mk
 ===================================================================
 RCS file: svx/uiconfig/layout/layout.mk
@@ -646,7 +647,7 @@
 RCS file: svx/uiconfig/layout/makefile.mk
 diff -N svx/uiconfig/layout/makefile.mk
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ svx/uiconfig/layout/makefile.mk	31 Mar 2008 15:01:53 -0000	1.1.2.3
++++ svx/uiconfig/layout/makefile.mk	3 Apr 2008 16:47:47 -0000	1.1.2.4
 @@ -0,0 +1,54 @@
 +#*************************************************************************
 +#
@@ -707,9 +708,12 @@
 RCS file: svx/uiconfig/layout/zoom.xml
 diff -N svx/uiconfig/layout/zoom.xml
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ svx/uiconfig/layout/zoom.xml	28 Mar 2008 11:19:37 -0000	1.1.2.1
-@@ -0,0 +1,37 @@
++++ svx/uiconfig/layout/zoom.xml	4 Apr 2008 09:14:29 -0000	1.1.2.2
+@@ -0,0 +1,40 @@
 +<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
 +
 +<modaldialog xmlns="http://openoffice.org/2007/layout";
 +             xmlns:cnt="http://openoffice.org/2007/layout/container";

Modified: trunk/patches/src680/cws-layoutdialogs-sw.diff
==============================================================================
--- trunk/patches/src680/cws-layoutdialogs-sw.diff	(original)
+++ trunk/patches/src680/cws-layoutdialogs-sw.diff	Sat Apr  5 13:19:40 2008
@@ -117,9 +117,10 @@
 RCS file: sw/uiconfig/layout/delzip
 diff -N sw/uiconfig/layout/delzip
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ sw/uiconfig/layout/delzip	31 Mar 2008 15:01:30 -0000	1.1.2.1
-@@ -0,0 +1,1 @@
++++ sw/uiconfig/layout/delzip	3 Apr 2008 08:38:35 -0000	1.1.2.2
+@@ -0,0 +1 @@
 +empty
+\ No newline at end of file
 Index: sw/uiconfig/layout/layout.mk
 ===================================================================
 RCS file: sw/uiconfig/layout/layout.mk
@@ -792,9 +793,12 @@
 RCS file: sw/uiconfig/layout/wordcount.xml
 diff -N sw/uiconfig/layout/wordcount.xml
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ sw/uiconfig/layout/wordcount.xml	28 Mar 2008 11:22:01 -0000	1.1.2.1
-@@ -0,0 +1,47 @@
++++ sw/uiconfig/layout/wordcount.xml	4 Apr 2008 09:14:08 -0000	1.1.2.2
+@@ -0,0 +1,50 @@
 +<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
 +
 +<modaldialog xmlns="http://openoffice.org/2007/layout";
 +             xmlns:cnt="http://openoffice.org/2007/layout/container";

Modified: trunk/patches/src680/cws-layoutdialogs-toolkit.diff
==============================================================================
--- trunk/patches/src680/cws-layoutdialogs-toolkit.diff	(original)
+++ trunk/patches/src680/cws-layoutdialogs-toolkit.diff	Sat Apr  5 13:19:40 2008
@@ -7414,10 +7414,10 @@
 ===================================================================
 RCS file: /cvs/gsl/toolkit/source/layout/root.cxx,v
 retrieving revision 1.2
-retrieving revision 1.2.6.6
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.6
+retrieving revision 1.2.6.7
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.7
 --- toolkit/source/layout/root.cxx	6 Mar 2008 11:47:44 -0000	1.2
-+++ toolkit/source/layout/root.cxx	28 Mar 2008 16:31:30 -0000	1.2.6.6
++++ toolkit/source/layout/root.cxx	3 Apr 2008 08:03:18 -0000	1.2.6.7
 @@ -1,6 +1,49 @@
 +/*************************************************************************
 + *
@@ -7468,7 +7468,7 @@
  #include <com/sun/star/xml/sax/XParser.hpp>
  
  #include "helper.hxx"
-@@ -42,6 +85,37 @@ LayoutRoot::~LayoutRoot()
+@@ -42,6 +86,37 @@ LayoutRoot::~LayoutRoot()
      }
  }
  
@@ -7506,7 +7506,7 @@
  // XInitialization
  void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArguments )
      throw ( uno::Exception,
-@@ -66,36 +140,36 @@ void SAL_CALL LayoutRoot::initialize( co
+@@ -66,36 +141,36 @@ void SAL_CALL LayoutRoot::initialize( co
  
      uno::Reference< xml::sax::XParser > xParser
          ( mxFactory->createInstance(
@@ -7554,7 +7554,7 @@
      ImportContext *pCtx = new ImportContext( *this );
  
      uno::Reference< xml::input::XRoot > xRoot( pCtx );
-@@ -103,17 +177,31 @@ void SAL_CALL LayoutRoot::initialize( co
+@@ -103,17 +178,31 @@ void SAL_CALL LayoutRoot::initialize( co
      aArgs[0] <<= xRoot;
      uno::Reference< xml::sax::XDocumentHandler > xDocHandler
          (mxFactory->createInstanceWithArguments
@@ -7588,7 +7588,7 @@
  
  // XLayoutContainer
  uno::Reference< awt::XLayoutContainer > LayoutRoot::getLayoutContainer() throw (uno::RuntimeException)
-@@ -249,7 +337,7 @@ LayoutWidget *LayoutRoot::create( OUStri
+@@ -249,7 +338,7 @@ LayoutWidget *LayoutRoot::create( OUStri
      return pWidget;
  }
  
@@ -7597,7 +7597,7 @@
    uno::Reference< awt::XLayoutConstrains > LayoutRoot::getToplevel()
    {
    if ( mpToplevel )
-@@ -265,7 +353,7 @@ LayoutWidget *LayoutRoot::create( OUStri
+@@ -265,7 +354,7 @@ LayoutWidget *LayoutRoot::create( OUStri
    rRef = i->second;
    return rRef;
    }
@@ -9595,6 +9595,27 @@
  #endif // WRAPPER_HXX
 cvs diff: Diffing toolkit/src2xml
 cvs diff: Diffing toolkit/src2xml/source
+Index: toolkit/src2xml/source/src2xml.py
+===================================================================
+RCS file: /cvs/gsl/toolkit/src2xml/source/src2xml.py,v
+retrieving revision 1.2
+retrieving revision 1.2.6.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+--- toolkit/src2xml/source/src2xml.py	6 Mar 2008 11:54:56 -0000	1.2
++++ toolkit/src2xml/source/src2xml.py	4 Apr 2008 09:13:34 -0000	1.2.6.1
+@@ -183,7 +183,11 @@ def post_process (s):
+     s = s.replace (' def-button="true"', ' default="true"')
+     return s
+ 
+-XML_HEADER = '<?xml version="1.0" encoding="UTF-8"?>\n'
++XML_HEADER = '''<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated XML files are generated from this template by
++     transex3/layout/tralay.  !-->
++'''
+ 
+ def do_one_file (file_name, options):
+     str = XML_HEADER
 cvs diff: Diffing toolkit/test
 cvs diff: Diffing toolkit/test/accessibility
 cvs diff: Diffing toolkit/test/accessibility/ov
@@ -11539,9 +11560,12 @@
 RCS file: toolkit/workben/layout/recover.xml
 diff -N toolkit/workben/layout/recover.xml
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ toolkit/workben/layout/recover.xml	20 Mar 2008 11:56:32 -0000	1.1.2.1
-@@ -0,0 +1,64 @@
++++ toolkit/workben/layout/recover.xml	4 Apr 2008 09:13:34 -0000	1.1.2.2
+@@ -0,0 +1,67 @@
 +<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
 +
 +<modaldialog xmlns="http://openoffice.org/2007/layout";
 +             xmlns:cnt="http://openoffice.org/2007/layout/container";
@@ -11828,11 +11852,16 @@
 ===================================================================
 RCS file: /cvs/gsl/toolkit/workben/layout/wordcount.xml,v
 retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
 --- toolkit/workben/layout/wordcount.xml	6 Mar 2008 12:07:20 -0000	1.2
-+++ toolkit/workben/layout/wordcount.xml	20 Mar 2008 11:56:32 -0000	1.2.6.1
-@@ -3,7 +3,7 @@
++++ toolkit/workben/layout/wordcount.xml	4 Apr 2008 09:13:34 -0000	1.2.6.2
+@@ -1,9 +1,12 @@
+ <?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
+ 
  <modaldialog xmlns="http://openoffice.org/2007/layout";
               xmlns:cnt="http://openoffice.org/2007/layout/container";
               help-id="HID_DLG_WORDCOUNT"
@@ -12295,11 +12324,15 @@
 ===================================================================
 RCS file: /cvs/gsl/toolkit/workben/layout/zoom.xml,v
 retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
 --- toolkit/workben/layout/zoom.xml	6 Mar 2008 12:09:26 -0000	1.2
-+++ toolkit/workben/layout/zoom.xml	20 Mar 2008 11:56:32 -0000	1.2.6.1
-@@ -2,19 +2,17 @@
++++ toolkit/workben/layout/zoom.xml	4 Apr 2008 09:13:34 -0000	1.2.6.2
+@@ -1,20 +1,21 @@
+ <?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
  
  <modaldialog xmlns="http://openoffice.org/2007/layout";
               xmlns:cnt="http://openoffice.org/2007/layout/container";
@@ -12323,7 +12356,7 @@
  	<hbox cnt:expand="false" cnt:fill="true">
  	    <align cnt:expand="false" cnt:fill="true">
  		<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" _label="Variable"/>
-@@ -26,6 +24,27 @@
+@@ -26,6 +27,27 @@
  			 right="true"
  			 cnt:expand="false"/>
  	</hbox>

Modified: trunk/patches/src680/cws-layoutdialogs-transex3.diff
==============================================================================
--- trunk/patches/src680/cws-layoutdialogs-transex3.diff	(original)
+++ trunk/patches/src680/cws-layoutdialogs-transex3.diff	Sat Apr  5 13:19:40 2008
@@ -25,10 +25,10 @@
 ===================================================================
 RCS file: /cvs/l10n/transex3/layout/layoutparse.cxx,v
 retrieving revision 1.2
-retrieving revision 1.2.2.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.2
+retrieving revision 1.2.2.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.3
 --- transex3/layout/layoutparse.cxx	6 Mar 2008 12:35:12 -0000	1.2
-+++ transex3/layout/layoutparse.cxx	27 Mar 2008 13:09:52 -0000	1.2.2.2
++++ transex3/layout/layoutparse.cxx	4 Apr 2008 09:11:45 -0000	1.2.2.3
 @@ -1,3 +1,38 @@
 +/*************************************************************************
 + *
@@ -68,7 +68,16 @@
  #include "layoutparse.hxx"
  
  #define STRING( str ) String( str, RTL_TEXTENCODING_UTF8 )
-@@ -42,13 +77,14 @@ LayoutXMLFile::HandleElement( XMLElement
+@@ -20,6 +55,8 @@ LayoutXMLFile::SearchL10NElements( XMLPa
+         for ( ULONG i = 0; i < lst->Count(); i++ )
+             if ( lst->GetObject( i )->GetNodeType() == XML_NODE_TYPE_ELEMENT )
+                 HandleElement( ( XMLElement* )lst->GetObject( i ) );
++            else if ( lst->GetObject( i )->GetNodeType() == XML_NODE_TYPE_COMMENT )
++                lst->Remove( i-- );
+ }
+ 
+ std::vector<XMLAttribute*>
+@@ -42,13 +79,14 @@ LayoutXMLFile::HandleElement( XMLElement
      
      if ( interesting.size() )
      {
@@ -242,10 +251,10 @@
 ===================================================================
 RCS file: /cvs/l10n/transex3/layout/tralay.cxx,v
 retrieving revision 1.2
-retrieving revision 1.2.2.6
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.6
+retrieving revision 1.2.2.7
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.7
 --- transex3/layout/tralay.cxx	6 Mar 2008 12:36:58 -0000	1.2
-+++ transex3/layout/tralay.cxx	1 Apr 2008 07:44:09 -0000	1.2.2.6
++++ transex3/layout/tralay.cxx	4 Apr 2008 09:11:45 -0000	1.2.2.7
 @@ -1,6 +1,43 @@
 +/*************************************************************************
 + *
@@ -386,7 +395,7 @@
      {
          ByteString attributeId = id;
          attributeId += BSTRING ( **i );
-@@ -154,24 +219,30 @@ translateElement( XMLElement* element, B
+@@ -154,24 +219,47 @@ translateElement( XMLElement* element, B
          }
      }
  }
@@ -421,10 +430,35 @@
 +    OUString sFileURL( name.GetBuffer(), name.Len(), RTL_TEXTENCODING_UTF8 );
 +    FileBase::getFileURLFromSystemPath( sFileURL, sFileURL );
 +    Directory::create( sFileURL );
++}
++
++static void insertMarker( XMLParentNode *p, ByteString const& file )
++{
++    if ( XMLChildNodeList* lst = p->GetChildList() )
++        if ( lst->Count() )
++        {
++            ULONG i = 1;
++            // Skip newline, if possible.
++            if ( lst->Count() > 1
++                 && lst->GetObject( 2 )->GetNodeType() == XML_NODE_TYPE_DEFAULT )
++                i++;
++            OUString marker = OUString::createFromAscii( "\n    NOTE: This file has been generated automagically by transex3/layout/tralay,\n          from source template: " )
++                + STRING( file )
++                + OUString::createFromAscii( ".\n          Do not edit, changes will be lost.\n" );
++            lst->Insert( new XMLComment( marker, 0 ), i );
++        }
  }
  
  void TranslateLayout::MergeLanguage( ByteString const& language )
-@@ -204,7 +275,11 @@ void TranslateLayout::MergeLanguage( Byt
+@@ -190,6 +278,7 @@ void TranslateLayout::MergeLanguage( Byt
+     }
+     
+     layoutXml->Extract();
++    insertMarker( layoutXml, xmlFile );
+ 
+     ResData	resData( "", "", "" );
+     resData.sResTyp = mProject; /* mGid1 ?? */
+@@ -204,7 +293,11 @@ void TranslateLayout::MergeLanguage( Byt
                  translateElement( element, language, &resData, mergeData );
      }
      
@@ -436,7 +470,7 @@
      if ( mOutput.Len() )
      {
          outFile = mOutput;
-@@ -235,7 +310,11 @@ void TranslateLayout::Merge()
+@@ -235,7 +328,11 @@ void TranslateLayout::Merge()
  void TranslateLayout::CreateSDF()
  {
      ByteString xmlFile = mFiles.front();
@@ -448,7 +482,7 @@
      if ( mOutput.Len() )
          sdf = mOutput;
      Export::SetLanguages( mLanguages );
-@@ -289,7 +368,7 @@ TranslateLayout::TranslateLayout()
+@@ -289,7 +386,7 @@ TranslateLayout::TranslateLayout()
      , mLocalize( "localize.sdf" )
      , mOutput()
      , mProject( "layout" )
@@ -457,6 +491,22 @@
      , mMergeMode( false )
      , mLanguages()
      , mFiles()
+Index: transex3/layout/zoom.xml
+===================================================================
+RCS file: /cvs/l10n/transex3/layout/zoom.xml,v
+retrieving revision 1.2
+retrieving revision 1.2.2.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.1
+--- transex3/layout/zoom.xml	6 Mar 2008 12:37:10 -0000	1.2
++++ transex3/layout/zoom.xml	4 Apr 2008 09:11:45 -0000	1.2.2.1
+@@ -1,4 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
+ 
+ <modaldialog xmlns="http://openoffice.org/2007/layout";
+              xmlns:cnt="http://openoffice.org/2007/layout/container";
 cvs diff: Diffing transex3/prj
 cvs diff: Diffing transex3/scripts
 cvs diff: Diffing transex3/source
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]