[Libreoffice-commits] .: 2 commits - dtrans/source rsc/source

[Tor Lillqvist]

 dtrans/source/win32/mtaole/MtaOleClipb.cxx |    8 ++++----
 rsc/source/rsc/rsc.cxx                     |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 0bc3445ae06919e9cf057b98b6d29981e6c2ef91
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 25 23:32:55 2011 +0200

    Be less verbose when dbglevel <= 2

diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 506c5dc..b1daba7 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -148,7 +148,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
     i = 1;
     while( ppStr && i < (aCmdLine.GetCount() -1) )
     {
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 2
         fprintf( stderr, "CmdLineArg: \"%s\"\n", *ppStr );
 #endif
         if( '-' == **ppStr )
@@ -908,7 +908,7 @@ ERRTYPE RscCompiler::Link()
                 aSysSearchPath.Append( cSearchDelim );
                 aSysSearchPath.Append( aToken );
             }
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 2
             fprintf( stderr, "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.GetBuffer() );
 #endif
             pTC->SetSysSearchPath( aSysSearchPath );
@@ -1154,7 +1154,7 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
             aAbsPath.ToAbs();
             const FileStat aFS( aAbsPath.GetFull() );
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 2
             fprintf( stderr, "Searching image: %s\n", ByteString( aRelPath.GetFull(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
 #endif
 
@@ -1198,7 +1198,7 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
                     fprintf( pSysListFile, "%s\n", rContext.pCmdLine->substitutePaths( aSysPathStr ).getStr() );
                 }
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 2
                 fprintf( stderr, "ImagePath to add: %s\n", rImagePath.GetBuffer() );
 #endif
             }
commit 36b9745cdc3e266f4a16e06adaa03e62234c560b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 25 23:32:31 2011 +0200

    Use correct type of parameter 7 to SendMessageTimeout

diff --git a/dtrans/source/win32/mtaole/MtaOleClipb.cxx b/dtrans/source/win32/mtaole/MtaOleClipb.cxx
index 2636208..59df3c1 100644
--- a/dtrans/source/win32/mtaole/MtaOleClipb.cxx
+++ b/dtrans/source/win32/mtaole/MtaOleClipb.cxx
@@ -590,7 +590,7 @@ LRESULT CMtaOleClipboard::onChangeCBChain( HWND hWndRemove, HWND hWndNext )
     else if ( IsWindow( m_hwndNextClipViewer ) )
     {
         // forward the message to the next one
-        DWORD dwResult;		
+        DWORD_PTR dwpResult;
         SendMessageTimeoutA( 
             m_hwndNextClipViewer, 
             WM_CHANGECBCHAIN, 
@@ -598,7 +598,7 @@ LRESULT CMtaOleClipboard::onChangeCBChain( HWND hWndRemove, HWND hWndNext )
             reinterpret_cast<LPARAM>(hWndNext),
             SMTO_BLOCK,
             MAX_CLIPEVENT_PROCESSING_TIME,
-            &dwResult );
+            &dwpResult );
     }
 
     return 0;
@@ -625,7 +625,7 @@ LRESULT CMtaOleClipboard::onDrawClipboard( )
     // foward the message to the next viewer in the chain
     if ( IsWindow( m_hwndNextClipViewer ) )
     {
-        DWORD dwResult;
+        DWORD_PTR dwpResult;
         SendMessageTimeoutA( 
             m_hwndNextClipViewer, 
             WM_DRAWCLIPBOARD, 
@@ -633,7 +633,7 @@ LRESULT CMtaOleClipboard::onDrawClipboard( )
             static_cast< LPARAM >( 0 ),
             SMTO_BLOCK,
             MAX_CLIPEVENT_PROCESSING_TIME,
-            &dwResult );
+            &dwpResult );
     }
 
     return 0;