diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-06-21 03:12:12 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-06-21 03:13:32 +0200 |
commit | 0c1767d9466adf0729eb8e1f43ddb80a31886898 (patch) | |
tree | 13c151dded86fa13bd19ded4c67f6e4f16c23b29 | |
parent | f9b46bbd2446a6c9a0aaab31016536bda4a77294 (diff) |
vcl: fix dbglevel>1 build
Change-Id: I94c35499d395d10a86a821a28e57ad3c1d8ec485
-rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/app/randrwrapper.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/glyphs/graphite_serverfont.cxx | 7 | ||||
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 2 |
5 files changed, 6 insertions, 13 deletions
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index a67e58998e7c..585f891b4853 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -511,12 +511,6 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles ) } } -#if OSL_DEBUG_LEVEL > 1 - char pBuf[ 128 ]; - fprintf( stderr, "selected inputmethod style = %s\n", - GetMethodName(mnPreeditStyle | mnStatusStyle, pBuf, sizeof(pBuf)) ); -#endif - return (mnPreeditStyle != 0) && (mnStatusStyle != 0) ; } diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx index 54b822f2871f..0ae4027adf1e 100644 --- a/vcl/unx/generic/app/randrwrapper.cxx +++ b/vcl/unx/generic/app/randrwrapper.cxx @@ -169,7 +169,7 @@ void SalDisplay::processRandREvent( XEvent* pEvent ) pWrapper->XRRFreeScreenConfigInfo( pConfig ); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "screen %d changed to size %dx%d\n", (int)i, (int)pTargetSize->width, (int)pTargetSize->height ); + fprintf( stderr, "screen %d changed to size %dx%d\n", (int)nId, (int)pTargetSize->width, (int)pTargetSize->height ); #endif } } diff --git a/vcl/unx/generic/glyphs/graphite_serverfont.cxx b/vcl/unx/generic/glyphs/graphite_serverfont.cxx index d2126b05f377..f07ce7082766 100644 --- a/vcl/unx/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/unx/generic/glyphs/graphite_serverfont.cxx @@ -69,7 +69,7 @@ GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) thro rServerFont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 ); #ifdef DEBUG printf("GraphiteServerFontLayout %lx %s size %d %f\n", (long unsigned int)this, name.getStr(), - rServerFont.GetMetricsFT().x_ppem, + rServerFont.GetFtFace()->size->metrics.x_ppem, rServerFont.GetFontSelData().mfExactHeight); #endif sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; @@ -80,15 +80,14 @@ GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) thro rServerFont.GetGraphiteFace()->face(), aFeat, aLang); #ifdef DEBUG if (mpFeatures) - printf("GraphiteServerFontLayout %s/%s/%s %x language %d features %d errors\n", + printf("GraphiteServerFontLayout %s/%s/%s %x language\n", OUStringToOString( rServerFont.GetFontSelData().GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), OUStringToOString( rServerFont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 ).getStr(), OUStringToOString( rServerFont.GetFontSelData().maSearchName, RTL_TEXTENCODING_UTF8 ).getStr(), - rServerFont.GetFontSelData().meLanguage, - (int)mpFeatures->numFeatures(), mpFeatures->parseErrors()); + rServerFont.GetFontSelData().meLanguage); #endif } else diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 2da3bf90e4fc..6f000e442f5f 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -670,7 +670,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi " option " << pOptions[n].name << "=" << pOptions[n].value); #if OSL_DEBUG_LEVEL > 1 OString aCmd( "cp " ); - aCmd = aCmd + files.front(); + aCmd = aCmd + it->second.getStr(); aCmd = aCmd + OString( " $HOME/cupsprint.ps" ); system( aCmd.getStr() ); #endif diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index be9149c09dc5..5e08f42f4aaf 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -1156,7 +1156,7 @@ void SystemQueueInfo::run() OStringBuffer aCmdLine( 128 ); aCmdLine.append( rParm.pQueueCommand ); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "trying print queue command \"%s\" ... ", aParms[i].pQueueCommand ); + fprintf( stderr, "trying print queue command \"%s\" ... ", rParm.pQueueCommand ); #endif aCmdLine.append( " 2>/dev/null" ); FILE *pPipe; |