GNOME.org
 

ooo-build r11238 - in trunk: . patches/src680

Author: jannieuw
Date: Thu Jan 10 13:35:05 2008
New Revision: 11238
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11238&view=rev

Log:
2008-01-10  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/src680/layout-dialogs-layout.diff: Implement simple
	read-right translation.  Add manually translated nl/zoom.xml
	and nl/wordcount.xml files.
	
	* patches/src680/layout-dialogs-config_office-scp2.diff: Install
	the translated xml files.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/layout-dialogs-config_office-scp2.diff
   trunk/patches/src680/layout-dialogs-layout.diff

Modified: trunk/patches/src680/layout-dialogs-config_office-scp2.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-config_office-scp2.diff	(original)
+++ trunk/patches/src680/layout-dialogs-config_office-scp2.diff	Thu Jan 10 13:35:05 2008
@@ -61,10 +61,10 @@
 +cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
 diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
 new file mode 100644
-index 0000000..fbc1423
+index 0000000..94dca31
 --- /dev/null
 +++ scp2/source/layout/layout.scp
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,98 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -119,6 +119,11 @@
 +    DosName = "layout";
 +End
 +
++Directory gid_Dir_Share_Layout_Nl
++    ParentID = gid_Dir_Share_Layout;
++    DosName = "nl";
++End
++
 +File gid_File_Xml_Wordcount
 +   TXT_FILE_BODY;
 +   Dir = gid_Dir_Share_Layout;
@@ -133,6 +138,20 @@
 +   Styles = (PACKED);
 +End
 +
++File gid_File_Xml_Wordcount_Nl
++   TXT_FILE_BODY;
++   Dir = gid_Dir_Share_Layout_Nl;
++   Name = "nl/wordcount.xml";
++   Styles = (PACKED);
++End
++
++File gid_File_Xml_Zoom_Nl
++   TXT_FILE_BODY;
++   Dir = gid_Dir_Share_Layout_Nl;
++   Name = "nl/zoom.xml";
++   Styles = (PACKED);
++End
++
 +//  Do we need this?
 +//  Must MODULE_OPTIONAL_LAYOUT be registered somewhere?
 +//

Modified: trunk/patches/src680/layout-dialogs-layout.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-layout.diff	(original)
+++ trunk/patches/src680/layout-dialogs-layout.diff	Thu Jan 10 13:35:05 2008
@@ -606,15 +606,33 @@
 +   ./soffice.bin
 diff --git a/layout/TODO b/layout/TODO
 new file mode 100644
-index 0000000..d68260f
+index 0000000..b6715a2
 --- /dev/null
 +++ layout/TODO
-@@ -0,0 +1,167 @@
+@@ -0,0 +1,170 @@
 +-*-outline-*-
 +
++* i18n
++    + forget java property files nonsense
++	- dump old wiki pointers into layout/doc for reference
++    + hit on transex3
++	+ new tool 'slayex3' (or equiv. incomprehensible name to suit ;-)
++	+ 2 roles:
++	    + read XML dump to SDF [ AFAIR we can merge these ]
++	    + read XML file and SDF, dump <N> translated XML files
++	    + suitably named:
++    + generate zoom.nl.xml at compile time
++    + share code with vcl/source/gdi/impimagetree.cxx
++    + 'layout.zip'?
++
++
 +* portability
 +** --enable-layout does not compile on Sun
 +
++TODO: Try not including layout-pre.hxx twice, but use
++layout-pre-header.hxx and layout-pre-source.hxx (both include an
++un-multiple-inclusion-shielded layout-pre.hxx).
++
 +"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 412: Error: layout is not a member of layout.
 +"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 412: Error: Formal argument 1 of type layout::RadioButton* in call to SvxZoomDialog::UserHdl(layout::RadioButton*) is being passed RadioButton*.
 +"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 431: Error: layout is not a member of layout.
@@ -641,11 +659,9 @@
 +
 +* code
 +** features
-+*** localization
 +*** support cnt:cnt:? 
-+*** icons from Jakub included
 +*** support using label (verb) on yes/ok no/cancel buttons for some platforms
-+but keep using yes/no on Windows, eg
++but keep using yes/no on Windows, eg?
 +*** remove -DTEST_LAYOUT=1 from util/makefile.mk
 +
 +** fixes
@@ -678,6 +694,7 @@
 +*** box.hxx: use vbox/hbox polymorphism instead of if (mbHorizontal)
 +
 +* integration
++DONE
 +
 +* distributing: [LayoutDialogs]
 +git diff 5db78fc5 layout scp2 > layout-dialogs-layout.diff
@@ -699,6 +716,8 @@
 +m241'': 53ddc663
 +m1: fbde8234
 +m1': d1f42c99
++m1'': 1a8dec5c
++m1'''': c93389f7
 +
 +* porting
 +** Zoom dialog
@@ -761,22 +780,6 @@
 +	+ test-tool
 +    + scrolled-pane impl.
 +
-+
-+* i18n
-+    + forget java property files nonsense
-+	- dump old wiki pointers into layout/doc for reference
-+    + hit on transex3
-+	+ new tool 'slayex3' (or equiv. incomprehensible name to suit ;-)
-+	+ 2 roles:
-+	    + read XML dump to SDF [ AFAIR we can merge these ]
-+	    + read XML file and SDF, dump <N> translated XML files
-+	    + suitably named:
-+    + in layout/ read right translation:
-+	+ cf. vcl/source/gdi/impimagetree.cxx
-+	    + does this for 'images.zip' case.
-+	+ [ also does .zip load bits: if we impl. this we should
-+	    have a simple file fallback first for now I think ]
-+
 diff --git a/layout/doc/apinotes.txt b/layout/doc/apinotes.txt
 new file mode 100644
 index 0000000..dc5a8cf
@@ -1878,10 +1881,10 @@
 +ly	layout\util	      nmake	-	all	ly_util ly_api ly_awt ly_core ly_wrap NULL
 diff --git a/layout/prj/d.lst b/layout/prj/d.lst
 new file mode 100644
-index 0000000..20e2a55
+index 0000000..7a54403
 --- /dev/null
 +++ layout/prj/d.lst
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,20 @@
 +mkdir: %_DEST%\inc%_EXT%\layout
 +mkdir: %_DEST%\inc%_EXT%\com
 +mkdir: %_DEST%\inc%_EXT%\com\sun
@@ -1895,6 +1898,8 @@
 +..\%__SRC%\bin\layout*.dll %_DEST%\bin%_EXT%\layout*.dll
 +..\%__SRC%\misc\layout*.map %_DEST%\bin%_EXT%\layout*.map
 +..\%__SRC%\lib\*.xml %_DEST%\lib%_EXT%\*.xml
++mkdir: %_DEST%\lib%_EXT%\nl
++..\%__SRC%\lib\nl\*.xml %_DEST%\lib%_EXT%\nl\*.xml
 +
 +..\inc\layout\*.hxx %_DEST%\inc%_EXT%\layout\*.hxx
 +
@@ -8415,10 +8420,10 @@
 +#endif /* IMPORT_HXX */
 diff --git a/layout/source/core/makefile.mk b/layout/source/core/makefile.mk
 new file mode 100644
-index 0000000..9f23cc8
+index 0000000..01cef79
 --- /dev/null
 +++ layout/source/core/makefile.mk
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,44 @@
 +PRJ=..$/..
 +PRJNAME=layout
 +TARGET=core
@@ -8443,7 +8448,8 @@
 +	proplist.cxx \
 +	root.cxx \
 +	table.cxx \
-+	timer.cxx
++	timer.cxx \
++	translate.cxx
 +
 +SLOFILES= \
 +	$(SLO)$/bin.obj \
@@ -8458,7 +8464,8 @@
 +	$(SLO)$/proplist.obj \
 +	$(SLO)$/root.obj \
 +	$(SLO)$/table.obj \
-+	$(SLO)$/timer.obj
++	$(SLO)$/timer.obj \
++	$(SLO)$/translate.obj
 +
 +.INCLUDE : target.mk
 diff --git a/layout/source/core/proplist.cxx b/layout/source/core/proplist.cxx
@@ -8919,32 +8926,25 @@
 +#endif // CORE_PROPLIST_HXX
 diff --git a/layout/source/core/root.cxx b/layout/source/core/root.cxx
 new file mode 100644
-index 0000000..7c0fac4
+index 0000000..260985e
 --- /dev/null
 +++ layout/source/core/root.cxx
-@@ -0,0 +1,349 @@
+@@ -0,0 +1,324 @@
 +#include "root.hxx"
 +
 +#include <assert.h>
 +#include <com/sun/star/xml/sax/XParser.hpp>
-+#include <unotools/bootstrap.hxx>
-+#include <unotools/localfilehelper.hxx>
-+
-+#if TEST_LAYOUT
-+#include <stdio.h>
-+#endif
 +
 +#include "helper.hxx"
 +#include "import.hxx"
 +#include "timer.hxx"
++#include "translate.hxx"
 +
 +namespace layoutimpl
 +{
 +
 +using namespace css;
 +using ::rtl::OUString;
-+using ::utl::Bootstrap;
-+using ::utl::LocalFileHelper;
 +
 +LayoutRoot::LayoutRoot( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
 +    : mbDisposed( sal_False )
@@ -8974,7 +8974,6 @@
 +    }
 +}
 +
-+
 +// XInitialization
 +void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArguments )
 +    throw ( uno::Exception,
@@ -9009,27 +9008,10 @@
 +            uno::Reference< uno::XInterface >() );
 +    }
 +
-+    String aXMLFile;
-+    // FIXME: how to get/check cwd [url]?
-+    // if ( LocalFileHelper::IsFileContent( aXMLName ) )
-+    // if ( LocalFileHelper::IsLocalFile( aXMLName ) )
-+#if TEST_LAYOUT // read from cwd first
-+    if ( FILE *f = ::fopen( OUSTRING_CSTR( aXMLName ), "r" ) )
-+    {
-+        ::fclose( f );
-+        aXMLFile = aXMLName;
-+    }
-+    else
-+#endif /* TEST_LAYOU */
-+    {
-+        OUString aShareUrl;
-+        Bootstrap::locateSharedData( aShareUrl );
-+        OUString aXMLUrl = aShareUrl
-+            + OUString::createFromAscii( "/layout/" ) + aXMLName;
-+        LocalFileHelper::ConvertURLToPhysicalName( aXMLUrl, aXMLFile );
-+    }
++    OUString aXMLFile = readRightTranslation( aXMLName );
 +
-+    uno::Reference< io::XInputStream > xStream = getFileAsStream( mxFactory, aXMLFile );
++    uno::Reference< io::XInputStream > xStream = getFileAsStream( mxFactory,
++                                                                  aXMLFile );
 +
 +    // error handler, entity resolver omitted
 +
@@ -9974,6 +9956,137 @@
 +}
 +
 +#endif /*CORE_TIMER_HXX*/
+diff --git a/layout/source/core/translate.cxx b/layout/source/core/translate.cxx
+new file mode 100644
+index 0000000..136752c
+--- /dev/null
++++ layout/source/core/translate.cxx
+@@ -0,0 +1,107 @@
++#include "translate.hxx"
++
++#include <list>
++#if TEST_LAYOUT
++#include <stdio.h>
++#endif
++
++#include <osl/process.h>
++#include <unotools/bootstrap.hxx>
++#include <unotools/localfilehelper.hxx>
++#include <unotools/ucbhelper.hxx>
++#include <vcl/svapp.hxx>
++
++#include "proplist.hxx"
++
++namespace layoutimpl
++{
++namespace css = ::com::sun::star;
++using namespace css;
++using ::rtl::OUString;
++using ::utl::LocalFileHelper;
++using ::utl::UCBContentHelper;
++using ::utl::Bootstrap;
++
++static std::list<OUString>
++getLocaleSubdirList( lang::Locale const& rLocale )
++{
++    std::list<OUString> aSubdirs;
++    aSubdirs.push_front( OUString::createFromAscii( "." ) );
++    aSubdirs.push_front( OUString::createFromAscii( "en_US" ) );
++    if ( rLocale.Language.getLength() )
++        aSubdirs.push_front( rLocale.Language );
++    if ( rLocale.Country.getLength() )
++    {
++        OUString aLocaleCountry = rLocale.Language
++            + OUString::createFromAscii( "_" )
++            + rLocale.Country;
++        aSubdirs.push_front( aLocaleCountry );
++        if ( rLocale.Variant.getLength() )
++            aSubdirs.push_front( aLocaleCountry
++                                 + OUString::createFromAscii( "." )
++                                 + rLocale.Variant );
++    }
++    return aSubdirs;
++}
++
++static bool
++fileExists( String const& aFile )
++{
++    String aUrl;
++    LocalFileHelper::ConvertPhysicalNameToURL( aFile, aUrl );
++    return UCBContentHelper::Exists( aUrl );
++}
++
++static OUString
++getFirstExisting( OUString const& aDir, std::list<OUString> const& aSubDirs,
++                  OUString const& aXMLName )
++{
++    static OUString const aSlash = OUString::createFromAscii( "/" );
++    String aResult;
++    for ( std::list<OUString>::const_iterator i = aSubDirs.begin();
++          i != aSubDirs.end(); i++ )
++    {
++        String aFile = aDir + aSlash + *i + aSlash + aXMLName;
++#if TEST_LAYOUT
++        printf( "testing: %s\n", OUSTRING_CSTR( aFile ) );
++#endif
++        if ( fileExists( aFile ) )
++            return aFile;
++    }
++    return OUString();
++}
++
++/*  FIXME: IWBN to share code with impimagetree.cxx, also for reading
++  from zip files.  */
++OUString
++readRightTranslation( OUString const& aXMLName )
++{
++    String aXMLFile;
++    std::list<OUString> aSubdirs
++        = getLocaleSubdirList( Application::GetSettings().GetUILocale() );
++#if TEST_LAYOUT // read from cwd first
++    OUString aCurrentWorkingUrl;
++    osl_getProcessWorkingDir( &aCurrentWorkingUrl.pData );
++    String aCurrentWorkingDir;
++    LocalFileHelper::ConvertURLToPhysicalName( aCurrentWorkingUrl, aCurrentWorkingDir );
++    aXMLFile = getFirstExisting( aCurrentWorkingDir, aSubdirs, aXMLName );
++    if ( aXMLFile.Len() )
++        ;
++    else
++#endif /* TEST_LAYOUT */
++    {
++        OUString aShareUrl;
++        Bootstrap::locateSharedData( aShareUrl );
++        OUString aXMLUrl = aShareUrl + OUString::createFromAscii( "/layout" );
++        String aXMLDir;
++        LocalFileHelper::ConvertURLToPhysicalName( aXMLUrl, aXMLDir );
++        aXMLFile = getFirstExisting( aXMLDir, aSubdirs, aXMLName );
++    }
++
++#if TEST_LAYOUT
++    printf( "FOUND:%s\n", OUSTRING_CSTR ( OUString (aXMLFile) ) );
++#endif /* TEST_LAYOUT */
++    return aXMLFile;
++}
++
++} // namespace layoutimpl
+diff --git a/layout/source/core/translate.hxx b/layout/source/core/translate.hxx
+new file mode 100644
+index 0000000..bf80515
+--- /dev/null
++++ layout/source/core/translate.hxx
+@@ -0,0 +1,12 @@
++#ifndef CORE_TRANSLATE_HXX
++#define CORE_TRANSLATE_HXX
++
++namespace rtl {
++class OUString;
++}; // rtl
++namespace layoutimpl
++{
++::rtl::OUString readRightTranslation( ::rtl::OUString const& aXMLName );
++}; // layoutimpl
++
++#endif /* CORE_TRANSLATE_HXX */
 diff --git a/layout/source/inc/layoutcore.hxx b/layout/source/inc/layoutcore.hxx
 new file mode 100644
 index 0000000..cce3a94
@@ -17606,7 +17719,7 @@
 +</dialog>
 diff --git a/layout/workben/makefile.mk b/layout/workben/makefile.mk
 new file mode 100644
-index 0000000..c061840
+index 0000000..328f9c0
 --- /dev/null
 +++ layout/workben/makefile.mk
 @@ -0,0 +1,77 @@
@@ -17666,15 +17779,15 @@
 +ALLTAR: \
 +    $(DLLDEST)$/wordcount.xml\
 +    $(DLLDEST)$/zoom.xml\
-+    $(DLLDEST)$/wordcount.nl.xml\
-+    $(DLLDEST)$/zoom.nl.xml
++    $(DLLDEST)$/nl/wordcount.xml\
++    $(DLLDEST)$/nl/zoom.xml
 +
 +$(DLLDEST)$/%.xml: %.xml
 +# modes, INSTALL?
 +	-$(MKDIR) $(@:d)
 +	$(COPY) $< $@
 +
-+$(DLLDEST)$/nl/%.xml: %.nl.xml
++$(DLLDEST)$/nl/%.xml: nl/%.xml
 +# modes, INSTALL?
 +	-$(MKDIR) $(@:d)
 +	$(COPY) $< $@
@@ -17687,6 +17800,102 @@
 +	./un-test.sh wordcountdialog.hxx > ../$(PRJ)/sw/source/ui/inc/wordcountdialog.hxx
 +	# FIXME: broken setup
 +	ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx 
+diff --git a/layout/workben/nl/wordcount.xml b/layout/workben/nl/wordcount.xml
+new file mode 100644
+index 0000000..125ea36
+--- /dev/null
++++ layout/workben/nl/wordcount.xml
+@@ -0,0 +1,47 @@
++<?xml version="1.0" encoding="UTF-8"?>
++
++<modaldialog xmlns="http://openoffice.org/2007/layout";
++             xmlns:cnt="http://openoffice.org/2007/layout/container";
++             help-id="HID_DLG_WORDCOUNT"
++             id="dialog"
++             sizeable="true" moveable="true" optimumsize="true"
++             has_border="true" sv-look="true" title="Woorden tellen">
++    <vbox border="5" spacing="5">
++        <fixedline id="FL_CURRENT" text="Huidige selectie"/>
++	<hbox>
++	    <vbox cnt:padding="13" spacing="5">
++		<hbox>
++		    <fixedtext id="FT_CURRENTWORD" label="Woorden:"/>
++		    <flow cnt:padding="60"/>
++		    <fixedtext id="FI_CURRENTWORD" right="true" label="0"/>
++		</hbox>
++		<hbox>
++		    <fixedtext id="FT_CURRENTCHARACTER" label="Tekens:"/>
++		    <flow cnt:padding="60"/>
++		    <fixedtext id="FI_CURRENTCHARACTER" right="true" label="00"/>
++		</hbox>
++	    </vbox>
++	</hbox>
++	<!-- if we could do cnt:cnt:padding="-13" here, we would not have to close
++	     and reope the hbox/vbox thing !-->
++        <fixedline id="FL_DOC" text="Heel document"/>
++	<hbox>
++	    <vbox cnt:padding="13" spacing="5">
++		<hbox>
++		    <fixedtext id="FT_DOCWORD" label="Woorden:"/>
++		    <fixedtext id="FI_DOCWORD" right="true" label="000"/>
++		</hbox>
++		<hbox>
++		    <fixedtext id="FT_DOCCHARACTER" label="Tekens:"/>
++		    <fixedtext id="FI_DOCCHARACTER" right="true" label="0000"/>
++		</hbox>
++	    </vbox>
++	</hbox>
++        <fixedline cnt:padding="1" id="FL_BOTTOM"/>
++	<dialogbuttonhbox spacing="5">
++            <flow/>
++            <okbutton id="PB_OK"/>
++            <helpbutton id="PB_HELP"/>
++        </dialogbuttonhbox>
++    </vbox>
++</modaldialog>
+diff --git a/layout/workben/nl/zoom.xml b/layout/workben/nl/zoom.xml
+new file mode 100644
+index 0000000..774a4ab
+--- /dev/null
++++ layout/workben/nl/zoom.xml
+@@ -0,0 +1,37 @@
++<?xml version="1.0" encoding="UTF-8"?>
++
++<modaldialog xmlns="http://openoffice.org/2007/layout";
++             xmlns:cnt="http://openoffice.org/2007/layout/container";
++             id="dialog" title="In- en uitzoomen" optimumsize="true"
++	     help-id="SID_ATTR_ZOOM"
++             has_border="true" sizeable="true" moveable="true">
++    <vbox spacing="5" border="5">
++	<fixedline id="FL_ZOOM" text="Zoomfactor" cnt:expand="true"/>
++	<radiobutton radiogroup="zoom" id="BTN_WHOLE_PAGE" label="H~ele pagina"/>
++	<radiobutton radiogroup="zoom" id="BTN_PAGE_WIDTH" label="~Paginabreedte"/>
++	<radiobutton radiogroup="zoom" id="BTN_OPTIMAL"   label="~Optimaal"/>
++	<radiobutton radiogroup="zoom" id="BTN_200"   label="~200 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_150"   label="15~0 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_100"   label="~100 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_75"    label="~75 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_50"    label="~50 %"/>
++	<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="~Variabel"/>
++	    </align>
++	    <flow cnt:padding="10" cnt:expand="false"/>
++	    <metricfield id="ED_USER" value-step="1"
++			 repeat="true" has_border="true" spin="true"
++			 text="100%" unit="13" custom-unit-text="%"
++			 right="true"
++			 cnt:expand="false"/>
++	</hbox>
++        <fixedline cnt:padding="1" id="FL_BOTTOM"/>
++	<dialogbuttonhbox border="5" spacing="5">
++	    <flow/>
++	    <okbutton     id="BTN_ZOOM_OK"/>
++	    <cancelbutton id="BTN_ZOOM_CANCEL"/>
++	    <helpbutton   id="BTN_ZOOM_HELP"/>
++	</dialogbuttonhbox>
++    </vbox>
++</modaldialog>
 diff --git a/layout/workben/non-interactable-containers.xml b/layout/workben/non-interactable-containers.xml
 new file mode 100644
 index 0000000..8d23560
@@ -17752,12 +17961,12 @@
 +</framewindow>
 diff --git a/layout/workben/ooo-patch b/layout/workben/ooo-patch
 new file mode 100755
-index 0000000..7d62f47
+index 0000000..7725e10
 --- /dev/null
 +++ layout/workben/ooo-patch
 @@ -0,0 +1,6 @@
 +#! /bin/sh
-+commit=${1-d1f42c99} # m1'
++commit=${1-c93389f7} # m1''''
 +
 +git diff $commit layout | sed 's ^\([+-]\{3\}\) \(a\|b\)/@\1 @' > layout-dialogs-layout.diff
 +git diff $commit config_office scp2 | sed 's ^\([+-]\{3\}\) \(a\|b\)/@\1 @' > layout-dialogs-config_office-scp2.diff
@@ -21950,10 +22159,10 @@
 +</dialog>
 diff --git a/layout/workben/test.cxx b/layout/workben/test.cxx
 new file mode 100644
-index 0000000..c850a4d
+index 0000000..c856b7e
 --- /dev/null
 +++ layout/workben/test.cxx
-@@ -0,0 +1,286 @@
+@@ -0,0 +1,285 @@
 +#include <vcl/svapp.hxx>
 +// This works and was used before for standalone test, not sure why
 +// we'd want it.
@@ -22233,7 +22442,6 @@
 +        xComp->dispose();
 +}
 +
-+
 +LayoutTest::LayoutTest( char const* installDir )
 +    : mInstallDir( OUString::createFromAscii ( installDir ) )
 +{
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]