Attachment #69065 for issue #111080

View | Details | Raw Unified | Return to issue 111080
Collapse All | Expand All




        
        cairo_set_font_matrix(pSCairo.get(), &m);
        
#if OSL_DEBUG_LEVEL > 0        
        if( cairo_glyphs.size() > 2 )
            OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s", 
                      aFont.GetWidth(),
                      aFont.GetHeight(),
                      aMetric.GetWidth(),
                      nWidth,
                      (int) rOutpos.X(),
                      (int) rOutpos.Y(),
                      cairo_glyphs[0].index, cairo_glyphs[1].index, cairo_glyphs[2].index, 
                      maLogicalAdvancements.getLength() ? "ADV " : "",
                      aSysLayoutData.aSysFontData.bAntialias ? "AA " : "",
                      aSysLayoutData.aSysFontData.bFakeBold ? "FB " : "",
                      aSysLayoutData.aSysFontData.bFakeItalic ? "FI " : "",
#if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1)
                      ::rtl::OUStringToOString( reinterpret_cast<const sal_Unicode*> (logfont.lfFaceName), RTL_TEXTENCODING_UTF8 ).getStr(),
#else
                      ::rtl::OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr(),
#endif
                      ::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),
                                                RTL_TEXTENCODING_UTF8 ).getStr()
                );
#endif
        
        cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size());
        

Lines 706-712 Link Here

(-)a/canvas/source/vcl/canvashelper_texturefill.cxx (-2 / +2 lines)
706	::basegfx::B2DRectangle aTextureDeviceRect;	706	::basegfx::B2DRectangle aTextureDeviceRect;
707	::canvas::tools::calcTransformedRectBounds( aTextureDeviceRect,	707	::canvas::tools::calcTransformedRectBounds( aTextureDeviceRect,
708	aRect,	708	aRect,
709	aTextureTransform );	709	aTotalTransform );
710	rOutDev.SetLineColor( COL_RED );	710	rOutDev.SetLineColor( COL_RED );
711	rOutDev.SetFillColor();	711	rOutDev.SetFillColor();
712	rOutDev.DrawRect( ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) );	712	rOutDev.DrawRect( ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) );
Lines 715-721 Link Here
715	::Polygon aPoly1(	715	::Polygon aPoly1(
716	::vcl::unotools::rectangleFromB2DRectangle( aRect ));	716	::vcl::unotools::rectangleFromB2DRectangle( aRect ));
717	::basegfx::B2DPolygon aPoly2( aPoly1.getB2DPolygon() );	717	::basegfx::B2DPolygon aPoly2( aPoly1.getB2DPolygon() );
718	aPoly2.transform( aTextureTransform );	718	aPoly2.transform( aTotalTransform );
719	::Polygon aPoly3( aPoly2 );	719	::Polygon aPoly3( aPoly2 );
720	rOutDev.DrawPolygon( aPoly3 );	720	rOutDev.DrawPolygon( aPoly3 );
721	}	721	}

Lines 307-313 Link Here

(-)a/slideshow/source/engine/debug.cxx (-1 / +1 lines)
307	va_start(args, sFormat);	307	va_start(args, sFormat);
308		308
309	msMessage[mnBufferSize-1] = 0;	309	msMessage[mnBufferSize-1] = 0;
310	_vsnprintf(msMessage, mnBufferSize-1, sFormat, args);	310	snprintf(msMessage, mnBufferSize-1, sFormat, args);
311	TRACE_BEGIN("[ %s", msMessage);	311	TRACE_BEGIN("[ %s", msMessage);
312	va_end(args);	312	va_end(args);
313	}	313	}

Return to issue 111080

Lines 536-561 Link Here

(-)a/canvas/source/cairo/cairo_textlayout.cxx (-17 / +20 lines)
536		536
537	cairo_set_font_matrix(pSCairo.get(), &m);	537	cairo_set_font_matrix(pSCairo.get(), &m);
538		538
539	OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s \|\| Name:%s - %s",	539	#if OSL_DEBUG_LEVEL > 0
540	aFont.GetWidth(),	540	if( cairo_glyphs.size() > 2 )
541	aFont.GetHeight(),	541	OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s \|\| Name:%s - %s",
542	aMetric.GetWidth(),	542	aFont.GetWidth(),
543	nWidth,	543	aFont.GetHeight(),
544	(int) rOutpos.X(),	544	aMetric.GetWidth(),
545	(int) rOutpos.Y(),	545	nWidth,
546	cairo_glyphs[0].index, cairo_glyphs[1].index, cairo_glyphs[2].index,	546	(int) rOutpos.X(),
547	maLogicalAdvancements.getLength() ? "ADV " : "",	547	(int) rOutpos.Y(),
548	aSysLayoutData.aSysFontData.bAntialias ? "AA " : "",	548	cairo_glyphs[0].index, cairo_glyphs[1].index, cairo_glyphs[2].index,
549	aSysLayoutData.aSysFontData.bFakeBold ? "FB " : "",	549	maLogicalAdvancements.getLength() ? "ADV " : "",
550	aSysLayoutData.aSysFontData.bFakeItalic ? "FI " : "",	550	aSysLayoutData.aSysFontData.bAntialias ? "AA " : "",
		551	aSysLayoutData.aSysFontData.bFakeBold ? "FB " : "",
		552	aSysLayoutData.aSysFontData.bFakeItalic ? "FI " : "",
551	#if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1)	553	#if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1)
552	::rtl::OUStringToOString( reinterpret_cast<const sal_Unicode*> (logfont.lfFaceName), RTL_TEXTENCODING_UTF8 ).getStr(),	554	::rtl::OUStringToOString( reinterpret_cast<const sal_Unicode*> (logfont.lfFaceName), RTL_TEXTENCODING_UTF8 ).getStr(),
553	#else	555	#else
554	::rtl::OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr(),	556	::rtl::OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr(),
555	#endif	557	#endif
556	::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),	558	::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),
557	RTL_TEXTENCODING_UTF8 ).getStr()	559	RTL_TEXTENCODING_UTF8 ).getStr()
558	);	560	);
		561	#endif
559		562
560	cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size());	563	cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size());
561		564