Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
l10ntools/scripts/localize.pl
l10ntools/source/directory.cxx
l10ntools/source/srciter.cxx
padmin/Executable_spadmin.bin.mk
padmin/Library_spa.mk
svtools/inc/svtools/filter.hxx
svtools/inc/svtools/grfmgr.hxx
svtools/source/filter/filter.cxx
svtools/source/filter/filter2.cxx
svtools/source/filter/wmf/emfwr.cxx
svtools/source/filter/wmf/enhwmf.cxx
svtools/source/filter/wmf/winmtf.cxx
svtools/source/filter/wmf/winmtf.hxx
svtools/source/filter/wmf/winwmf.cxx
svtools/source/filter/wmf/wmfwr.cxx
svtools/source/graphic/grfmgr.cxx
svtools/source/graphic/grfmgr2.cxx
toolkit/source/controls/controlmodelcontainerbase.cxx
toolkit/source/controls/unocontrol.cxx
toolkit/source/helper/formpdfexport.cxx
toolkit/source/helper/unowrapper.cxx
vcl/Package_osx.mk
vcl/aqua/source/app/salinst.cxx
vcl/aqua/source/app/salsys.cxx
vcl/aqua/source/dtrans/aqua_service.cxx
vcl/aqua/source/dtrans/test_aquacb.cxx
vcl/aqua/source/res/makefile.mk
vcl/aqua/source/window/salframe.cxx
vcl/aqua/source/window/salframeview.mm
vcl/inc/aqua/salgdi.h
vcl/inc/aqua/salinst.h
vcl/inc/graphite_adaptors.hxx
vcl/inc/graphite_cache.hxx
vcl/inc/graphite_serverfont.hxx
vcl/inc/impprn.hxx
vcl/inc/svdata.hxx
vcl/inc/unx/i18n_status.hxx
vcl/inc/unx/saldata.hxx
vcl/inc/unx/salfont.h
vcl/inc/unx/salinst.h
vcl/inc/unx/salprn.h
vcl/inc/unx/salsys.h
vcl/inc/unx/sm.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/graph.hxx
vcl/inc/vcl/outdev.hxx
vcl/inc/vcl/polyscan.hxx
vcl/inc/vcl/svcompat.hxx
vcl/inc/vcl/svgread.hxx
vcl/inc/vcl/unobrok.hxx
vcl/inc/win/salgdi.h
vcl/inc/win/wincomp.hxx
vcl/prj/d.lst
vcl/source/app/dbggui.cxx
vcl/source/app/idlemgr.cxx
vcl/source/app/makefile.mk
vcl/source/app/settings.cxx
vcl/source/app/sound.cxx
vcl/source/app/stdtext.cxx
vcl/source/app/svapp.cxx
vcl/source/app/svdata.cxx
vcl/source/app/svmain.cxx
vcl/source/app/timer.cxx
vcl/source/app/unohelp.cxx
vcl/source/components/dtranscomp.cxx
vcl/source/control/button.cxx
vcl/source/control/combobox.cxx
vcl/source/control/ctrl.cxx
vcl/source/control/edit.cxx
vcl/source/control/field2.cxx
vcl/source/control/ilstbox.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmapex.cxx
vcl/source/gdi/cvtgrf.cxx
vcl/source/gdi/font.cxx
vcl/source/gdi/image.cxx
vcl/source/gdi/imagerepository.cxx
vcl/source/gdi/impbmp.cxx
vcl/source/gdi/impgraph.cxx
vcl/source/gdi/impimagetree.cxx
vcl/source/gdi/jobset.cxx
vcl/source/gdi/makefile.mk
vcl/source/gdi/metaact.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev2.cxx
vcl/source/gdi/outdev5.cxx
vcl/source/gdi/outdev6.cxx
vcl/source/gdi/outmap.cxx
vcl/source/gdi/polyscan.cxx
vcl/source/gdi/print.cxx
vcl/source/gdi/print2.cxx
vcl/source/gdi/region.cxx
vcl/source/gdi/salgdilayout.cxx
vcl/source/gdi/sallayout.cxx
vcl/source/gdi/svcompat.cxx
vcl/source/gdi/virdev.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/gcach_vdev.cxx
vcl/source/glyphs/gcach_vdev.hxx
vcl/source/glyphs/graphite_adaptors.cxx
vcl/source/glyphs/graphite_cache.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/glyphs/graphite_serverfont.cxx
vcl/source/glyphs/graphite_textsrc.hxx
vcl/source/glyphs/makefile.mk
vcl/source/src/makefile.mk
vcl/source/window/accel.cxx
vcl/source/window/brdwin.cxx
vcl/source/window/btndlg.cxx
vcl/source/window/dialog.cxx
vcl/source/window/dndevdis.cxx
vcl/source/window/dockmgr.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/floatwin.cxx
vcl/source/window/introwin.cxx
vcl/source/window/keycod.cxx
vcl/source/window/menu.cxx
vcl/source/window/msgbox.cxx
vcl/source/window/scrwnd.cxx
vcl/source/window/split.cxx
vcl/source/window/splitwin.cxx
vcl/source/window/status.cxx
vcl/source/window/syswin.cxx
vcl/source/window/tabpage.cxx
vcl/source/window/toolbox.cxx
vcl/source/window/toolbox2.cxx
vcl/source/window/window.cxx
vcl/source/window/window2.cxx
vcl/source/window/winproc.cxx
vcl/source/window/wrkwin.cxx
vcl/unx/generic/app/i18n_cb.cxx
vcl/unx/generic/app/i18n_ic.cxx
vcl/unx/generic/app/saldata.cxx
vcl/unx/generic/app/saldisp.cxx
vcl/unx/generic/app/salinst.cxx
vcl/unx/generic/app/wmadaptor.cxx
vcl/unx/generic/fontmanager/afm_hash.cpp
vcl/unx/generic/gdi/salbmp.cxx
vcl/unx/generic/gdi/salgdi3.cxx
vcl/unx/generic/gdi/xrender_peer.cxx
vcl/unx/generic/window/salframe.cxx
vcl/unx/generic/window/salobj.cxx
vcl/unx/gtk/a11y/makefile.mk
vcl/unx/gtk/app/gtksys.cxx
vcl/unx/gtk/app/makefile.mk
vcl/unx/gtk/window/gtkframe.cxx
vcl/unx/gtk/window/gtkobject.cxx
vcl/unx/headless/svpinst.cxx
vcl/unx/headless/svpinst.hxx
vcl/unx/headless/svpprn.hxx
vcl/unx/kde/kdedata.cxx
vcl/unx/kde/salnativewidgets-kde.cxx
vcl/unx/kde4/KDESalDisplay.hxx
vcl/unx/kde4/KDEXLib.cxx
vcl/unx/kde4/KDEXLib.hxx
vcl/unx/kde4/VCLKDEApplication.cxx
vcl/unx/kde4/makefile.mk
vcl/unx/source/app/makefile.mk
vcl/unx/source/fontmanager/makefile.mk
vcl/unx/source/gdi/makefile.mk
vcl/unx/source/inc/salcursors.h
vcl/util/linksvp/makefile.mk
vcl/win/source/app/saldata.cxx
vcl/win/source/app/salinst.cxx
vcl/win/source/app/salshl.cxx
vcl/win/source/gdi/makefile.mk
vcl/win/source/gdi/salbmp.cxx
vcl/win/source/gdi/salgdi.cxx
vcl/win/source/gdi/salgdi2.cxx
vcl/win/source/gdi/salgdi3.cxx
vcl/win/source/gdi/salgdi_gdiplus.cxx
vcl/win/source/gdi/salprn.cxx
vcl/win/source/gdi/salvd.cxx
vcl/win/source/gdi/winlayout.cxx
vcl/win/source/window/salframe.cxx
vcl/win/source/window/salmenu.cxx
vcl/win/source/window/salobj.cxx

1 files changed, 411 insertions, 0 deletions

diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx
new file mode 100644
index 000000000000..4b0d327a9a03
--- /dev/null
+++ b/vcl/unx/generic/fontmanager/helper.cxx
@@ -0,0 +1,411 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_vcl.hxx"
+
+#include <cstring>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <limits.h>
+
+#include "vcl/helper.hxx"
+#include "vcl/ppdparser.hxx"
+#include "tools/string.hxx"
+#include "tools/urlobj.hxx"
+#include "osl/file.hxx"
+#include "osl/process.h"
+#include "rtl/bootstrap.hxx"
+
+using ::rtl::Bootstrap;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
+
+namespace psp {
+
+OUString getOfficePath( enum whichOfficePath ePath )
+{
+    static OUString aNetPath;
+    static OUString aUserPath;
+    static OUString aConfigPath;
+    static OUString aEmpty;
+    static bool bOnce = false;
+
+    if( ! bOnce )
+    {
+        bOnce = true;
+        OUString aIni;
+        Bootstrap::get( OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aIni );
+        aIni += OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) );
+        Bootstrap aBootstrap( aIni );
+        aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomDataUrl" ) ), aConfigPath );
+        aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseInstallation" ) ), aNetPath );
+        aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "UserInstallation" ) ), aUserPath );
+        OUString aUPath = aUserPath;
+
+        if( ! aConfigPath.compareToAscii( "file://", 7 ) )
+        {
+            OUString aSysPath;
+            if( osl_getSystemPathFromFileURL( aConfigPath.pData, &aSysPath.pData ) == osl_File_E_None )
+                aConfigPath = aSysPath;
+        }
+        if( ! aNetPath.compareToAscii( "file://", 7 ) )
+        {
+            OUString aSysPath;
+            if( osl_getSystemPathFromFileURL( aNetPath.pData, &aSysPath.pData ) == osl_File_E_None )
+                aNetPath = aSysPath;
+        }
+        if( ! aUserPath.compareToAscii( "file://", 7 ) )
+        {
+            OUString aSysPath;
+            if( osl_getSystemPathFromFileURL( aUserPath.pData, &aSysPath.pData ) == osl_File_E_None )
+                aUserPath = aSysPath;
+        }
+        // ensure user path exists
+        aUPath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/psprint" ) );
+        #if OSL_DEBUG_LEVEL > 1
+        oslFileError eErr =
+        #endif
+        osl_createDirectoryPath( aUPath.pData, NULL, NULL );
+        #if OSL_DEBUG_LEVEL > 1
+        fprintf( stderr, "try to create \"%s\" = %d\n", OUStringToOString( aUPath, RTL_TEXTENCODING_UTF8 ).getStr(), eErr );
+        #endif
+    }
+
+    switch( ePath )
+    {
+        case ConfigPath: return aConfigPath;
+        case NetPath: return aNetPath;
+        case UserPath: return aUserPath;
+    }
+    return aEmpty;
+}
+
+static OString getEnvironmentPath( const char* pKey )
+{
+    OString aPath;
+
+    const char* pValue = getenv( pKey );
+    if( pValue && *pValue )
+    {
+        aPath = OString( pValue );
+    }
+    return aPath;
+}
+
+} // namespace psp
+
+void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSubDir )
+{
+    rPathList.clear();
+    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
+
+    OUStringBuffer aPathBuffer( 256 );
+
+    // append net path
+    aPathBuffer.append( getOfficePath( psp::NetPath ) );
+    if( aPathBuffer.getLength() )
+    {
+        aPathBuffer.appendAscii( "/share/psprint" );
+        if( pSubDir )
+        {
+            aPathBuffer.append( sal_Unicode('/') );
+            aPathBuffer.appendAscii( pSubDir );
+        }
+        rPathList.push_back( aPathBuffer.makeStringAndClear() );
+    }
+    // append user path
+    aPathBuffer.append( getOfficePath( psp::UserPath ) );
+    if( aPathBuffer.getLength() )
+    {
+        aPathBuffer.appendAscii( "/user/psprint" );
+        if( pSubDir )
+        {
+            aPathBuffer.append( sal_Unicode('/') );
+            aPathBuffer.appendAscii( pSubDir );
+        }
+        rPathList.push_back( aPathBuffer.makeStringAndClear() );
+    }
+
+    OString aPath( getEnvironmentPath("SAL_PSPRINT") );
+    sal_Int32 nIndex = 0;
+    do
+    {
+        OString aDir( aPath.getToken( 0, ':', nIndex ) );
+        if( ! aDir.getLength() )
+            continue;
+
+        if( pSubDir )
+        {
+            aDir += "/";
+            aDir += pSubDir;
+        }
+        struct stat aStat;
+        if( stat( aDir.getStr(), &aStat ) || ! S_ISDIR( aStat.st_mode ) )
+            continue;
+
+        rPathList.push_back( OStringToOUString( aDir, aEncoding ) );
+    } while( nIndex != -1 );
+
+    #ifdef SYSTEM_PPD_DIR
+    if( pSubDir && rtl_str_compare( pSubDir, PRINTER_PPDDIR ) == 0 )
+    {
+        rPathList.push_back( rtl::OStringToOUString( rtl::OString( SYSTEM_PPD_DIR ), RTL_TEXTENCODING_UTF8 ) );
+    }
+    #endif
+
+    if( rPathList.empty() )
+    {
+        // last resort: next to program file (mainly for setup)
+        OUString aExe;
+        if( osl_getExecutableFile( &aExe.pData ) == osl_Process_E_None )
+        {
+            INetURLObject aDir( aExe );
+            aDir.removeSegment();
+            aExe = aDir.GetMainURL( INetURLObject::NO_DECODE );
+            OUString aSysPath;
+            if( osl_getSystemPathFromFileURL( aExe.pData, &aSysPath.pData ) == osl_File_E_None )
+            {
+                rPathList.push_back( aSysPath );
+            }
+        }
+    }
+}
+
+OUString psp::getFontPath()
+{
+    static OUString aPath;
+
+    if( ! aPath.getLength() )
+    {
+        OUStringBuffer aPathBuffer( 512 );
+
+        OUString aConfigPath( getOfficePath( psp::ConfigPath ) );
+        OUString aNetPath( getOfficePath( psp::NetPath ) );
+        OUString aUserPath( getOfficePath( psp::UserPath ) );
+        if( aConfigPath.getLength() )
+        {
+            // #i53530# Path from CustomDataUrl will completely
+            // replace net and user paths if the path exists
+            aPathBuffer.append(aConfigPath);
+            aPathBuffer.appendAscii("/share/fonts");
+            // check existance of config path
+            struct stat aStat;
+            if( 0 != stat( OUStringToOString( aPathBuffer.makeStringAndClear(), osl_getThreadTextEncoding() ).getStr(), &aStat )
+                || ! S_ISDIR( aStat.st_mode ) )
+                aConfigPath = OUString();
+            else
+            {
+                aPathBuffer.append(aConfigPath);
+                aPathBuffer.appendAscii("/share/fonts");
+            }
+        }
+        if( aConfigPath.getLength() == 0 )
+        {
+            if( aNetPath.getLength() )
+            {
+                aPathBuffer.append( aNetPath );
+                aPathBuffer.appendAscii( "/share/fonts/truetype;");
+                aPathBuffer.append( aNetPath );
+                aPathBuffer.appendAscii( "/share/fonts/type1;" );
+            }
+            if( aUserPath.getLength() )
+            {
+                aPathBuffer.append( aUserPath );
+                aPathBuffer.appendAscii( "/user/fonts" );
+            }
+        }
+        OString aEnvPath( getEnvironmentPath( "SAL_FONTPATH_PRIVATE" ) );
+        if( aEnvPath.getLength() )
+        {
+            aPathBuffer.append( sal_Unicode(';') );
+            aPathBuffer.append( OStringToOUString( aEnvPath, osl_getThreadTextEncoding() ) );
+        }
+
+        aPath = aPathBuffer.makeStringAndClear();
+#if OSL_DEBUG_LEVEL > 1
+        fprintf( stderr, "initializing font path to \"%s\"\n", OUStringToOString( aPath, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
+#endif
+    }
+    return aPath;
+}
+
+bool psp::convertPfbToPfa( ::osl::File& rInFile, ::osl::File& rOutFile )
+{
+    static unsigned char hexDigits[] =
+        {
+            '0', '1', '2', '3', '4', '5', '6', '7',
+            '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+        };
+
+    bool bSuccess = true;
+    bool bEof = false;
+    unsigned char buffer[256];
+    sal_uInt64 nRead;
+    sal_uInt64 nOrgPos = 0;
+    rInFile.getPos( nOrgPos );
+
+    while( bSuccess && ! bEof )
+    {
+        // read leading bytes
+        bEof = ! rInFile.read( buffer, 6, nRead ) && nRead == 6 ? false : true;
+        unsigned int nType = buffer[ 1 ];
+        unsigned int nBytesToRead = buffer[2] | buffer[3] << 8 | buffer[4] << 16 | buffer[5] << 24;
+        if( buffer[0] != 0x80 ) // test for pfb m_agic number
+        {
+            // this migt be a pfa font already
+            if( ! rInFile.read( buffer+6, 9, nRead ) && nRead == 9 &&
+                ( ! std::strncmp( (char*)buffer, "%!FontType1-", 12 ) ||
+                  ! std::strncmp( (char*)buffer, "%!PS-AdobeFont-", 15 ) ) )
+            {
+                sal_uInt64 nWrite = 0;
+                if( rOutFile.write( buffer, 15, nWrite ) || nWrite != 15 )
+                    bSuccess = false;
+                while( bSuccess &&
+                       ! rInFile.read( buffer, sizeof( buffer ), nRead ) &&
+                       nRead != 0 )
+                {
+                    if( rOutFile.write( buffer, nRead, nWrite ) ||
+                        nWrite != nRead )
+                        bSuccess = false;
+                }
+                bEof = true;
+            }
+            else
+                bSuccess = false;
+        }
+        else if( nType == 1 || nType == 2 )
+        {
+            unsigned char* pBuffer = new unsigned char[ nBytesToRead+1 ];
+
+            if( ! rInFile.read( pBuffer, nBytesToRead, nRead ) && nRead == nBytesToRead )
+            {
+                if( nType == 1 )
+                {
+                    // ascii data, convert dos lineends( \r\n ) and
+                    // m_ac lineends( \r ) to \n
+                    unsigned char * pWriteBuffer = new unsigned char[ nBytesToRead ];
+                    unsigned int nBytesToWrite = 0;
+                    for( unsigned int i = 0; i < nBytesToRead; i++ )
+                    {
+                        if( pBuffer[i] != '\r' )
+                            pWriteBuffer[ nBytesToWrite++ ] = pBuffer[i];
+                        else if( pBuffer[ i+1 ] == '\n' )
+                        {
+                            i++;
+                            pWriteBuffer[ nBytesToWrite++ ] = '\n';
+                        }
+                        else
+                            pWriteBuffer[ nBytesToWrite++ ] = '\n';
+                    }
+                    if( rOutFile.write( pWriteBuffer, nBytesToWrite, nRead ) || nRead != nBytesToWrite )
+                        bSuccess = false;
+
+                    delete [] pWriteBuffer;
+                }
+                else
+                {
+                    // binary data
+                    unsigned int nBuffer = 0;
+                    for( unsigned int i = 0; i < nBytesToRead && bSuccess; i++ )
+                    {
+                        buffer[ nBuffer++ ] = hexDigits[ pBuffer[ i ] >> 4 ];
+                        buffer[ nBuffer++ ] = hexDigits[ pBuffer[ i ] & 15 ];
+                        if( nBuffer >= 80 )
+                        {
+                            buffer[ nBuffer++ ] = '\n';
+                            if( rOutFile.write( buffer, nBuffer, nRead ) || nRead != nBuffer )
+                                bSuccess = false;
+                            nBuffer = 0;
+                        }
+                    }
+                    if( nBuffer > 0 && bSuccess )
+                    {
+                        buffer[ nBuffer++ ] = '\n';
+                        if( rOutFile.write( buffer, nBuffer, nRead ) || nRead != nBuffer )
+                            bSuccess = false;
+                    }
+                }
+            }
+            else
+                bSuccess = false;
+
+            delete [] pBuffer;
+        }
+        else if( nType == 3 )
+            bEof = true;
+        else
+            bSuccess = false;
+    }
+
+    return bSuccess;
+}
+
+void psp::normPath( OString& rPath )
+{
+    char buf[PATH_MAX];
+
+    ByteString aPath( rPath );
+
+    // double slashes and slash at end are probably
+    // removed by realpath anyway, but since this runs
+    // on many different platforms let's play it safe
+    while( aPath.SearchAndReplace( "//", "/" ) != STRING_NOTFOUND )
+        ;
+    if( aPath.Len() > 0 && aPath.GetChar( aPath.Len()-1 ) == '/' )
+        aPath.Erase( aPath.Len()-1 );
+
+    if( ( aPath.Search( "./" ) != STRING_NOTFOUND ||
+          aPath.Search( "~" ) != STRING_NOTFOUND )
+        && realpath( aPath.GetBuffer(), buf ) )
+    {
+        rPath = buf;
+    }
+    else
+    {
+        rPath = aPath;
+    }
+}
+
+void psp::splitPath( OString& rPath, OString& rDir, OString& rBase )
+{
+    normPath( rPath );
+    sal_Int32 nIndex = rPath.lastIndexOf( '/' );
+    if( nIndex > 0 )
+        rDir = rPath.copy( 0, nIndex );
+    else if( nIndex == 0 ) // root dir
+        rDir = rPath.copy( 0, 1 );
+    if( rPath.getLength() > nIndex+1 )
+        rBase = rPath.copy( nIndex+1 );
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */