aw069 changes after resync to m71#

basegfx/test/basegfx2d.cxx

@@ -489,8 +489,11 @@ public:
         // depending on float precision and the getContinuity() implemetation using
         // fTools::equal, linux and mac produce more 'C' than 'S' statements, while WIN32
         // uses more 'S' statements (as it should be for circles)
-        CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates",
+#ifdef S390X
-                               nCount==67 || nCount==50);
+         CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==61 );
+#else
+          CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==67 || nCount==50 );
+#endif
 
         const B2DPolygon aRect(
             tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) ));

canvas/source/cairo/cairo_canvashelper.cxx

@@ -990,7 +990,8 @@ namespace cairocanvas
                         aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(a));
                         aEdge.setPrevControlPoint(1, aCandidate.getPrevControlPoint(nNextIndex));
 
-                        doPolyPolygonImplementation( aEdge, aOperation,
+                        doPolyPolygonImplementation( basegfx::B2DPolyPolygon(aEdge),
+                                                     aOperation,
                                                      pCairo, pTextures,
                                                      mpSurfaceProvider,
                                                      xPolyPolygon->getFillRule() );
@@ -1187,7 +1188,7 @@ namespace cairocanvas
         cairo_save( mpCairo.get() );
 
         useStates( viewState, renderState, true );
-        doPolyPolygonPath( xPolyPolygon, Fill, &textures );
+        doPolyPolygonPath( xPolyPolygon, Fill, false, &textures );
 
         cairo_restore( mpCairo.get() );
     }

canvas/source/directx/dx_winstuff.hxx

@@ -89,7 +89,7 @@
 
     #include <d3d9.h>
     #include <d3dx9.h>
-    #include <dxerr9.h>
+//  #include <dxerr9.h>     #i107614# removing include, it has been changed in the latest sdk fron August2009 from dxerr9.h into dxerr.h
 
     typedef IDirect3DSurface9 surface_type;
 

comphelper/inc/comphelper/weakeventlistener.hxx

@@ -76,7 +76,7 @@ namespace comphelper
 
         inline void resetListener( )
         {
-            m_aListener = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >();
+            m_aListener.clear();
         }
 
 

comphelper/source/property/opropertybag.cxx

@@ -240,7 +240,7 @@ namespace comphelper
         if ( !( _element >>= aProperty ) )
             throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
 
-        ::osl::MutexGuard aGuard( m_aMutex );
+        ::osl::ClearableMutexGuard g( m_aMutex );
 
         // check whether the type is allowed, everything else will be checked
         // by m_aDynamicProperties
@@ -254,6 +254,7 @@ namespace comphelper
         // our property info is dirty
         m_pArrayHelper.reset();
 
+        g.clear();
         setModified(sal_True);
     }
 
@@ -346,7 +347,7 @@ namespace comphelper
     //--------------------------------------------------------------------
     void SAL_CALL OPropertyBag::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
+        ::osl::ClearableMutexGuard g( m_aMutex );
 
         // check whether the type is allowed, everything else will be checked
         // by m_aDynamicProperties
@@ -362,19 +363,21 @@ namespace comphelper
         // our property info is dirty
         m_pArrayHelper.reset();
 
+        g.clear();
         setModified(sal_True);
     }
 
     //--------------------------------------------------------------------
     void SAL_CALL OPropertyBag::removeProperty( const ::rtl::OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
+        ::osl::ClearableMutexGuard g( m_aMutex );
 
         m_aDynamicProperties.removeProperty( _rName );
 
         // our property info is dirty
         m_pArrayHelper.reset();
 
+        g.clear();
         setModified(sal_True);
     }
 

comphelper/source/property/property.cxx

@@ -38,15 +38,11 @@
 #include <osl/diagnose.h>
 
 #if OSL_DEBUG_LEVEL > 0
-    #ifndef _RTL_STRBUF_HXX_
     #include <rtl/strbuf.hxx>
-    #endif
-    #ifndef _CPPUHELPER_EXC_HLP_HXX_
     #include <cppuhelper/exc_hlp.hxx>
-    #endif
-    #ifndef _OSL_THREAD_H_
     #include <osl/thread.h>
-    #endif
+    #include <com/sun/star/lang/XServiceInfo.hpp>
+    #include <typeinfo>
 #endif
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -71,6 +67,10 @@ namespace comphelper
     using ::com::sun::star::uno::cpp_queryInterface;
     using ::com::sun::star::uno::cpp_acquire;
     using ::com::sun::star::uno::cpp_release;
+#if OSL_DEBUG_LEVEL > 0
+    using ::com::sun::star::lang::XServiceInfo;
+#endif
+    using ::com::sun::star::uno::UNO_QUERY;
     /** === end UNO using === **/
     namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
 
@@ -110,7 +110,18 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
                 ::rtl::OStringBuffer aBuffer;
                 aBuffer.append( "::comphelper::copyProperties: could not copy property '" );
                 aBuffer.append( ::rtl::OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ) );
-                aBuffer.append( "' to the destination set.\n" );
+                aBuffer.append( "' to the destination set (a '" );
+
+                Reference< XServiceInfo > xSI( _rxDest, UNO_QUERY );
+                if ( xSI.is() )
+                {
+                    aBuffer.append( ::rtl::OUStringToOString( xSI->getImplementationName(), osl_getThreadTextEncoding() ) );
+                }
+                else
+                {
+                    aBuffer.append( typeid( *_rxDest.get() ).name() );
+                }
+                aBuffer.append( "' implementation).\n" );
 
                 Any aException( ::cppu::getCaughtException() );
                 aBuffer.append( "Caught an exception of type '" );

cppcanvas/inc/cppcanvas/color.hxx

@@ -83,6 +83,16 @@ namespace cppcanvas
         return (nRed << 24U)|(nGreen << 16U)|(nBlue << 8U)|(nAlpha);
     }
 
+    inline sal_Int32 unMakeColor( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue)
+    {
+        return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue);
+    }
+
+    inline sal_Int32 makeColorARGB( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue)
+    {
+        return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue);
+    }
+
 }
 
 #endif /* _CPPCANVAS_COLOR_HXX */

goodies/source/filter.vcl/ieps/ieps.cxx

@@ -164,12 +164,54 @@ static void MakeAsMeta(Graphic &rGraphic)
     rGraphic = aMtf;
 }
 
+static oslProcessError runProcessWithPathSearch(const rtl::OUString &rProgName,
+    rtl_uString* pArgs[], sal_uInt32 nArgs, oslProcess *pProcess,
+    oslFileHandle *pIn, oslFileHandle *pOut, oslFileHandle *pErr)
+{
+#ifdef WNT
+    /*
+     * ooo#72096
+     * On Window the underlying SearchPath searches in order of...
+     * The directory from which the application loaded.
+     * The current directory.
+     * The Windows system directory.
+     * The Windows directory.
+     * The directories that are listed in the PATH environment variable.
+     *
+     * Because one of our programs is called "convert" and there is a convert
+     * in the windows system directory, we want to explicitly search the PATH
+     * to avoid picking up on that one if ImageMagick's convert preceeds it in
+     * PATH.
+     *
+     */
+    rtl::OUString url;
+    rtl::OUString path(_wgetenv(L"PATH"));
+
+    oslFileError err = osl_searchFileURL(rProgName.pData, path.pData, &url.pData);
+    if (err != osl_File_E_None)
+        return osl_Process_E_NotFound;
+    return osl_executeProcess_WithRedirectedIO(url.pData,
+    pArgs, nArgs, osl_Process_HIDDEN,
+        osl_getCurrentSecurity(), 0, 0, 0, pProcess, pIn, pOut, pErr);
+#else
+    return osl_executeProcess_WithRedirectedIO(rProgName.pData,
+        pArgs, nArgs, osl_Process_SEARCHPATH | osl_Process_HIDDEN,
+        osl_getCurrentSecurity(), 0, 0, 0, pProcess, pIn, pOut, pErr);
+#endif
+}
+
+#if defined(WNT) || defined(OS2)
+#    define EXESUFFIX ".exe"
+#else
+#    define EXESUFFIX ""
+#endif
+
 static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &rGraphic)
 {
     TempFile aTemp;
     aTemp.EnableKillingFile();
     rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pstoedit"));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pstoedit"EXESUFFIX));
     rtl::OUString arg1 =
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-f"));
     rtl::OUString arg2 =
@@ -186,10 +228,10 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
     oslFileHandle pIn = NULL;
     oslFileHandle pOut = NULL;
     oslFileHandle pErr = NULL;
-    oslProcessError eErr = osl_executeProcess_WithRedirectedIO(fileName.pData,
+        oslProcessError eErr = runProcessWithPathSearch(fileName,
             args, sizeof(args)/sizeof(rtl_uString *),
-        osl_Process_SEARCHPATH | osl_Process_HIDDEN,
+            &aProcess, &pIn, &pOut, &pErr);
-        osl_getCurrentSecurity(), 0, 0, 0, &aProcess, &pIn, &pOut, &pErr);
+
     if (eErr!=osl_Process_E_None)
         return false;
 
@@ -222,15 +264,15 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
 }
 
 static bool RenderAsPNGThroughHelper(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
-    Graphic &rGraphic, rtl::OUString &rProgName, rtl_uString **pArgs, size_t nArgs)
+    Graphic &rGraphic, rtl::OUString &rProgName, rtl_uString *pArgs[], size_t nArgs)
 {
     oslProcess aProcess;
     oslFileHandle pIn = NULL;
     oslFileHandle pOut = NULL;
     oslFileHandle pErr = NULL;
-    oslProcessError eErr = osl_executeProcess_WithRedirectedIO(rProgName.pData,
+        oslProcessError eErr = runProcessWithPathSearch(rProgName,
-        pArgs, nArgs, osl_Process_SEARCHPATH | osl_Process_HIDDEN,
+            pArgs, nArgs,
-        osl_getCurrentSecurity(), 0, 0, 0, &aProcess, &pIn, &pOut, &pErr);
+            &aProcess, &pIn, &pOut, &pErr);
     if (eErr!=osl_Process_E_None)
         return false;
 
@@ -251,7 +293,7 @@ static bool RenderAsPNGThroughHelper(const sal_uInt8* pBuf, sal_uInt32 nBytesRea
 
         aMemStm.Seek(0);
         if (
-            eFileErr == osl_File_E_None &&
+            aMemStm.GetEndOfData() &&
             GraphicConverter::Import(aMemStm, rGraphic, CVT_PNG) == ERRCODE_NONE
            )
         {
@@ -270,7 +312,7 @@ static bool RenderAsPNGThroughConvert(const sal_uInt8* pBuf, sal_uInt32 nBytesRe
     Graphic &rGraphic)
 {
     rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("convert"));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("convert"EXESUFFIX));
     // density in pixel/inch
     rtl::OUString arg1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-density"));
     // since the preview is also used for PDF-Export & printing on non-PS-printers,
@@ -293,10 +335,10 @@ static bool RenderAsPNGThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
 {
 #ifdef WNT
     rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gswin32c"));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gswin32c"EXESUFFIX));
 #else
     rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gs"));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gs"EXESUFFIX));
 #endif
     rtl::OUString arg1 =
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-q"));

goodies/source/filter.vcl/ipbm/ipbm.cxx

@@ -106,7 +106,7 @@ BOOL PBMReader::ReadPBM( SvStream & rPBM, Graphic & rGraphic )
     if ( ( mbStatus = ImplReadHeader() ) == FALSE )
         return FALSE;
 
-    if ( mnWidth == 0 || mnHeight == 0 )
+    if ( ( mnMaxVal == 0 ) || ( mnWidth == 0 ) || ( mnHeight == 0 ) )
         return FALSE;
 
     // 0->PBM, 1->PGM, 2->PPM
@@ -172,6 +172,7 @@ BOOL PBMReader::ImplReadHeader()
     *mpPBM >> nID[ 0 ] >> nID[ 1 ];
     if ( nID[ 0 ] != 'P' )
         return FALSE;
+    mnMaxVal = mnWidth = mnHeight = 0;
     switch ( nID[ 1 ] )
     {
         case '1' :
@@ -179,6 +180,7 @@ BOOL PBMReader::ImplReadHeader()
         case '4' :
             mnMode = 0;
             nMax = 2;               // number of parameters in Header
+            mnMaxVal = 1;
             break;
         case '2' :
             mbRaw = FALSE;
@@ -195,9 +197,6 @@ BOOL PBMReader::ImplReadHeader()
         default:
             return FALSE;
     }
-
-    mnMaxVal = mnWidth = mnHeight = 0;
-
     while ( bFinished == FALSE )
     {
         if ( mpPBM->GetError() )
@@ -466,7 +465,9 @@ BOOL PBMReader::ImplReadBody()
                 if ( nCount == 3 )
                 {
                     nCount = 0;
-                    mpAcc->SetPixel( nHeight, nWidth++, BitmapColor( (BYTE)nRGB[ 0 ], (BYTE)nRGB[ 1 ], (BYTE)nRGB[ 2 ] ) );
+                    mpAcc->SetPixel( nHeight, nWidth++, BitmapColor( static_cast< BYTE >( ( nRGB[ 0 ] * 255 ) / mnMaxVal ),
+                                                                     static_cast< BYTE >( ( nRGB[ 1 ] * 255 ) / mnMaxVal ),
+                                                                     static_cast< BYTE >( ( nRGB[ 2 ] * 255 ) / mnMaxVal ) ) );
                     nCount = 0;
                     nRGB[ 0 ] = nRGB[ 1 ] = nRGB[ 2 ] = 0;
                     if ( nWidth == mnWidth )

l10ntools/inc/export.hxx

@@ -31,9 +31,9 @@
 #ifndef _EXPORT_HXX
 #define _EXPORT_HXX
 
-#ifndef TRANSEX_DIRECTORY_HXX
+#ifndef L10NTOOLS_DIRECTORY_HXX
-#define TRANSEX_DIRECTORY_HXX
+#define L10NTOOLS_DIRECTORY_HXX
-#include <transex3/directory.hxx>
+#include <l10ntools/directory.hxx>
 #endif
 
 

l10ntools/inc/l10ntools/directory.hxx

@@ -12,9 +12,9 @@
 
 #include <stdio.h>
 
-#ifndef TRANSEX_FILE_HXX
+#ifndef L10NTOOLS_FILE_HXX
-#define TRANSEX_FILE_HXX
+#define L10NTOOLS_FILE_HXX
-#include <transex3/file.hxx>
+#include <l10ntools/file.hxx>
 #endif
 
 namespace transex{

l10ntools/inc/makefile.mk

@@ -30,7 +30,7 @@
 #*************************************************************************
 PRJ=..
 
-PRJNAME=transex3
+PRJNAME=l10ntools
 TARGET=inc
 
 # --- Settings -----------------------------------------------------

l10ntools/inc/pch/precompiled_l10ntools.cxx

@@ -28,5 +28,5 @@
  *
  ************************************************************************/
 
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 

l10ntools/inc/srciter.hxx

@@ -28,9 +28,9 @@
  *
  ************************************************************************/
 
-#ifndef TRANSEX_DIRECTORY_HXX
+#ifndef L10NTOOLS_DIRECTORY_HXX
-#define TRANSEX_DIRECTORY_HXX
+#define L10NTOOLS_DIRECTORY_HXX
-#include <transex3/directory.hxx>
+#include <l10ntools/directory.hxx>
 #endif
 
 // class SourceTreeIterator

l10ntools/java/l10nconv/makefile.mk

@@ -30,7 +30,7 @@
 #*************************************************************************
 
 PRJ=../..
-PRJNAME=transex3
+PRJNAME=l10ntools
 TARGET=converter
 
 .INCLUDE : ant.mk

l10ntools/java/receditor/makefile.mk

@@ -30,7 +30,7 @@
 #*************************************************************************
 
 PRJ=../..
-PRJNAME=transex3
+PRJNAME=l10ntools
 TARGET=receditor
 
 .INCLUDE : ant.mk

l10ntools/layout/makefile.mk

@@ -33,7 +33,7 @@ PRJ=..
 
 INCPRE=$(MISC)
 
-PRJNAME=transex3
+PRJNAME=l10ntools
 TARGET=tralay
 #TARGETTYPE=GUI
 TARGETTYPE=CUI

l10ntools/layout/tralay.cxx

@@ -30,7 +30,7 @@
  ************************************************************************/
 
 #include <com/sun/star/xml/sax/SAXException.hpp>
-#include <transex3/vosapp.hxx>
+#include <l10ntools/vosapp.hxx>
 
 #include <osl/file.hxx>
 

l10ntools/prj/build.lst

@@ -0,0 +1,10 @@
+tr	l10ntools	:	tools LIBXSLT:libxslt BERKELEYDB:berkeleydb LUCENE:lucene NULL
+tr	l10ntools						usr1	-	all	tr_mkout NULL
+tr	l10ntools\inc					nmake	-	all	tr_inc NULL
+tr	l10ntools\source					nmake	-	all	tr_src tr_inc NULL
+tr	l10ntools\layout					nmake	-	all	rt_layout tr_src tr_inc NULL
+#tr	l10ntools\java\l10nconv			nmake	-	all	tr_conv NULL
+#tr	l10ntools\java\receditor			nmake	-	all	tr_rece NULL
+tr  l10ntools\source\help    nmake   -   all tr_bla_help  NULL
+tr  l10ntools\source\filter\utils    nmake   -   all tr_bla_utils NULL
+tr  l10ntools\source\filter\merge    nmake   -   all tr_bla_merge tr_bla_utils NULL

l10ntools/prj/d.lst

@@ -1,4 +1,4 @@
-mkdir: %_DEST%\inc%_EXT%\transex3
+mkdir: %_DEST%\inc%_EXT%\l10ntools
 mkdir: %_DEST%\bin%_EXT%
 mkdir: %_DEST%\bin%_EXT%\help
 mkdir: %_DEST%\bin%_EXT%\help\com
@@ -46,16 +46,16 @@ mkdir: %_DEST%\bin%_EXT%\help\com\sun\star\help
 ..\scripts\fast_merge.pl %_DEST%\bin%_EXT%\fast_merge.pl
 ..\scripts\keyidGen.pl %_DEST%\bin%_EXT%\keyidGen.pl
 
-..\inc\export.hxx %_DEST%\inc%_EXT%\transex3\export.hxx
+..\inc\export.hxx %_DEST%\inc%_EXT%\l10ntools\export.hxx
-..\inc\transex3\directory.hxx %_DEST%\inc%_EXT%\transex3\directory.hxx
+..\inc\l10ntools\directory.hxx %_DEST%\inc%_EXT%\l10ntools\directory.hxx
-..\inc\transex3\file.hxx %_DEST%\inc%_EXT%\transex3\file.hxx
+..\inc\l10ntools\file.hxx %_DEST%\inc%_EXT%\l10ntools\file.hxx
-..\inc\transex3\vosapp.hxx %_DEST%\inc%_EXT%\transex3\vosapp.hxx
+..\inc\l10ntools\vosapp.hxx %_DEST%\inc%_EXT%\l10ntools\vosapp.hxx
 
-..\inc\utf8conv.hxx %_DEST%\inc%_EXT%\transex3\utf8conv.hxx
+..\inc\utf8conv.hxx %_DEST%\inc%_EXT%\l10ntools\utf8conv.hxx
 ..\%__SRC%\lib\transex.lib %_DEST%\lib%_EXT%\transex.lib
 ..\%__SRC%\lib\libtransex.a %_DEST%\lib%_EXT%\libtransex.a
 
-..\source\help\compilehelp.hxx %_DEST%\inc%_EXT%\transex3\compilehelp.hxx
+..\source\help\compilehelp.hxx %_DEST%\inc%_EXT%\l10ntools\compilehelp.hxx
-#..\source\help\helplinkerdllapi.h  %_DEST%\inc%_EXT%\transex3\helplinkerdllapi.h
+#..\source\help\helplinkerdllapi.h  %_DEST%\inc%_EXT%\l10ntools\helplinkerdllapi.h
 ..\%__SRC%\lib\* %_DEST%\lib%_EXT%\*
 ..\%__SRC%\class\com\sun\star\help\* %_DEST%\bin%_EXT%\help\com\sun\star\help\*

l10ntools/scripts/localize.pl

@@ -78,6 +78,7 @@ my $WIN;
 my $languages;
 #my %sl_modules;     # Contains all modules where en-US and de is source language
 my $use_default_date = '0';
+my $force_ooo_module = '0';
 my %is_ooo_module;
 my %is_so_module;
 my $DELIMITER;
@@ -275,7 +276,7 @@ sub check_modules_scm
 sub is_openoffice_module
 {
     my $module              = shift;
-    return "TRUE", if defined $is_ooo_module{ $module };
+    return "TRUE", if ( $force_ooo_module || defined $is_ooo_module{ $module } );
     return "";
 }
 
@@ -1114,7 +1115,7 @@ sub parse_options{
     my $extract;
     my $success = GetOptions('f=s' => \$sdffile , 'l=s' => \$languages , 's=s' => \$srcpath ,  'h' => \$help , 'v' => \$bVerbose ,
                              'm' => \$merge , 'e' => \$extract , 'x' => \$no_sort , 'd' => \$use_default_date , 'c' => \$create_dirs ,
-                             'n' => \$no_gsicheck );
+                             'n' => \$no_gsicheck , 'o' => \$force_ooo_module );
     $outputfile = $sdffile;
 
     #print STDOUT "DBG: lang = $languages\n";
@@ -1126,7 +1127,11 @@ sub parse_options{
             exit(1);
         }
     }
-    if( $help || !$success || $#ARGV > 1 || ( !$sdffile ) ){
+    if( $help ){
+        usage();
+        exit(0);
+    }
+    if( !$success || $#ARGV > 1 || ( !$sdffile ) ){
         usage();
         exit(1);
     }
@@ -1167,6 +1172,8 @@ sub usage{
     print STDERR "    -h              File with localize.sdf's\n!";
     print STDERR "    -n              No gsicheck\n";
     print STDERR "    -i              Module to merge\n";
+    print STDERR "    -o              force using ooo localization from the l10n module instead of l10n_so; \n";
+    print STDERR "                    useful if the type can't be detected by the .svn tags; \n";
     print STDERR "    -v              Verbose\n";
     print STDERR "\nExample:\n";
     print STDERR "\nlocalize -e -l en-US,pt-BR=en-US -f my.sdf\n( Extract en-US and pt-BR with en-US fallback )\n";

l10ntools/source/cfgmerge.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <stdio.h>
 #include <tools/string.hxx>
 #include <tools/fsys.hxx>

l10ntools/source/directory.cxx

@@ -30,8 +30,8 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
-#include <transex3/directory.hxx>
+#include <l10ntools/directory.hxx>
 #include "tools/string.hxx"
 #include <iostream>
 #include <vector>

l10ntools/source/export.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <stdio.h>
 #include <stdlib.h>
 #include <tools/fsys.hxx>

l10ntools/source/export2.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include "export.hxx"
 #include "utf8conv.hxx"
 #include <tools/datetime.hxx>
@@ -355,16 +355,17 @@ bool Export::CopyFile( const ByteString& source , const ByteString& dest )
     char buf[ BUFFERSIZE ];
 
     FILE* IN_FILE = fopen( source.GetBuffer() , "r" );
-    FILE* OUT_FILE = fopen( dest.GetBuffer() , "w" );
-
     if( IN_FILE == NULL )
     {
         cerr << "Export::CopyFile WARNING: Could not open " << source.GetBuffer() << "\n";
         return false;
     }
+
+    FILE* OUT_FILE = fopen( dest.GetBuffer() , "w" );
     if( OUT_FILE == NULL )
     {
         cerr << "Export::CopyFile WARNING: Could not open/create " << dest.GetBuffer() << " for writing\n";
+        fclose( IN_FILE );
         return false;
     }
 

l10ntools/source/file.cxx

@@ -30,8 +30,8 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
-#include <transex3/file.hxx>
+#include <l10ntools/file.hxx>
 
 namespace transex
 {

l10ntools/source/filter/merge/makefile.mk

@@ -31,7 +31,7 @@
 
 PRJ     = ..$/..$/..
 TARGET  = FCFGMerge
-PRJNAME = filter
+PRJNAME = l10ntools
 PACKAGE = com$/sun$/star$/filter$/config$/tools$/merge
 
 # --- Settings -----------------------------------------------------