diff options
-rw-r--r-- | comphelper/source/misc/mediadescriptor.cxx | 2 | ||||
-rw-r--r-- | dtrans/source/os2/clipb/Os2Clipboard.cxx | 2 | ||||
-rw-r--r-- | dtrans/source/os2/clipb/Os2Transferable.hxx | 2 | ||||
-rw-r--r-- | vcl/os2/source/app/salinst.cxx | 6 | ||||
-rw-r--r-- | vcl/os2/source/app/salshl.cxx | 2 | ||||
-rw-r--r-- | vcl/os2/source/gdi/os2layout.cxx | 4 | ||||
-rw-r--r-- | vcl/os2/source/gdi/salgdi3.cxx | 20 | ||||
-rw-r--r-- | vcl/os2/source/window/salframe.cxx | 72 | ||||
-rw-r--r-- | vcl/os2/source/window/salobj.cxx | 2 |
9 files changed, 56 insertions, 56 deletions
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index a9be31ae2d1b..1aba6e820e10 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -598,7 +598,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile ) ::rtl::OUString sNormalizedURL = impl_normalizeURL( sURL ); return impl_openStreamWithURL( sNormalizedURL, bLockFile ); } -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 0 catch(const css::uno::Exception& ex) { ::rtl::OUStringBuffer sMsg(256); diff --git a/dtrans/source/os2/clipb/Os2Clipboard.cxx b/dtrans/source/os2/clipb/Os2Clipboard.cxx index cc8c5240d6fb..0295616c0354 100644 --- a/dtrans/source/os2/clipb/Os2Clipboard.cxx +++ b/dtrans/source/os2/clipb/Os2Clipboard.cxx @@ -228,7 +228,7 @@ void SAL_CALL Os2Clipboard::setContents( const Reference< XTransferable >& xTran } } -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 0 // dump list of available mimetypes Sequence< DataFlavor > aFlavors( m_aContents->getTransferDataFlavors() ); for( int i = 0; i < aFlavors.getLength(); i++ ) diff --git a/dtrans/source/os2/clipb/Os2Transferable.hxx b/dtrans/source/os2/clipb/Os2Transferable.hxx index fbd9e8167e7d..025f49544c42 100644 --- a/dtrans/source/os2/clipb/Os2Transferable.hxx +++ b/dtrans/source/os2/clipb/Os2Transferable.hxx @@ -41,7 +41,7 @@ #define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer -#if OSL_DEBUG_LEVEL>1 +#if OSL_DEBUG_LEVEL > 1 //extern "C" int debug_printf(const char *f, ...); #define debug_printf( ...) { 1; } #else diff --git a/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx index 90483bdb3a9b..7659ed1a0640 100644 --- a/vcl/os2/source/app/salinst.cxx +++ b/vcl/os2/source/app/salinst.cxx @@ -356,7 +356,7 @@ void InitSalMain() HAB hAB; HMQ hMQ; SalData* pData = GetAppSalData(); -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 0 printf("InitSalMain\n"); #endif @@ -389,7 +389,7 @@ printf("InitSalMain\n"); void DeInitSalMain() { -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 0 printf("DeInitSalMain\n"); #endif @@ -443,7 +443,7 @@ SalInstance* CreateSalInstance() if ( !hComWnd ) return NULL; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("CreateSalInstance hComWnd %x\n", hComWnd); #endif Os2SalInstance* pInst = new Os2SalInstance; diff --git a/vcl/os2/source/app/salshl.cxx b/vcl/os2/source/app/salshl.cxx index de9e64e3a1fb..5974fbde8bd9 100644 --- a/vcl/os2/source/app/salshl.cxx +++ b/vcl/os2/source/app/salshl.cxx @@ -70,7 +70,7 @@ HPOINTER ImplLoadSalCursor( int nId ) HPOINTER hPointer = WinLoadPointer( HWND_DESKTOP, aSalShlData.mhMod, nId ); DBG_ASSERT( hPointer, "pointer not found in sal resource" ); -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 if (!hPointer) debug_printf( "ImplLoadSalCursor: pointer %d not found in sal resource\n", nId); #endif diff --git a/vcl/os2/source/gdi/os2layout.cxx b/vcl/os2/source/gdi/os2layout.cxx index cedec8429670..b29a79386b21 100644 --- a/vcl/os2/source/gdi/os2layout.cxx +++ b/vcl/os2/source/gdi/os2layout.cxx @@ -372,7 +372,7 @@ bool Os2SalLayout::LayoutText( ImplLayoutArgs& rArgs ) if (Ft2FontSupportsUnicodeChar( mhPS, lLcid, TRUE, nCharCode)) continue; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalLayout::LayoutText font does not support unicode char\n"); #endif // request glyph fallback at this position in the string @@ -594,7 +594,7 @@ void Os2SalLayout::DrawText( SalGraphics& rGraphics ) const if (rc == GPI_ERROR) { // if *W fails, convert to codepage and use *A (fallback to GPI into ft2) ByteString str( mpOutGlyphs, gsl_getSystemTextEncoding() ); -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalLayout::DrawText HPS %08x PosAtW failed '%s'!\n",static_cast<Os2SalGraphics&>(rGraphics).mhPS,str.GetBuffer()); #endif // gliph size is not recalculated, so it could be wrong! diff --git a/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx index 86f1faffd538..11aa9df9ce76 100644 --- a/vcl/os2/source/gdi/salgdi3.cxx +++ b/vcl/os2/source/gdi/salgdi3.cxx @@ -587,7 +587,7 @@ void Os2SalGraphics::SetTextColor( SalColor nSalColor ) USHORT Os2SalGraphics::ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFontScale, int nFallbackLevel) { -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "Os2SalGraphics::ImplDoSetFont\n"); #endif @@ -651,7 +651,7 @@ USHORT Os2SalGraphics::ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFon if ( i_pFont->meWeight > WEIGHT_MEDIUM ) aFAttrs.fsSelection |= FATTR_SEL_BOLD; -#if OSL_DEBUG_LEVEL>1 +#if OSL_DEBUG_LEVEL > 1 if (pFontMetric->szFacename[0] == 'A') { debug_printf( "Os2SalGraphics::SetFont hps %x lMatch '%d'\n", mhPS, pFontMetric->lMatch); debug_printf( "Os2SalGraphics::SetFont hps %x fontmetrics facename '%s'\n", mhPS, pFontMetric->szFacename); @@ -661,7 +661,7 @@ USHORT Os2SalGraphics::ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFon Ft2DeleteSetId( mhPS, nFallbackLevel + LCID_BASE); if ( (rc=Ft2CreateLogFont( mhPS, NULL, nFallbackLevel + LCID_BASE, &aFAttrs)) == GPI_ERROR ) { -#if OSL_DEBUG_LEVEL>1 +#if OSL_DEBUG_LEVEL > 1 ERRORID nLastError = WinGetLastError( GetSalData()->mhAB ); debug_printf( "Os2SalGraphics::SetFont hps %x Ft2CreateLogFont failed err %x\n", mhPS, nLastError ); #endif @@ -734,7 +734,7 @@ USHORT Os2SalGraphics::ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFon rc = Ft2SetAttrs( mhPS, PRIM_CHAR, nAttrs, nAttrsDefault, &aBundle ); -#if OSL_DEBUG_LEVEL>1 +#if OSL_DEBUG_LEVEL > 1 FONTMETRICS aOS2Metric = {0}; Ft2QueryFontMetrics( mhPS, sizeof( aOS2Metric ), &aOS2Metric ); #endif @@ -753,7 +753,7 @@ USHORT Os2SalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel ) return 0; } -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "Os2SalGraphics::SetFont\n"); #endif @@ -814,7 +814,7 @@ void Os2SalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe FONTMETRICS aOS2Metric; Ft2QueryFontMetrics( mhPS, sizeof( aOS2Metric ), &aOS2Metric ); -#if OSL_DEBUG_LEVEL>1 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "Os2SalGraphics::GetFontMetric hps %x\n", mhPS); if (aOS2Metric.szFacename[0] == 'A') { debug_printf( "Os2SalGraphics::GetFontMetric hps %x fontmetrics facename '%s'\n", mhPS, aOS2Metric.szFacename); @@ -969,7 +969,7 @@ ImplFontCharMap* Os2SalGraphics::GetImplFontCharMap() const bool Os2SalGraphics::AddTempDevFont( ImplDevFontList* pFontList, const String& rFontFileURL, const String& rFontName ) { -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalGraphics::AddTempDevFont\n"); #endif return false; @@ -983,7 +983,7 @@ void Os2SalGraphics::GetDevFontList( ImplDevFontList* pList ) ULONG nFontMetricCount; SalData* pSalData; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalGraphics::GetDevFontList\n"); #endif @@ -1131,7 +1131,7 @@ BOOL Os2SalGraphics::GetGlyphBoundRect( long nIndex, Rectangle& rRect ) BOOL Os2SalGraphics::GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& rB2DPolyPoly ) { -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalGraphics::GetGlyphOutline\n"); #endif rB2DPolyPoly.clear(); @@ -1395,7 +1395,7 @@ BOOL Os2SalGraphics::CreateFontSubset( const rtl::OUString& rToFile, ScopedFont aOldFont(*this); SetFont( &aIFSD, 0 ); -#if OSL_DEBUG_LEVEL > 100 +#if OSL_DEBUG_LEVEL > 1 // get font metrics TEXTMETRICA aWinMetric; if( !::GetTextMetricsA( mhDC, &aWinMetric ) ) diff --git a/vcl/os2/source/window/salframe.cxx b/vcl/os2/source/window/salframe.cxx index 743bdce64802..29a3a5489728 100644 --- a/vcl/os2/source/window/salframe.cxx +++ b/vcl/os2/source/window/salframe.cxx @@ -52,7 +52,7 @@ #include <vcl/keycodes.hxx> #include <saltimer.h> -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 extern "C" int debug_printf(const char *f, ...); static BOOL _bCapture; @@ -112,7 +112,7 @@ BOOL APIENTRY _WinQueryWindowPos( Os2SalFrame* pFrame, PSWP pswp) SWP swpOwner; BOOL rc = WinQueryWindowPos( pFrame->mhWndFrame, pswp); -#if OSL_DEBUG_LEVEL>1 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "> WinQueryWindowPos hwnd %x at %d,%d (%dx%d)\n", pFrame->mhWndFrame, pswp->x, pswp->y, pswp->cx, pswp->cy); #endif @@ -142,7 +142,7 @@ BOOL APIENTRY _WinQueryWindowPos( Os2SalFrame* pFrame, PSWP pswp) // invert Y coordinate pswp->y = swpOwner.cy - (pswp->y + pswp->cy); -#if OSL_DEBUG_LEVEL>1 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "< WinQueryWindowPos hwnd %x at %d,%d (%dx%d)\n", pFrame->mhWndFrame, pswp->x, pswp->y, pswp->cx, pswp->cy); #endif @@ -156,7 +156,7 @@ BOOL APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND hwndInsertBehind, LONG POINTL ptlOwner = {0}; HWND hParent = NULL; -#if OSL_DEBUG_LEVEL>1 +#if OSL_DEBUG_LEVEL > 1 debug_printf( ">WinSetWindowPos hwnd %x at %d,%d (%dx%d) fl 0x%08x\n", pFrame->mhWndFrame, x, y, cx, cy, fl); #endif @@ -208,7 +208,7 @@ BOOL APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND hwndInsertBehind, LONG if (fl & SWP_CENTER) { ptlOwner.x = (swpOwner.cx - cx) / 2; ptlOwner.y = (swpOwner.cy - cy) / 2; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "_WinSetWindowPos SWP_CENTER\n"); #endif fl = fl & ~SWP_CENTER; @@ -218,7 +218,7 @@ BOOL APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND hwndInsertBehind, LONG ptlOwner.x = x; ptlOwner.y = swpOwner.cy - (y + cy); -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "_WinSetWindowPos owner 0x%x at %d,%d (%dx%d) OS2\n", hParent, ptlOwner.x, ptlOwner.y, swpOwner.cx, swpOwner.cy); #endif @@ -228,13 +228,13 @@ BOOL APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND hwndInsertBehind, LONG x = ptlOwner.x; y = ptlOwner.y; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "_WinSetWindowPos owner 0x%x at %d,%d (%dx%d) MAPPED OS2\n", hParent, ptlOwner.x, ptlOwner.y, swpOwner.cx, swpOwner.cy); #endif } -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "<WinSetWindowPos hwnd %x at %d,%d (%dx%d) fl=%x\n", pFrame->mhWndFrame, x, y, cx, cy, fl); #endif @@ -243,7 +243,7 @@ BOOL APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND hwndInsertBehind, LONG // ======================================================================= -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 static void dumpWindowInfo( char* fnc, HWND hwnd) { SWP aSWP; @@ -348,7 +348,7 @@ static void ImplSaveFrameState( Os2SalFrame* pFrame ) if ( aSWP.fl & SWP_MINIMIZE ) { -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalFrame::GetWindowState %08x SAL_FRAMESTATE_MINIMIZED\n", pFrame->mhWndFrame); #endif @@ -358,7 +358,7 @@ static void ImplSaveFrameState( Os2SalFrame* pFrame ) } else if ( aSWP.fl & SWP_MAXIMIZE ) { -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalFrame::GetWindowState %08x SAL_FRAMESTATE_MAXIMIZED\n", pFrame->mhWndFrame); #endif @@ -384,7 +384,7 @@ static void ImplSaveFrameState( Os2SalFrame* pFrame ) pFrame->maState.mnY = nScreenHeight - (aSWP.y+aSWP.cy)+nTopDeco; pFrame->maState.mnWidth = aSWP.cx-nLeftDeco-nRightDeco; pFrame->maState.mnHeight = aSWP.cy-nTopDeco-nBottomDeco; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalFrame::GetWindowState %08x (%dx%d) at %d,%d VCL\n", pFrame->mhWndFrame, pFrame->maState.mnWidth,pFrame->maState.mnHeight,pFrame->maState.mnX,pFrame->maState.mnY); @@ -445,7 +445,7 @@ static void ImplSalCalcFrameSize( const Os2SalFrame* pFrame, else nCaptionY = 0; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 //if (_bCapture) debug_printf("ImplSalCalcFrameSize 0x%08x x=%d y=%d t=%d\n", pFrame->mhWndFrame, nFrameX, nFrameY, nCaptionY); #endif @@ -570,7 +570,7 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSal ULONG nClientStyle = WS_CLIPSIBLINGS; BOOL bSubFrame = FALSE; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf(">ImplSalCreateFrame hWndParent 0x%x, nSalFrameStyle 0x%x\n", hWndParent, nSalFrameStyle); #endif @@ -944,7 +944,7 @@ static void ImplSalShow( HWND hWnd, ULONG bVisible, ULONG bNoActivate ) pFrame->mbOverwriteState = TRUE; pFrame->mbInShow = TRUE; -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "ImplSalShow hwnd %x visible flag %d, no activate: flag %d\n", hWnd, bVisible, bNoActivate); #endif @@ -964,7 +964,7 @@ static void ImplSalShow( HWND hWnd, ULONG bVisible, ULONG bNoActivate ) } else { -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "ImplSalShow hwnd %x HIDE\n"); #endif WinSetWindowPos(hWnd, NULL, 0, 0, 0, 0, SWP_HIDE); @@ -1024,7 +1024,7 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nEvent = 0; ULONG nPosFlags = 0; -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 //dumpWindowInfo( "-Os2SalFrame::SetPosSize", mhWndFrame); debug_printf( ">Os2SalFrame::SetPosSize go to %d,%d (%dx%d) VCL\n",nX,nY,nWidth,nHeight); #endif @@ -1047,7 +1047,7 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, if ( (nFlags & (SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y)) ) { nPosFlags |= SWP_MOVE; -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "-Os2SalFrame::SetPosSize MOVE to %d,%d\n", nX, nY); #endif //DBG_ASSERT( nX && nY, " Windowposition of (0,0) requested!" ); @@ -1056,7 +1056,7 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, if ( (nFlags & (SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT)) ) { nPosFlags |= SWP_SIZE; -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "-Os2SalFrame::SetPosSize SIZE to %d,%d\n", nWidth,nHeight); #endif nEvent = (nEvent == SALEVENT_MOVE) ? SALEVENT_MOVERESIZE : SALEVENT_RESIZE; @@ -1069,7 +1069,7 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, mbDefPos = FALSE; nPosFlags |= SWP_MOVE | SWP_CENTER; nEvent = SALEVENT_MOVERESIZE; -#if OSL_DEBUG_LEVEL > 10 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "-Os2SalFrame::SetPosSize CENTER\n"); debug_printf( "-Os2SalFrame::SetPosSize default position to %d,%d\n", nX, nY); #endif @@ -1117,7 +1117,7 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, if( nEvent ) CallCallback( nEvent, NULL ); -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 1 dumpWindowInfo( "<Os2SalFrame::SetPosSize (exit)", mhWndFrame); #endif @@ -1128,7 +1128,7 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, void Os2SalFrame::SetParent( SalFrame* pNewParent ) { APIRET rc; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalFrame::SetParent mhWndFrame 0x%08x to 0x%08x\n", static_cast<Os2SalFrame*>(this)->mhWndFrame, static_cast<Os2SalFrame*>(pNewParent)->mhWndClient); @@ -1197,7 +1197,7 @@ void Os2SalFrame::SetWindowState( const SalFrameState* pState ) LONG nHeight; ULONG nPosSize = 0; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalFrame::SetWindowState\n"); debug_printf("Os2SalFrame::SetWindowState %08x (%dx%d) at %d,%d VCL\n", mhWndFrame, @@ -1243,7 +1243,7 @@ void Os2SalFrame::SetWindowState( const SalFrameState* pState ) else nHeight = aSWP.cy; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalFrame::SetWindowState (%dx%d) at %d,%d\n", nWidth,nHeight,nX,nY); #endif @@ -1337,7 +1337,7 @@ void Os2SalFrame::SetWindowState( const SalFrameState* pState ) aPlacement.cx, aPlacement.cy, aPlacement.fl ); } -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("Os2SalFrame::SetWindowState DONE\n"); #endif } @@ -1428,7 +1428,7 @@ void Os2SalFrame::SetAlwaysOnTop( BOOL bOnTop ) static void ImplSalToTop( HWND hWnd, ULONG nFlags ) { Os2SalFrame* pFrame = GetWindowPtr( hWnd ); -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf("ImplSalToTop hWnd %08x, nFlags %x\n", hWnd, nFlags); #endif @@ -1614,7 +1614,7 @@ void Os2SalFrame::SetPointer( PointerStyle ePointerStyle ) void Os2SalFrame::CaptureMouse( BOOL bCapture ) { -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 _bCapture=bCapture; debug_printf("Os2SalFrame::CaptureMouse bCapture %d\n", bCapture); #endif @@ -2452,7 +2452,7 @@ static long ImplHandleMouseMsg( HWND hWnd, if( !WinIsWindow( pFrame->mhAB, hWnd ) ) return 0; -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 //if (_bCapture) debug_printf("ImplHandleMouseMsg mouse %d,%d\n",aMouseEvt.mnX,aMouseEvt.mnY); #endif @@ -2625,7 +2625,7 @@ static void ImplUpdateInputLang( Os2SalFrame* pFrame ) // convert uni string to integer rc = UniStrtoul(locale_object, pinfo_item, &pinfo_item, 16, &nLang); rc = UniFreeMem(pinfo_item); -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 debug_printf("ImplUpdateInputLang nLang %04x\n", nLang); char char_buffer[256]; rc = UniCreateUconvObject((UniChar *)L"", &uconv_object); @@ -2637,7 +2637,7 @@ static void ImplUpdateInputLang( Os2SalFrame* pFrame ) rc = UniFreeLocaleObject(locale_object); // keep input lang up-to-date -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 debug_printf("ImplUpdateInputLang pFrame %08x lang changed from %d to %d\n", pFrame, pFrame->mnInputLang, nLang); #endif @@ -2649,7 +2649,7 @@ static sal_Unicode ImplGetCharCode( Os2SalFrame* pFrame, USHORT nKeyFlags, sal_Char nCharCode, UCHAR nScanCode ) { ImplUpdateInputLang( pFrame ); -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 debug_printf("ImplGetCharCode nCharCode %c, %04x\n", nCharCode, nCharCode); #endif return OUString( &nCharCode, 1, gsl_getSystemTextEncoding()).toChar(); @@ -2731,7 +2731,7 @@ static long ImplHandleKeyMsg( HWND hWnd, SalKeyModEvent aModEvt; aModEvt.mnTime = WinQueryMsgTime( pFrame->mhAB ); aModEvt.mnCode = nModCode; -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 debug_printf("SALEVENT_KEYMODCHANGE\n"); #endif nRet = pFrame->CallCallback( SALEVENT_KEYMODCHANGE, &aModEvt ); @@ -2740,7 +2740,7 @@ static long ImplHandleKeyMsg( HWND hWnd, { nSVCode = ImplSalGetKeyCode( pFrame, nMP1, nMP2 ); nSVCharCode = ImplConvertKey( pFrame, nMP1, nMP2 ); -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 debug_printf("nSVCode %04x nSVCharCode %04x\n",nSVCode,nSVCharCode ); #endif @@ -2777,7 +2777,7 @@ static long ImplHandleKeyMsg( HWND hWnd, aKeyEvt.mnCharCode = nSVCharCode; aKeyEvt.mnRepeat = nRepeat; -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 debug_printf( (nFlags & KC_KEYUP) ? "SALEVENT_KEYUP\n" : "SALEVENT_KEYINPUT\n"); #endif nRet = pFrame->CallCallback( (nFlags & KC_KEYUP) ? SALEVENT_KEYUP : SALEVENT_KEYINPUT, @@ -2914,7 +2914,7 @@ static void UpdateFrameGeometry( HWND hWnd, Os2SalFrame* pFrame ) // clamp to zero pFrame->maGeometry.nHeight = nHeight < 0 ? 0 : nHeight; pFrame->maGeometry.nWidth = nWidth < 0 ? 0 : nWidth; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "UpdateFrameGeometry: hwnd %x, frame %x at %d,%d (%dx%d)\n", hWnd, pFrame->mhWndFrame, pFrame->maGeometry.nX, pFrame->maGeometry.nY, @@ -3369,7 +3369,7 @@ MRESULT EXPENTRY SalFrameWndProc( HWND hWnd, ULONG nMsg, BOOL bDef = TRUE; bool bCheckTimers= false; -#if OSL_DEBUG_LEVEL>10 +#if OSL_DEBUG_LEVEL > 1 if (nMsg!=WM_TIMER && nMsg!=WM_MOUSEMOVE) debug_printf( "SalFrameWndProc hWnd 0x%x nMsg 0x%x\n", hWnd, nMsg); #endif diff --git a/vcl/os2/source/window/salobj.cxx b/vcl/os2/source/window/salobj.cxx index 0827f0de9a14..6efe7163a466 100644 --- a/vcl/os2/source/window/salobj.cxx +++ b/vcl/os2/source/window/salobj.cxx @@ -99,7 +99,7 @@ MRESULT EXPENTRY SalSysObjWndProc( HWND hWnd, ULONG nMsg, MRESULT nRet = 0; int bDef = TRUE; -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 1 debug_printf( "SalSysObjWndProc hWnd 0x%x nMsg %d\n", hWnd, nMsg); #endif |