diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2013-05-02 02:05:46 +1000 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-02 06:55:31 +0000 |
| commit | af41ad9b9473b782b50828b7e77ff23f30007c60 (patch) | |
| tree | 9a02de8aff370300d0968a99050a7462b17d2b08 /cppcanvas | |
| parent | bdf1731fbb526adc276286c8eede5ec3ed4662bd (diff) | |
Convert from EMFP_DEBUG to SAL_INFO
* Change to SAL_INFO instead of EMFP_DEBUG in implrenderer.cxx
* Add new log area cppcanvas.emf
* Update comment in log.hxx to reference the new location of log-areas.dox
Change-Id: I5d710725339f58a111a2f3494c3a72f685624322
Reviewed-on: https://gerrit.libreoffice.org/3726
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 6d355a81aebb..635a5fb3e440 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -81,12 +81,6 @@ #include "outdevstate.hxx" #include <basegfx/matrix/b2dhommatrixtools.hxx> -#if OSL_DEBUG_LEVEL > 1 -#define EMFP_DEBUG(x) x -#else -#define EMFP_DEBUG(x) -#endif - using namespace ::com::sun::star; @@ -1326,7 +1320,7 @@ namespace cppcanvas // - SetFont to process font metric specific actions pCurrAct->Execute( &rVDev ); - EMFP_DEBUG(printf("MTF\trecord type: 0x%x (%d)\n", pCurrAct->GetType(), pCurrAct->GetType())); + SAL_INFO("cppcanvas.emf", "MTF\trecord type: 0x" << pCurrAct->GetType() << " (" << pCurrAct->GetType() << ")"); switch( pCurrAct->GetType() ) { @@ -1834,22 +1828,22 @@ namespace cppcanvas count = 0; if (char *env = getenv ("EMF_PLUS_LIMIT")) { limit = atoi (env); - EMFP_DEBUG (printf ("EMF+ records limit: %d\n", limit)); + SAL_INFO ("cppcanvas.emf", "EMF+ records limit: " << limit); } } - EMFP_DEBUG (printf ("EMF+ passed to canvas mtf renderer, size: %u\n", (unsigned int)pAct->GetDataSize ())); + SAL_INFO ("cppcanvas.emf", "EMF+ passed to canvas mtf renderer, size: " << pAct->GetDataSize ()); if (count < limit) processEMFPlus( pAct, rFactoryParms, rStates.getState(), rCanvas ); count ++; } else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS_HEADER_INFO")) ) { - EMFP_DEBUG (printf ("EMF+ passed to canvas mtf renderer - header info, size: %u\n", (unsigned int)pAct->GetDataSize ())); + SAL_INFO ("cppcanvas.emf", "EMF+ passed to canvas mtf renderer - header info, size: " << pAct->GetDataSize ()); SvMemoryStream rMF ((void*) pAct->GetData (), pAct->GetDataSize (), STREAM_READ); rMF >> nFrameLeft >> nFrameTop >> nFrameRight >> nFrameBottom; - EMFP_DEBUG (printf ("EMF+ picture frame: %d,%d - %d,%d\n", (int)nFrameLeft, (int)nFrameTop, (int)nFrameRight, (int)nFrameBottom)); + SAL_INFO ("cppcanvas.emf", "EMF+ picture frame: " << nFrameLeft << "," << nFrameTop << " - " << nFrameRight << "," << nFrameBottom); rMF >> nPixX >> nPixY >> nMmX >> nMmY; - EMFP_DEBUG (printf ("EMF+ ref device pixel size: %dx%d mm size: %dx%d\n", (int)nPixX, (int)nPixY, (int)nMmX, (int)nMmY)); + SAL_INFO ("cppcanvas.emf", "EMF+ ref device pixel size: " << nPixX << "x" << nPixY << " mm size: " << nMmX << "x" << nMmY); rMF >> aBaseTransform; //aWorldTransform.Set (aBaseTransform); |