[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel workspace.vcl39.patch,1.1,1.2



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11628

Modified Files:
	workspace.vcl39.patch 
Log Message:
tweak patch

workspace.vcl39.patch:
 padmin/source/fontentry.cxx                |    6 
 psprint/inc/psprint/fontmanager.hxx        |    2 
 psprint/source/fontmanager/fontcache.cxx   |   40 --
 psprint/source/fontmanager/fontconfig.cxx  |    7 
 psprint/source/fontmanager/fontmanager.cxx |   17 -
 psprint/source/fontsubset/sft.c            |    8 
 psprint/source/fontsubset/sft.h            |    2 
 toolkit/source/awt/vclxtoolkit.cxx         |    5 
 vcl/inc/salframe.hxx                       |    2 
 vcl/inc/sallayout.hxx                      |   10 
 vcl/inc/scrbar.hxx                         |    1 
 vcl/inc/window.hxx                         |    2 
 vcl/source/app/stdtext.cxx                 |    5 
 vcl/source/app/svapp.cxx                   |    5 
 vcl/source/app/svdata.cxx                  |   41 +-
 vcl/source/control/button.cxx              |   52 ++-
 vcl/source/control/edit.cxx                |    6 
 vcl/source/control/ilstbox.cxx             |   29 -
 vcl/source/control/scrbar.cxx              |   88 +++--
 vcl/source/gdi/bmpfast.cxx                 |   34 +-
 vcl/source/gdi/metric.cxx                  |    5 
 vcl/source/gdi/outdev3.cxx                 |    1 
 vcl/source/gdi/print.cxx                   |    2 
 vcl/source/gdi/sallayout.cxx               |   49 ++
 vcl/source/window/brdwin.cxx               |    7 
 vcl/source/window/menu.cxx                 |   63 ++-
 vcl/source/window/msgbox.cxx               |   23 +
 vcl/source/window/scrwnd.cxx               |   11 
 vcl/source/window/splitwin.cxx             |   15 
 vcl/source/window/window.cxx               |    5 
 vcl/unx/gtk/app/gtkdata.cxx                |   18 -
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx   |   33 -
 vcl/unx/gtk/window/gtkframe.cxx            |   92 +++--
 vcl/unx/inc/plugins/gtk/gtkframe.hxx       |    1 
 vcl/unx/inc/salframe.h                     |    1 
 vcl/unx/inc/wmadaptor.hxx                  |   21 +
 vcl/unx/source/app/sm.cxx                  |   11 
 vcl/unx/source/app/soicon.cxx              |    3 
 vcl/unx/source/app/wmadaptor.cxx           |  179 +++++++---
 vcl/unx/source/gdi/pspgraphics.cxx         |    2 
 vcl/unx/source/gdi/xfont.cxx               |    5 
 vcl/unx/source/window/salframe.cxx         |   37 ++
 vcl/win/inc/salgdi.h                       |    1 
 vcl/win/source/gdi/salgdi.cxx              |    2 
 vcl/win/source/gdi/salgdi3.cxx             |  274 ++++++++++++----
 vcl/win/source/gdi/winlayout.cxx           |  492 ++++++++++++++++++-----------
 vcl/win/source/window/salframe.cxx         |   15 
 47 files changed, 1184 insertions(+), 546 deletions(-)

Index: workspace.vcl39.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.vcl39.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl39.patch	8 Jun 2005 14:09:27 -0000	1.1
+++ workspace.vcl39.patch	8 Jun 2005 17:48:53 -0000	1.2
@@ -86,15 +86,6 @@
                  aStream.WriteLine( aLine );
              }
              aStream.WriteLine( ByteString() );
-@@ -348,7 +353,7 @@ void FontCache::read()
-             else
-             {
-                 nDir = rManager.getDirectoryAtom( aDir, true );
--                m_aCache[ nDir ].m_nTimestamp = nTimestamp;
-+                m_aCache[ nDir ].m_nTimestamp = (sal_Int64)aStat.st_mtime;
-                 m_aCache[ nDir ].m_bNoFiles = bEmpty;
-                 pDir = bEmpty ? NULL : &m_aCache[ nDir ].m_aEntries;
-                 bKeepOnlyUserOverridden = ((sal_Int64)aStat.st_mtime != nTimestamp);
 @@ -467,6 +472,8 @@ void FontCache::read()
                          break;
                      default: break;
@@ -320,367 +311,6 @@
  
          sal_uInt32  ntables;
          sal_uInt32  *goffsets;
-Index: source/printer/cupsmgr.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printer/cupsmgr.cxx,v
-retrieving revision 1.11
-retrieving revision 1.9.20.3
-diff -u -p -u -r1.11 -r1.9.20.3
---- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx	30 Mar 2005 08:53:00 -0000	1.11
-+++ openoffice.org/psprint/source/printer/cupsmgr.cxx	7 Apr 2005 12:11:11 -0000	1.9.20.3
-@@ -84,6 +84,7 @@ class CUPSWrapper
- {
-     oslModule		m_pLib;
-     osl::Mutex		m_aGetPPDMutex;
-+    bool            m_bPPDThreadRunning;
- 
-     int				(*m_pcupsPrintFile)(const char*, const char*, const char*, int, cups_option_t*);
-     int				(*m_pcupsGetDests)(cups_dest_t**);
-@@ -123,7 +124,7 @@ public:
-                    cups_option_t* pOptions )
-     { return m_pcupsPrintFile( pPrinter, pFileName, pTitle, nOptions, pOptions ); }
- 
--    const char* cupsGetPPD( const char* pPrinter );
-+    rtl::OString cupsGetPPD( const char* pPrinter );
- 
-     int cupsMarkOptions(ppd_file_t* pPPD, int nOptions, cups_option_t* pOptions )
-     { return m_pcupsMarkOptions(pPPD, nOptions, pOptions); }
-@@ -174,7 +175,8 @@ void* CUPSWrapper::loadSymbol( const cha
- }
- 
- CUPSWrapper::CUPSWrapper() 
--        : m_pLib( NULL )
-+        : m_pLib( NULL ),
-+          m_bPPDThreadRunning( false )
- {
- #ifdef ENABLE_CUPS
-     OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libcups.so.2" ) );
-@@ -256,68 +258,113 @@ bool CUPSWrapper::isValid()
-     return m_pLib != NULL;
- }
- 
--static struct GetPPDAttribs
-+typedef const char*(*PPDFunction)(const char*);
-+struct GetPPDAttribs
- {
--    const char* (*pFunction)(const char*);
-+    PPDFunction         m_pFunction;
-     osl::Condition		m_aCondition;
--    const char*			m_pParameter;
--    const char*			m_pResult;
-+    OString			    m_aParameter;
-+    OString			    m_aResult;
-     oslThread			m_aThread;
--} *pAttribs = NULL;
--
--extern "C" {
--    static void getPPDWorker(void*)
-+    int                 m_nRefs;
-+    bool*               m_pResetRunning;
-+    osl::Mutex*         m_pSyncMutex;
-+    
-+    GetPPDAttribs( PPDFunction pFn, const char * m_pParameter,
-+                   bool* pResetRunning, osl::Mutex* pSyncMutex )
-+            : m_pFunction( pFn ),
-+              m_aParameter( m_pParameter ),
-+              m_pResetRunning( pResetRunning ),
-+              m_pSyncMutex( pSyncMutex )
-+    {
-+        m_nRefs = 2;
-+        m_aCondition.reset();
-+    }
-+    
-+    ~GetPPDAttribs()
-     {
--        pAttribs->m_pResult = pAttribs->pFunction( pAttribs->m_pParameter );
--        if( pAttribs->m_aCondition.check() )
-+        if( m_aResult.getLength() )
-+            unlink( m_aResult.getStr() );
-+    }
-+    
-+    void unref()
-+    {
-+        if( --m_nRefs == 0 )
-         {
--            // timed out, unlink file
--            if( pAttribs->m_pResult )
--                unlink( pAttribs->m_pResult );
--            delete pAttribs;
--            pAttribs = NULL;
-+            *m_pResetRunning = false;
-+            delete this;
-         }
--        else
--            pAttribs->m_aCondition.set();
-+    }
-+    
-+    void executeCall()
-+    {
-+        // This CUPS method is not at all thread-safe we need
-+        // to dup the pointer to a static buffer it returns ASAP
-+        OString aResult = m_pFunction( m_aParameter );
-+        MutexGuard aGuard( *m_pSyncMutex );
-+        m_aResult = aResult;
-+        m_aCondition.set();
-+        unref();
-+    }
-+    
-+    OString waitResult( TimeValue *pDelay )
-+    {
-+        m_pSyncMutex->release();
-+        
-+        if (m_aCondition.wait( pDelay ) != Condition::result_ok
-+            )
-+        {
-+            #if OSL_DEBUG_LEVEL > 1
-+            fprintf( stderr, "cupsGetPPD %s timed out\n",
-+            (const sal_Char *) m_aParameter
-+            );
-+            #endif
-+        }
-+        m_pSyncMutex->acquire();
-+        
-+        OString aRetval = m_aResult;
-+        m_aResult = OString();
-+        unref();
-+        
-+        return aRetval;
-+    }
-+};
-+
-+extern "C" {
-+    static void getPPDWorker(void* pData)
-+    {
-+        GetPPDAttribs* pAttribs = (GetPPDAttribs*)pData;
-+        pAttribs->executeCall();
-     }
- }
- 
--const char* CUPSWrapper::cupsGetPPD( const char* pPrinter )
-+OString CUPSWrapper::cupsGetPPD( const char* pPrinter )
- {
--    const char* pResult = NULL;
-+    OString aResult;
- 
-+    m_aGetPPDMutex.acquire();
-     // if one thread hangs in cupsGetPPD already, don't start another
--    if( ! pAttribs )
-+    if( ! m_bPPDThreadRunning )
-     {
--        pAttribs = new GetPPDAttribs();
--        pAttribs->pFunction			= m_pcupsGetPPD;
--        pAttribs->m_aCondition.reset();
--        pAttribs->m_pParameter		= pPrinter;
--        pAttribs->m_pResult			= NULL;
--        pAttribs->m_aThread			= osl_createThread( getPPDWorker, NULL );
-+        m_bPPDThreadRunning = true;
-+        GetPPDAttribs* pAttribs = new GetPPDAttribs( m_pcupsGetPPD,
-+                                                     pPrinter,
-+                                                     &m_bPPDThreadRunning,
-+                                                     &m_aGetPPDMutex );
-+        
-+        oslThread aThread = osl_createThread( getPPDWorker, pAttribs );
- 
-         TimeValue aValue;
-         aValue.Seconds = 5;
-         aValue.Nanosec = 0;
--        if( pAttribs->m_aCondition.wait( &aValue ) == Condition::result_ok )
--        {
--            osl_destroyThread( pAttribs->m_aThread );
--            pResult = pAttribs->m_pResult;
--            delete pAttribs;
--            pAttribs = NULL;
--        }
--        else
--        {
--#if OSL_DEBUG_LEVEL > 1
--            fprintf( stderr, "cupsGetPPD %s timed out\n", pPrinter );
--#endif
--            // should the thread awake again notify it to clean up itself
--            pAttribs->m_aCondition.set();
--            osl_destroyThread( pAttribs->m_aThread );
--        }
-+
-+        // NOTE: waitResult release and acquires the GetPPD mutex
-+        aResult = pAttribs->waitResult( &aValue );
-+        osl_destroyThread( aThread );
-     }
-+    m_aGetPPDMutex.release();
- 
--    return pResult;
-+    return aResult;
- }
- 
- static const char* setPasswordCallback( const char* pIn )
-@@ -577,20 +624,20 @@ const PPDParser* CUPSManager::createCUPS
-             if( dest_it != m_aCUPSDestMap.end() )
-             {
-                 cups_dest_t* pDest = ((cups_dest_t*)m_pDests) + dest_it->second;
--                const char* pPPDFile = m_pCUPSWrapper->cupsGetPPD( pDest->name );
-+                OString aPPDFile = m_pCUPSWrapper->cupsGetPPD( pDest->name );
-                 #if OSL_DEBUG_LEVEL > 1
--                fprintf( stderr, "PPD for %s is %s\n", OUStringToOString( aPrinter, osl_getThreadTextEncoding() ).getStr(), pPPDFile );
-+                fprintf( stderr, "PPD for %s is %s\n", OUStringToOString( aPrinter, osl_getThreadTextEncoding() ).getStr(), aPPDFile.getStr() );
-                 #endif
--                if( pPPDFile )
-+                if( aPPDFile.getLength() )
-                 {
-                     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
--                    OUString aFileName( OStringToOUString( pPPDFile, aEncoding ) );
-+                    OUString aFileName( OStringToOUString( aPPDFile, aEncoding ) );
-                     // update the printer info with context information
--                    ppd_file_t* pPPD = m_pCUPSWrapper->ppdOpenFile( pPPDFile );
-+                    ppd_file_t* pPPD = m_pCUPSWrapper->ppdOpenFile( aPPDFile.getStr() );
-                     if( pPPD )
-                     {
-                         // create the new parser
--                        PPDParser* pCUPSParser =  new PPDParser( aFileName );
-+                        PPDParser* pCUPSParser = new PPDParser( aFileName );
-                         pCUPSParser->m_aFile = rPrinter;
-                         pNewParser = pCUPSParser;
-                         
-@@ -615,29 +662,33 @@ const PPDParser* CUPSManager::createCUPS
-                         rInfo.m_aContext = rContext;
-                         
-                         // clean up the mess
--                        m_pCUPSWrapper->ppdClose( pPPD );
-+                        m_pCUPSWrapper->ppdClose( pPPD );                        
-                     }
-                     #if OSL_DEBUG_LEVEL > 1
-                     else
--                        fprintf( stderr, "ppdOpenFile failed, fallinmg back to generic driver\n" );
-+                        fprintf( stderr, "ppdOpenFile failed, falling back to generic driver\n" );
-                     #endif
-                     
-                     // remove temporary PPD file
--                    unlink( pPPDFile );
-+                    unlink( aPPDFile.getStr() );
-                 }
-                 #if OSL_DEBUG_LEVEL > 1
-                 else
--                    fprintf( stderr, "no dest found for printer %s\n", OUStringToOString( aPrinter, osl_getThreadTextEncoding() ).getStr() );
-+                    fprintf( stderr, "cupsGetPPD failed, falling back to generic driver\n" );
-                 #endif
-             }
-+            #if OSL_DEBUG_LEVEL > 1
-+            else
-+                fprintf( stderr, "no dest found for printer %s\n", OUStringToOString( aPrinter, osl_getThreadTextEncoding() ).getStr() );
-+            #endif
-         }
-         m_aCUPSMutex.release();
-     }
--#if OSL_DEBUG_LEVEL >1
-+    #if OSL_DEBUG_LEVEL >1
-     else
-         fprintf( stderr, "could not acquire CUPS mutex !!!\n" );
--#endif
--#endif // ENABLE_CUPS
-+    #endif
-+    #endif // ENABLE_CUPS
- 
-     if( ! pNewParser )
-     {
-Index: source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.103
-retrieving revision 1.103.6.4
-diff -u -p -u -r1.103 -r1.103.6.4
---- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp	31 May 2005 17:08:10 -0000	1.103
-+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp	6 Jun 2005 10:52:19 -0000	1.103.6.4
-@@ -1359,24 +1359,42 @@ File gid_File_Lib_Proxyfac
- End
- 
- #ifdef UNX
--
--STD_LIB_FILE( gid_File_Lib_Psp, psp )
--
-+File gid_File_Lib_Psp
-+    Name = LIBNAME(psp);
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,PATCH);
-+    Dir = gid_Dir_Program;
-+End
- #endif
- 
- #ifdef UNX
--STD_LIB_FILE( gid_File_Lib_Vclplug_Gen, vclplug_gen )
-+File gid_File_Lib_Vclplug_Gen
-+    Name = LIBNAME(vclplug_gen);
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,PATCH);
-+    Dir = gid_Dir_Program;
-+End
- #endif
- 
- #ifdef UNX
- #ifdef ENABLE_GTK
- #ifndef MACOSX
--STD_LIB_FILE( gid_File_Lib_Vclplug_Gtk, vclplug_gtk )
-+File gid_File_Lib_Vclplug_Gtk
-+    Name = LIBNAME(vclplug_gtk);
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,PATCH);
-+    Dir = gid_Dir_Program;
-+End
- #endif
- #endif
- #ifdef ENABLE_KDE
- #ifndef MACOSX
--STD_LIB_FILE( gid_File_Lib_Vclplug_Kde, vclplug_kde )
-+File gid_File_Lib_Vclplug_Kde
-+    Name = LIBNAME(vclplug_kde);
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,PATCH);
-+    Dir = gid_Dir_Program;
-+End
- #endif
- #endif
- #endif
-@@ -1663,7 +1681,12 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot 
- 
- #ifdef UNX
- 
--STD_LIB_FILE( gid_File_Lib_Spa, spa )
-+File gid_File_Lib_Spa
-+    Name = LIBNAME(spa);
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,PATCH);
-+    Dir = gid_Dir_Program;
-+End
- 
- #endif
- 
-@@ -1801,7 +1824,13 @@ End
- 
- SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_Tinstrm,textinstream.uno)
- 
--STD_UNO_LIB_FILE( gid_File_Lib_Tk, tk )
-+File gid_File_Lib_Tk
-+    Name = LIBNAME(tk);
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,UNO_COMPONENT,PATCH);
-+    Dir = gid_Dir_Program;
-+    RegistryID = gid_Starregistry_Services_Rdb;
-+End
- 
- STD_LIB_FILE( gid_File_Lib_Tools, tl )
- 
-@@ -1946,7 +1975,13 @@ End
- 
- STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
- 
--STD_UNO_LIB_FILE( gid_File_Lib_Vcl, vcl )
-+File gid_File_Lib_Vcl
-+    Name = LIBNAME(vcl);
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,UNO_COMPONENT,PATCH);
-+    Dir = gid_Dir_Program;
-+    RegistryID = gid_Starregistry_Services_Rdb;
-+End
- 
- #ifdef USE_PASF
- 
 Index: source/awt/vclxtoolkit.cxx
 ===================================================================
 RCS file: /cvs/gsl/toolkit/source/awt/vclxtoolkit.cxx,v


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]