summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vcl/osx/documentfocuslistener.cxx4
-rw-r--r--vcl/qa/cppunit/canvasbitmaptest.cxx4
-rw-r--r--vcl/quartz/salbmp.cxx2
-rw-r--r--vcl/source/app/svapp.cxx2
-rw-r--r--vcl/source/control/quickselectionengine.cxx4
-rw-r--r--vcl/source/control/tabctrl.cxx2
-rw-r--r--vcl/source/gdi/bitmapex.cxx2
-rw-r--r--vcl/source/gdi/configsettings.cxx9
-rw-r--r--vcl/source/gdi/gdimtf.cxx9
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx6
-rw-r--r--vcl/source/gdi/pngread.cxx2
-rw-r--r--vcl/source/gdi/textlayout.cxx2
-rw-r--r--vcl/source/window/dndeventdispatcher.cxx8
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx2
-rw-r--r--vcl/unx/generic/print/genprnpsp.cxx12
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx14
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx36
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx83
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx3
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.cxx2
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx14
21 files changed, 77 insertions, 145 deletions
diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx
index 9009511a63a5..de9ebaa64587 100644
--- a/vcl/osx/documentfocuslistener.cxx
+++ b/vcl/osx/documentfocuslistener.cxx
@@ -78,7 +78,7 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
detachRecursive(xAccessible);
attachRecursive(xAccessible);
}
- OSL_TRACE( "Invalidate all children called\n" );
+ SAL_WARN("vcl", "Invalidate all children called" );
break;
default:
@@ -87,7 +87,7 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
}
catch (const IndexOutOfBoundsException&)
{
- OSL_TRACE("Focused object has invalid index in parent");
+ SAL_WARN("vcl", "Focused object has invalid index in parent");
}
}
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 7198b097ebc1..e8c6b21a9ac2 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -82,8 +82,8 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp,
const char* msg,
int nOriginalDepth )
{
- OSL_TRACE("-------------------------");
- OSL_TRACE("Testing %s, with depth %d", msg, nOriginalDepth);
+ SAL_INFO("vcl", "-------------------------");
+ SAL_INFO("vcl", "Testing " << msg << ", with depth " << nOriginalDepth);
BitmapEx aContainedBmpEx( xBmp->getBitmapEx() );
Bitmap aContainedBmp( aContainedBmpEx.GetBitmap() );
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 86c4dabd4f05..dc9b6834586d 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -994,7 +994,7 @@ bool QuartzSalBitmap::GetSystemData( BitmapSystemData& rData )
/**
* We need to hack things because VCL does not use kCGBitmapByteOrder32Host, while Cairo requires it.
*/
- OSL_TRACE("QuartzSalBitmap::%s(): kCGBitmapByteOrder32Host not found => inserting it.",__func__);
+ SAL_INFO("vcl.cg", "QuartzSalBitmap::" << __func__ << "(): kCGBitmapByteOrder32Host not found => inserting it.");
CGImageRef xImage = CGBitmapContextCreateImage (mxGraphicContext);
SAL_INFO("vcl.cg", "CGBitmapContextCreateImage(" << mxGraphicContext << ") = " << xImage );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index af80c7cb3b58..7b06b5dde778 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1662,7 +1662,7 @@ void Application::ShowNativeErrorBox(const OUString& sTitle ,
sTitle,
sMessage);
if (btn != SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK) {
- OSL_TRACE("ShowNativeMessageBox returned %d", btn);
+ SAL_WARN( "vcl", "ShowNativeMessageBox returned " << btn);
}
}
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index e4769505c128..3bd15743cf01 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -118,7 +118,7 @@ namespace vcl
if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() )
{
m_pData->sCurrentSearchString += OUStringLiteral1(c);
- OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", OUStringToOString(m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8).getStr() );
+ SAL_INFO( "vcl", "QuickSelectionEngine::HandleKeyEvent: searching for " << m_pData->sCurrentSearchString );
if ( m_pData->sCurrentSearchString.getLength() == 1 )
{ // first character in the search -> remember
@@ -134,7 +134,7 @@ namespace vcl
OUString aSearchTemp( m_pData->sCurrentSearchString );
StringEntryIdentifier pMatchingEntry = findMatchingEntry( aSearchTemp, *m_pData );
- OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: found %p", pMatchingEntry );
+ SAL_INFO( "vcl", "QuickSelectionEngine::HandleKeyEvent: found " << pMatchingEntry );
if ( !pMatchingEntry && (aSearchTemp.getLength() > 1) && !!m_pData->aSingleSearchChar )
{
// if there's only one letter in the search string, use a different search mode
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index d9d9bcb61866..f570721551c8 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -178,7 +178,7 @@ TabControl::TabControl( vcl::Window* pParent, WinBits nStyle ) :
Control( WINDOW_TABCONTROL )
{
ImplInit( pParent, nStyle );
- OSL_TRACE("*** TABCONTROL no notabs? %s", ( GetStyle() & WB_NOBORDER ) ? "true" : "false" );
+ SAL_INFO( "vcl", "*** TABCONTROL no notabs? " << (( GetStyle() & WB_NOBORDER ) ? "true" : "false") );
}
TabControl::~TabControl()
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 1a67c6952d10..efd1ad5ca6f1 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -146,7 +146,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) :
// Ensure a mask is exactly one bit deep
if( !!aMask && aMask.GetBitCount() != 1 )
{
- OSL_TRACE("BitmapEx: forced mask to monochrome");
+ SAL_WARN( "vcl", "BitmapEx: forced mask to monochrome");
aMask.ImplMakeMono( 255 );
}
}
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index 27cc888fd30b..3e0497d81b4b 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -95,9 +95,7 @@ void SettingsConfigItem::getValues()
for( int j = 0; j < aNames.getLength(); j++ )
{
#if OSL_DEBUG_LEVEL > 2
- OSL_TRACE( "found settings data for \"%s\"\n",
- OUStringToOString( aNames.getConstArray()[j], RTL_TEXTENCODING_ASCII_US ).getStr()
- );
+ SAL_INFO( "vcl", "found settings data for " << aNames.getConstArray()[j] );
#endif
OUString aKeyName( aNames.getConstArray()[j] );
Sequence< OUString > aKeys( GetNodeNames( aKeyName ) );
@@ -117,10 +115,7 @@ void SettingsConfigItem::getValues()
if( !pLine->isEmpty() )
m_aSettings[ aKeyName ][ pFrom[i] ] = *pLine;
#if OSL_DEBUG_LEVEL > 2
- OSL_TRACE( " \"%s\"=\"%.30s\"\n",
- OUStringToOString( aKeys.getConstArray()[i], RTL_TEXTENCODING_ASCII_US ).getStr(),
- OUStringToOString( *pLine, RTL_TEXTENCODING_ASCII_US ).getStr()
- );
+ SAL_INFO( "vcl", " \"" << aKeys.getConstArray()[i] << "\"=\"" << *pLine << "\"\n" );
#endif
}
}
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index fed6aa7969b3..3ecd02cc6af8 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -347,7 +347,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
pOut->SetLayoutMode( ComplexTextLayoutFlags::Default );
pOut->SetDigitLanguage( 0 );
- OSL_TRACE("GDIMetaFile::Play on device of size: %ld x %ld", pOut->GetOutputSizePixel().Width(), pOut->GetOutputSizePixel().Height());
+ SAL_INFO( "vcl", "GDIMetaFile::Play on device of size: " << pOut->GetOutputSizePixel().Width() << " " << pOut->GetOutputSizePixel().Height());
if( !ImplPlayWithRenderer( pOut, Point(0,0), pOut->GetOutputSize() ) ) {
size_t i = 0;
@@ -2756,10 +2756,9 @@ SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile )
#ifdef DEBUG
if( !bNoSVM1 && rOStm.GetVersion() < SOFFICE_FILEFORMAT_50 )
{
-OSL_TRACE( \
-"GDIMetaFile would normally be written in old SVM1 format by this call. \
-The current implementation always writes in VCLMTF format. \
-Please set environment variable SAL_ENABLE_SVM1 to '1' to reenable old behavior" );
+ SAL_WARN( "vcl", "GDIMetaFile would normally be written in old SVM1 format by this call. "
+ "The current implementation always writes in VCLMTF format. "
+ "Please set environment variable SAL_ENABLE_SVM1 to '1' to reenable old behavior" );
}
#endif // DEBUG
}
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index e7feb6ba99a3..84e0ed4443ba 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -851,7 +851,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
case( MetaActionType::MASKSCALE ):
case( MetaActionType::MASKSCALEPART ):
{
- OSL_TRACE( "MetaMask...Action not supported yet" );
+ SAL_WARN( "vcl", "MetaMask...Action not supported yet" );
}
break;
@@ -1071,7 +1071,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
if( !bAssertionFired )
{
bAssertionFired = true;
- OSL_TRACE( "PDFExport::ImplWriteActions: deprecated and unsupported MetaAction encountered" );
+ SAL_WARN( "vcl", "PDFExport::ImplWriteActions: deprecated and unsupported MetaAction encountered " << (int)nType );
}
break;
}
@@ -1111,7 +1111,7 @@ public:
sTransporters.erase( maID );
if( maUDigest )
rtl_digest_destroyMD5( maUDigest );
- OSL_TRACE( "EncHashTransporter freed" );
+ SAL_INFO( "vcl", "EncHashTransporter freed" );
}
rtlDigest getUDigest() const { return maUDigest; };
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index f7ea29e23e19..e058dbc4c3a1 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -625,7 +625,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
}
if( aPreviewSize.Width() < maOrigSize.Width() && aPreviewSize.Height() < maOrigSize.Height() ) {
- OSL_TRACE("preview size %ldx%ld", aPreviewSize.Width(), aPreviewSize.Height() );
+ SAL_INFO( "vcl", "preview size " << aPreviewSize.Width() << " " << aPreviewSize.Height() );
for( int i = 1; i < 5; ++i )
{
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index ad11dee6f397..0c37fe73720b 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -184,7 +184,7 @@ namespace vcl
aTrace.append( ", " );
}
aTrace.append( ")" );
- OSL_TRACE( "%s", aTrace.makeStringAndClear().getStr() );
+ SAL_INFO( "vcl", aTrace.makeStringAndClear() );
}
#endif
return nTextWidth;
diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx
index 2772c02a0d6c..c9c5aa607463 100644
--- a/vcl/source/window/dndeventdispatcher.cxx
+++ b/vcl/source/window/dndeventdispatcher.cxx
@@ -112,7 +112,7 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde )
// reject drop if no listeners found
if( nListeners == 0 ) {
- OSL_TRACE( "rejecting drop due to missing listeners." );
+ SAL_WARN( "vcl", "rejecting drop due to missing listeners." );
dtde.Context->rejectDrop();
}
@@ -139,7 +139,7 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd
// reject drag if no listener found
if( nListeners == 0 ) {
- OSL_TRACE( "rejecting drag enter due to missing listeners." );
+ SAL_WARN( "vcl", "rejecting drag enter due to missing listeners." );
dtdee.Context->rejectDrag();
}
@@ -189,7 +189,7 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde )
// reject drag if no listener found
if( nListeners == 0 )
{
- OSL_TRACE( "rejecting drag over due to missing listeners." );
+ SAL_WARN( "vcl", "rejecting drag over due to missing listeners." );
dtde.Context->rejectDrag();
}
}
@@ -226,7 +226,7 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent&
// reject drag if no listener found
if( nListeners == 0 )
{
- OSL_TRACE( "rejecting dropActionChanged due to missing listeners." );
+ SAL_WARN( "vcl", "rejecting dropActionChanged due to missing listeners." );
dtde.Context->rejectDrag();
}
}
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index cfb96ea58c2f..915ff3728c03 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -311,7 +311,7 @@ void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // cons
const SalDisplay *pDisplay = GetDisplay();
if (!pDisplay)
{
- OSL_TRACE("Null display");
+ SAL_WARN( "vcl", "Null display");
rDPIX = rDPIY = 96;
return;
}
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 73ac6664c89a..460247a60fca 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -874,7 +874,7 @@ bool PspSalPrinter::StartJob(
bool bDirect,
ImplJobSetup* pJobSetup )
{
- OSL_TRACE("PspSalPrinter::StartJob");
+ SAL_INFO( "vcl", "PspSalPrinter::StartJob");
GetSalData()->m_pInstance->jobStartedPrinterUpdate();
m_bPdf = false;
if (pFileName)
@@ -931,7 +931,7 @@ bool PspSalPrinter::EndJob()
else
{
bSuccess = m_aPrintJob.EndJob();
- OSL_TRACE("PspSalPrinter::EndJob %d", bSuccess);
+ SAL_INFO( "vcl", "PspSalPrinter::EndJob " << bSuccess);
if( bSuccess && m_bPdf )
{
@@ -945,7 +945,7 @@ bool PspSalPrinter::EndJob()
SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, bool )
{
- OSL_TRACE("PspSalPrinter::StartPage");
+ SAL_INFO( "vcl", "PspSalPrinter::StartPage");
JobData::constructFromStreamBuffer( pJobSetup->GetDriverData(), pJobSetup->GetDriverDataLen(), m_aJobData );
m_pGraphics = GetGenericInstance()->CreatePrintGraphics();
@@ -969,7 +969,7 @@ void PspSalPrinter::EndPage()
{
m_aPrintJob.EndPage();
m_aPrinterGfx.Clear();
- OSL_TRACE("PspSalPrinter::EndPage");
+ SAL_INFO( "vcl", "PspSalPrinter::EndPage");
}
sal_uLong PspSalPrinter::GetErrorCode()
@@ -1016,7 +1016,7 @@ struct PDFPrintFile
bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName,
ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController )
{
- OSL_TRACE( "StartJob with controller: pFilename = %s", i_pFileName ? OUStringToOString( *i_pFileName, RTL_TEXTENCODING_UTF8 ).getStr() : "<nil>" );
+ SAL_INFO( "vcl", "StartJob with controller: pFilename = " << (i_pFileName ? *i_pFileName : "<nil>") );
// mark for endjob
m_bIsPDFWriterJob = true;
// reset IsLastPage
@@ -1259,7 +1259,7 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo
for(PDFPrintFile & rPDFFile : aPDFFiles)
{
osl_removeFile( rPDFFile.maTmpURL.pData );
- OSL_TRACE( "removed print PDF file %s", OUStringToOString( rPDFFile.maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO( "vcl", "removed print PDF file " << rPDFFile.maTmpURL );
}
}
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 3a8ef05bea2f..cc661fb839b9 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -540,13 +540,11 @@ void CUPSManager::setupJobContextData( JobData& rData )
FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand )
{
- OSL_TRACE( "startSpool: %s, %s",
- OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(),
- bQuickCommand ? "true" : "false" );
+ SAL_INFO( "vcl", "startSpool: " << rPrintername << " " << (bQuickCommand ? "true" : "false") );
if( m_aCUPSDestMap.find( rPrintername ) == m_aCUPSDestMap.end() )
{
- OSL_TRACE( "defer to PrinterInfoManager::startSpool" );
+ SAL_INFO( "vcl", "defer to PrinterInfoManager::startSpool" );
return PrinterInfoManager::startSpool( rPrintername, bQuickCommand );
}
@@ -619,11 +617,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner
bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber )
{
- OSL_TRACE( "endSpool: %s, %s, copy count = %d",
- OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(),
- OUStringToOString( rJobTitle, RTL_TEXTENCODING_UTF8 ).getStr(),
- rDocumentJobData.m_nCopies
- );
+ SAL_INFO( "vcl", "endSpool: " << rPrintername << "," << rJobTitle << " copy count = " << rDocumentJobData.m_nCopies );
int nJobID = 0;
@@ -633,7 +627,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi
m_aCUPSDestMap.find( rPrintername );
if( dest_it == m_aCUPSDestMap.end() )
{
- OSL_TRACE( "defer to PrinterInfoManager::endSpool" );
+ SAL_INFO( "vcl", "defer to PrinterInfoManager::endSpool" );
return PrinterInfoManager::endSpool( rPrintername, rJobTitle, pFile, rDocumentJobData, bBanner, rFaxNumber );
}
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 817db94ad9a5..72d7cfa297f7 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -717,56 +717,40 @@ PPDParser::PPDParser( const OUString& rFile ) :
if( m_pImageableAreas )
m_pDefaultImageableArea = m_pImageableAreas->getDefaultValue();
if (m_pImageableAreas == nullptr) {
- OSL_TRACE(
- "Warning: no ImageableArea in %s\n",
- OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN( "vcl", "no ImageableArea in " << m_aFile);
}
if (m_pDefaultImageableArea == nullptr) {
- OSL_TRACE(
- "Warning: no DefaultImageableArea in %s\n",
- OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN( "vcl", "no DefaultImageableArea in " << m_aFile);
}
m_pPaperDimensions = getKey( OUString( "PaperDimension" ) );
if( m_pPaperDimensions )
m_pDefaultPaperDimension = m_pPaperDimensions->getDefaultValue();
if (m_pPaperDimensions == nullptr) {
- OSL_TRACE(
- "Warning: no PaperDimensions in %s\n",
- OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN( "vcl", "no PaperDimensions in " << m_aFile);
}
if (m_pDefaultPaperDimension == nullptr) {
- OSL_TRACE(
- "Warning: no DefaultPaperDimensions in %s\n",
- OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN( "vcl", "no DefaultPaperDimensions in " << m_aFile);
}
m_pResolutions = getKey( OUString( "Resolution" ) );
if( m_pResolutions )
m_pDefaultResolution = m_pResolutions->getDefaultValue();
if (m_pResolutions == nullptr) {
- OSL_TRACE(
- "Warning: no Resolution in %s\n",
- OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN( "vcl", "no Resolution in " << m_aFile);
}
if (m_pDefaultResolution == nullptr) {
- OSL_TRACE(
- "Warning: no DefaultResolution in %s\n",
- OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN( "vcl", "no DefaultResolution in " + m_aFile);
}
m_pInputSlots = getKey( OUString( "InputSlot" ) );
if( m_pInputSlots )
m_pDefaultInputSlot = m_pInputSlots->getDefaultValue();
if (m_pInputSlots == nullptr) {
- OSL_TRACE(
- "Warning: no InputSlot in %s\n",
- OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN( "vcl", "no InputSlot in " << m_aFile);
}
if (m_pDefaultInputSlot == nullptr) {
- OSL_TRACE(
- "Warning: no DefaultInputSlot in %s\n",
- OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN( "vcl", "no DefaultInputSlot in " << m_aFile);
}
m_pDuplexTypes = getKey( OUString( "Duplex" ) );
@@ -775,9 +759,7 @@ PPDParser::PPDParser( const OUString& rFile ) :
m_pFontList = getKey( OUString( "Font" ) );
if (m_pFontList == nullptr) {
- OSL_TRACE(
- "Warning: no Font in %s\n",
- OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN( "vcl", "no Font in " << m_aFile);
}
// fill in direct values
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index e6633e803eed..7d122b1d02aa 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -152,8 +152,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
setLabel( CHECKBOX_##elem, aLabel ); \
break
- switch( i ) {
-
+ switch( i ) {
LABEL_TOGGLE( AUTOEXTENSION );
LABEL_TOGGLE( PASSWORD );
LABEL_TOGGLE( FILTEROPTIONS );
@@ -161,9 +160,9 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
LABEL_TOGGLE( LINK );
LABEL_TOGGLE( PREVIEW );
LABEL_TOGGLE( SELECTION );
- default:
- OSL_TRACE("Handle unknown control %d", i);
- break;
+ default:
+ SAL_WARN( "vcl", "Handle unknown control " << i);
+ break;
}
gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], false, false, 0 );
@@ -198,7 +197,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
LABEL_LIST( TEMPLATE );
LABEL_LIST( IMAGE_TEMPLATE );
default:
- OSL_TRACE("Handle unknown control %d", i);
+ SAL_WARN( "vcl", "Handle unknown control " << i);
break;
}
@@ -303,19 +302,16 @@ void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<X
void SalGtkFilePicker::impl_fileSelectionChanged( const FilePickerEvent& aEvent )
{
- OSL_TRACE( "file selection changed");
if (m_xListener.is()) m_xListener->fileSelectionChanged( aEvent );
}
void SalGtkFilePicker::impl_directoryChanged( const FilePickerEvent& aEvent )
{
- OSL_TRACE("directory changed");
if (m_xListener.is()) m_xListener->directoryChanged( aEvent );
}
void SalGtkFilePicker::impl_controlStateChanged( const FilePickerEvent& aEvent )
{
- OSL_TRACE("control state changed");
if (m_xListener.is()) m_xListener->controlStateChanged( aEvent );
}
@@ -552,16 +548,10 @@ void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle )
OSL_ASSERT( m_pDialog != nullptr );
- OSL_TRACE( "Setting current filter to %s\n",
- OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ).getStr() );
-
if( aTitle != m_aCurrentFilter )
{
m_aCurrentFilter = aTitle;
SetCurFilter( m_aCurrentFilter );
- OSL_TRACE( "REALLY Setting current filter to %s\n",
- OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ).getStr() );
-
}
// TODO m_pImpl->setCurrentFilter( aTitle );
@@ -617,13 +607,8 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept
OSL_ASSERT( m_pDialog != nullptr );
- OSL_TRACE( "GetCURRENTfilter" );
-
UpdateFilterfromUI();
- OSL_TRACE( "Returning current filter of %s\n",
- OUStringToOString( m_aCurrentFilter, RTL_TEXTENCODING_UTF8 ).getStr() );
-
return m_aCurrentFilter;
}
@@ -741,7 +726,6 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
int nCount = g_slist_length( pPathList );
int nIndex = 0;
- OSL_TRACE( "GETFILES called %d files", nCount );
// get the current action setting
GtkFileChooserAction eAction = gtk_file_chooser_get_action(
@@ -824,9 +808,6 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
sFilterName = m_aInitialFilter;
}
- OSL_TRACE( "2: current filter is %s\n",
- OUStringToOString( sFilterName, RTL_TEXTENCODING_UTF8 ).getStr() );
-
if (m_pFilterList)
{
FilterList::iterator aListIter = ::std::find_if(
@@ -836,9 +817,6 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
if (aListIter != m_pFilterList->end())
aFilter = aListIter->getFilter();
- OSL_TRACE( "turned into %s\n",
- OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr() );
-
nTokenIndex = 0;
OUString sToken;
do
@@ -896,7 +874,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
{
SolarMutexGuard g;
- OSL_TRACE( "1: HERE WE ARE");
OSL_ASSERT( m_pDialog != nullptr );
sal_Int16 retVal = 0;
@@ -1041,7 +1018,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
{
FilePickerEvent evt;
evt.ElementId = PUSHBUTTON_PLAY;
- OSL_TRACE( "filter_changed, isn't it great %p", this);
impl_controlStateChanged( evt );
btn = GTK_RESPONSE_NO;
}
@@ -1065,7 +1041,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
// cf. offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl
GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
{
- OSL_TRACE("control id is %d", nControlId);
GType tType = GTK_TYPE_TOGGLE_BUTTON; //prevent warning by initializing
GtkWidget *pWidget = nullptr;
@@ -1103,7 +1078,7 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
MAP_LIST_LABEL( TEMPLATE );
MAP_LIST_LABEL( IMAGE_TEMPLATE );
default:
- OSL_TRACE("Handle unknown control %d", nControlId);
+ SAL_WARN( "vcl", "Handle unknown control " << nControlId);
break;
}
#undef MAP
@@ -1191,7 +1166,7 @@ void SalGtkFilePicker::HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nContr
}
break;
default:
- OSL_TRACE("undocumented/unimplemented ControlAction for a list");
+ SAL_WARN( "vcl", "undocumented/unimplemented ControlAction for a list " << nControlAction);
break;
}
@@ -1253,7 +1228,7 @@ uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nC
}
break;
default:
- OSL_TRACE("undocumented/unimplemented ControlAction for a list");
+ SAL_WARN( "vcl", "undocumented/unimplemented ControlAction for a list " << nControlAction);
break;
}
return aAny;
@@ -1266,12 +1241,11 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr
OSL_ASSERT( m_pDialog != nullptr );
- OSL_TRACE( "SETTING VALUE %d", nControlAction );
GType tType;
GtkWidget *pWidget;
if( !( pWidget = getWidget( nControlId, &tType ) ) )
- OSL_TRACE("enable unknown control %d", nControlId);
+ SAL_WARN( "vcl", "enable unknown control " << nControlId);
else if( tType == GTK_TYPE_TOGGLE_BUTTON )
{
bool bChecked = false;
@@ -1282,8 +1256,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr
HandleSetListValue(GTK_COMBO_BOX(pWidget), nControlAction, rValue);
else
{
- OSL_TRACE("Can't set value on button / list %d %d\n",
- nControlId, nControlAction);
+ SAL_WARN( "vcl", "Can't set value on button / list " << nControlId << " " << nControlAction );
}
}
@@ -1300,14 +1273,13 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC
GtkWidget *pWidget;
if( !( pWidget = getWidget( nControlId, &tType ) ) )
- OSL_TRACE("enable unknown control %d", nControlId);
+ SAL_WARN( "vcl", "enable unknown control " << nControlId);
else if( tType == GTK_TYPE_TOGGLE_BUTTON )
aRetval <<= bool( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( pWidget ) ) );
else if( tType == GTK_TYPE_COMBO_BOX )
aRetval = HandleGetListValue(GTK_COMBO_BOX(pWidget), nControlAction);
else
- OSL_TRACE("Can't get value on button / list %d %d\n",
- nControlId, nControlAction );
+ SAL_WARN( "vcl", "Can't get value on button / list " << nControlId << " " << nControlAction );
return aRetval;
}
@@ -1325,17 +1297,15 @@ throw( uno::RuntimeException, std::exception )
{
if( bEnable )
{
- OSL_TRACE( "enable" );
gtk_widget_set_sensitive( pWidget, true );
}
else
{
- OSL_TRACE( "disable" );
gtk_widget_set_sensitive( pWidget, false );
}
}
else
- OSL_TRACE("enable unknown control %d", nControlId );
+ SAL_WARN( "vcl", "enable unknown control " << nControlId );
}
void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel )
@@ -1350,7 +1320,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString&
if( !( pWidget = getWidget( nControlId, &tType ) ) )
{
- OSL_TRACE("Set label on unknown control %d", nControlId);
+ SAL_WARN( "vcl", "Set label on unknown control " << nControlId);
return;
}
@@ -1372,7 +1342,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString&
g_object_set( pWidget, "label", aTxt.getStr(),
"use_underline", true, nullptr );
else
- OSL_TRACE("Can't set label on list");
+ SAL_WARN( "vcl", "Can't set label on list");
}
OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
@@ -1387,11 +1357,11 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
GtkWidget *pWidget;
if( !( pWidget = getWidget( nControlId, &tType ) ) )
- OSL_TRACE("Get label on unknown control %d", nControlId);
+ SAL_WARN( "vcl", "Get label on unknown control " << nControlId);
else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
aTxt = gtk_button_get_label( GTK_BUTTON( pWidget ) );
else
- OSL_TRACE("Can't get label on list");
+ SAL_WARN( "vcl", "Can't get label on list");
return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 );
}
@@ -1488,21 +1458,21 @@ void SalGtkFilePicker::filter_changed_cb( GtkFileChooser *, GParamSpec *,
{
FilePickerEvent evt;
evt.ElementId = LISTBOX_FILTER;
- OSL_TRACE( "filter_changed, isn't it great %p", pobjFP );
+ SAL_INFO( "vcl", "filter_changed, isn't it great " << pobjFP );
pobjFP->impl_controlStateChanged( evt );
}
void SalGtkFilePicker::folder_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP )
{
FilePickerEvent evt;
- OSL_TRACE( "folder_changed, isn't it great %p", pobjFP );
+ SAL_INFO( "vcl", "folder_changed, isn't it great " << pobjFP );
pobjFP->impl_directoryChanged( evt );
}
void SalGtkFilePicker::selection_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP )
{
FilePickerEvent evt;
- OSL_TRACE( "selection_changed, isn't it great %p", pobjFP );
+ SAL_INFO( "vcl", "selection_changed, isn't it great " << pobjFP );
pobjFP->impl_fileSelectionChanged( evt );
}
@@ -1615,18 +1585,15 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
case FILEOPEN_SIMPLE:
eAction = GTK_FILE_CHOOSER_ACTION_OPEN;
first_button_text = GTK_STOCK_OPEN;
- OSL_TRACE( "3all true" );
break;
case FILESAVE_SIMPLE:
eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
first_button_text = GTK_STOCK_SAVE;
- OSL_TRACE( "2all true" );
break;
case FILESAVE_AUTOEXTENSION_PASSWORD:
eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
first_button_text = GTK_STOCK_SAVE;
mbToggleVisibility[PASSWORD] = true;
- OSL_TRACE( "1all true" );
// TODO
break;
case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS:
@@ -1634,21 +1601,18 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
first_button_text = GTK_STOCK_SAVE;
mbToggleVisibility[PASSWORD] = true;
mbToggleVisibility[FILTEROPTIONS] = true;
- OSL_TRACE( "4all true" );
// TODO
break;
case FILESAVE_AUTOEXTENSION_SELECTION:
eAction = GTK_FILE_CHOOSER_ACTION_SAVE; // SELECT_FOLDER ?
first_button_text = GTK_STOCK_SAVE;
mbToggleVisibility[SELECTION] = true;
- OSL_TRACE( "5all true" );
// TODO
break;
case FILESAVE_AUTOEXTENSION_TEMPLATE:
eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
first_button_text = GTK_STOCK_SAVE;
mbListVisibility[TEMPLATE] = true;
- OSL_TRACE( "6all true" );
// TODO
break;
case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE:
@@ -1688,7 +1652,6 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
case FILESAVE_AUTOEXTENSION:
eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
first_button_text = GTK_STOCK_SAVE;
- OSL_TRACE( "7all true" );
// TODO
break;
case FILEOPEN_PREVIEW:
@@ -1784,7 +1747,7 @@ void SalGtkFilePicker::SetCurFilter( const OUString& rFilter )
OUString aShrunkName = shrinkFilterName( rFilter );
if( aShrunkName.equals( sFilterName) )
{
- OSL_TRACE( "actually setting %s", filtername );
+ SAL_INFO( "vcl", "actually setting " << filtername );
gtk_file_chooser_set_filter( GTK_FILE_CHOOSER( m_pDialog ), pFilter );
bFound = true;
}
@@ -1855,7 +1818,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
g_strdup( OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ),
g_free );
- OSL_TRACE( "fustering with %s", OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr());
+ SAL_INFO( "vcl", "fustering with " << aToken );
}
#if OSL_DEBUG_LEVEL > 0
else
@@ -1973,7 +1936,7 @@ void SalGtkFilePicker::SetFilters()
else if(!m_aCurrentFilter.isEmpty())
SetCurFilter( m_aCurrentFilter );
- OSL_TRACE( "end setting filters");
+ SAL_INFO( "vcl", "end setting filters");
}
SalGtkFilePicker::~SalGtkFilePicker()
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 1f2e46bb7dab..cedbd5a20f1d 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -77,7 +77,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirector
if( aTxt.endsWith("/") )
aTxt = aTxt.copy( 0, aTxt.getLength() - 1 );
- OSL_TRACE( "setting path to %s", aTxt.getStr() );
+ SAL_INFO( "vcl", "setting path to " << aTxt );
gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ),
aTxt.getStr() );
@@ -133,7 +133,6 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s
{
SolarMutexGuard g;
- OSL_TRACE( "1: HERE WE ARE");
OSL_ASSERT( m_pDialog != nullptr );
sal_Int16 retVal = 0;
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index dbbec941ce23..c710bb0ea9d6 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -213,7 +213,7 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory
if( aTxt.endsWith("/") )
aTxt = aTxt.copy( 0, aTxt.getLength() - 1 );
- OSL_TRACE( "setting path to %s", aTxt.getStr() );
+ SAL_INFO( "vcl", "setting path to " << aTxt );
gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ),
aTxt.getStr() );
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index bf366ab551f8..567648a90833 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -446,7 +446,7 @@ void SAL_CALL KDE4FilePicker::setValue( sal_Int16 controlId, sal_Int16 nControlA
cb->setChecked(value.get<bool>());
}
else
- OSL_TRACE( "set label on unknown control %d", controlId );
+ SAL_WARN( "vcl", "set label on unknown control " << controlId );
}
uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 nControlAction )
@@ -472,7 +472,7 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 nCont
res = uno::Any(cb->isChecked());
}
else
- OSL_TRACE( "get value on unknown control %d", controlId );
+ SAL_WARN( "vcl", "get value on unknown control " << controlId );
return res;
}
@@ -488,7 +488,7 @@ void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enabl
if (_customWidgets.contains( controlId ))
_customWidgets.value( controlId )->setEnabled( enable );
else
- OSL_TRACE("enable unknown control %d", controlId );
+ SAL_WARN( "vcl", "enable unknown control " << controlId );
}
void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &label )
@@ -505,7 +505,7 @@ void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &lab
cb->setText( toQString(label) );
}
else
- OSL_TRACE( "set label on unknown control %d", controlId );
+ SAL_WARN( "vcl", "set label on unknown control " << controlId );
}
OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
@@ -523,7 +523,7 @@ OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
label = cb->text();
}
else
- OSL_TRACE( "get label on unknown control %d", controlId );
+ SAL_WARN( "vcl", "get label on unknown control " << controlId );
return toOUString(label);
}
@@ -818,7 +818,7 @@ void KDE4FilePicker::filterChanged(const QString &)
{
FilePickerEvent aEvent;
aEvent.ElementId = LISTBOX_FILTER;
- OSL_TRACE( "filter changed" );
+ SAL_INFO( "vcl", "filter changed" );
if (m_xListener.is())
m_xListener->controlStateChanged( aEvent );
}
@@ -826,7 +826,7 @@ void KDE4FilePicker::filterChanged(const QString &)
void KDE4FilePicker::selectionChanged()
{
FilePickerEvent aEvent;
- OSL_TRACE( "file selection changed" );
+ SAL_INFO( "vcl", "file selection changed" );
if (m_xListener.is())
m_xListener->fileSelectionChanged( aEvent );
}
generated by cgit (git 2.34.1) at 2024-07-26 22:39:56 +0000