diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:54 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:54 +0200 |
| commit | ec6c98105a95bd5ddcd74b30fe51df8434c27fbd (patch) | |
| tree | fcb9f35a6d4a4d4450358a1515bf792788e3c3d1 /vcl/unx/generic/printer/ppdparser.cxx | |
| parent | da94363ed7a895fe39cee8d9b762966ebbee50ef (diff) | |
| parent | dd8d3fff260af37f152b3b6f0b8bcba2467a17fd (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
svtools/source/filter/wmf/winmtf.hxx
tools/source/fsys/urlobj.cxx
unotools/source/config/configmgr.cxx
unotools/source/config/makefile.mk
vcl/inc/vcl/cursor.hxx
vcl/source/gdi/outdevnative.cxx
vcl/source/window/abstdlg.cxx
vcl/source/window/toolbox.cxx
vcl/unx/generic/printer/ppdparser.cxx
vcl/unx/generic/printer/printerinfomanager.cxx
Diffstat (limited to 'vcl/unx/generic/printer/ppdparser.cxx')
| -rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 06b0091d4670..3246e18fc806 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -501,7 +501,7 @@ void PPDParser::initPPDFiles() INetURLObject aDir( aExe ); aDir.removeSegment(); #ifdef DEBUG - fprintf( stderr, "scanning last chance dir: %s\n", OUStringToOString( aDir.GetMainURL( INetURLObject::NO_DECODE ), osl_getThreadTextEncoding() ).getStr() ); + fprintf( stderr, "scanning last chance dir: %s\n", rtl::OUStringToOString( aDir.GetMainURL( INetURLObject::NO_DECODE ), osl_getThreadTextEncoding() ).getStr() ); #endif scanPPDDir( aDir.GetMainURL( INetURLObject::NO_DECODE ) ); #ifdef DEBUG |