ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

OSL_TRACE -> SAL in sfx2..svx

Browse Source 
Change-Id: I78cf8058a5682baa3d7b00a25feeb2d28fb3e66e
Reviewed-on: https://gerrit.libreoffice.org/31799
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2016-12-11 18:56:16 +00:00
parent 4282ea67c2
commit 4ef9ccea6c
58 changed files with 220 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfx2/source/appl/appcfg.cxx
+2 -11
View File
@@ -125,14 +125,7 @@ IMPL_LINK(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void)
{
SfxObjectShellRef xRef( aHint.GetObjShell() );
pAsyncIdle->Stop();
#ifdef DBG_UTIL
if (!xRef.Is())
{
OStringBuffer aTmp("SfxEvent: ");
aTmp.append(OUStringToOString(aHint.GetEventName(), RTL_TEXTENCODING_UTF8));
OSL_TRACE( "%s", aTmp.getStr() );
}
#endif
SAL_INFO_IF(!xRef.Is(), "sfx", "SfxEvent: " << aHint.GetEventName());
SfxGetpApp()->Broadcast( aHint );
if ( xRef.Is() )
xRef->Broadcast( aHint );
@@ -860,9 +853,7 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron
#ifdef DBG_UTIL
if (!pDoc)
{
OStringBuffer aTmp("SfxEvent: ");
aTmp.append(OUStringToOString(rEventHint.GetEventName(), RTL_TEXTENCODING_UTF8));
OSL_TRACE( "%s", aTmp.getStr() );
SAL_INFO("sfx", "SfxEvent: " << rEventHint.GetEventName());
}
#endif
Broadcast(rEventHint);
sfx2/source/appl/appserv.cxx
+6 -6
View File
@@ -374,7 +374,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
if this dialog is closed by the user ...
So we ignore this request now and wait for a new user decision.
*/
OSL_TRACE( "QueryExit => sal_False (DispatchLevel == %u)", Application::GetDispatchLevel() );
SAL_INFO("sfx", "QueryExit => sal_False, DispatchLevel == " << Application::GetDispatchLevel() );
return;
}
@@ -1482,7 +1482,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
case SID_MACROORGANIZER:
{
OSL_TRACE("handling SID_MACROORGANIZER");
SAL_INFO("sfx", "handling SID_MACROORGANIZER");
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
sal_Int16 nTabId = 0;
@@ -1499,7 +1499,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
case SID_RUNMACRO:
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_TRACE("SfxApplication::OfaExec_Impl: case ScriptOrg");
SAL_INFO("sfx", "SfxApplication::OfaExec_Impl: case ScriptOrg");
Reference< XFrame > xFrame;
const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl();
@@ -1552,7 +1552,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
case SID_SCRIPTORGANIZER:
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_TRACE("SfxApplication::OfaExec_Impl: case ScriptOrg");
SAL_INFO("sfx", "SfxApplication::OfaExec_Impl: case ScriptOrg");
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
OUString aLanguage;
@@ -1562,7 +1562,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
}
OUString aLang( aLanguage );
OSL_TRACE("SfxApplication::OfaExec_Impl: about to create dialog for: %s", OUStringToOString( aLang , RTL_TEXTENCODING_ASCII_US ).pData->buffer);
SAL_INFO("sfx", "SfxApplication::OfaExec_Impl: about to create dialog for: " << aLang);
// not sure about the vcl::Window*
VclPtr<VclAbstractDialog> pDlg = pFact->CreateSvxScriptOrgDialog( GetTopWindow(), aLanguage );
if( pDlg )
@@ -1572,7 +1572,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
}
else
{
OSL_TRACE("no dialog!!!");
SAL_WARN("sfx", "no dialog!!!");
}
rReq.Done();
}
sfx2/source/control/dispatch.cxx
+6 -12
View File
@@ -476,9 +476,7 @@ SfxDispatcher::SfxDispatcher(SfxViewFrame *pViewFrame)
SfxDispatcher::~SfxDispatcher()
{
#ifdef DBG_UTIL
OStringBuffer sTemp("Delete Dispatcher ");
sTemp.append(reinterpret_cast<sal_Int64>(this));
OSL_TRACE("%s", sTemp.getStr());
SAL_WARN("sfx", "Delete Dispatcher " << reinterpret_cast<sal_Int64>(this));
DBG_ASSERT( !xImp->bActive, "deleting active Dispatcher" );
#endif
@@ -563,7 +561,7 @@ void SfxDispatcher::Pop(SfxShell& rShell, SfxDispatcherPopFlags nMode)
xImp->aToDoStack.push_front( SfxToDo_Impl(bPush, bDelete, bUntil, rShell) );
if (xImp->bFlushed)
{
OSL_TRACE("Unflushed dispatcher!");
SAL_WARN("sfx", "Unflushed dispatcher!");
xImp->bFlushed = false;
xImp->bUpdated = false;
@@ -736,9 +734,7 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI)
if ( bMDI )
{
#ifdef DBG_UTIL
OStringBuffer sTemp("Activate Dispatcher ");
sTemp.append(reinterpret_cast<sal_Int64>(this));
OSL_TRACE("%s", sTemp.getStr());
SAL_WARN("sfx", "Activate Dispatcher " << reinterpret_cast<sal_Int64>(this));
DBG_ASSERT( !xImp->bActive, "Activation error" );
#endif
xImp->bActive = true;
@@ -753,9 +749,7 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI)
else
{
#ifdef DBG_UTIL
OStringBuffer sTemp("Non-MDI-Activate Dispatcher");
sTemp.append(reinterpret_cast<sal_Int64>(this));
OSL_TRACE("%s", sTemp.getStr());
SAL_WARN("sfx", "Non-MDI-Activate Dispatcher " << reinterpret_cast<sal_Int64>(this));
#endif
}
@@ -1507,7 +1501,7 @@ void SfxDispatcher::FlushImpl()
{
SFX_STACK(SfxDispatcher::FlushImpl);
OSL_TRACE("Flushing dispatcher!");
SAL_INFO("sfx", "Flushing dispatcher!");
xImp->aIdle.Stop();
@@ -1572,7 +1566,7 @@ void SfxDispatcher::FlushImpl()
xImp->bFlushing = false;
xImp->bUpdated = false; // not only when bModify, if Doc/Template-Config
xImp->bFlushed = true;
OSL_TRACE("Successfully flushed dispatcher!");
SAL_INFO("sfx", "Successfully flushed dispatcher!");
//fdo#70703 FlushImpl may call back into itself so use aToDoCopyStack to talk
//to outer levels of ourself. If DoActivate_Impl/DoDeactivate_Impl deletes
sfx2/source/control/thumbnailview.cxx
+9 -18
View File
@@ -1265,12 +1265,9 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL)
}
catch (const uno::Exception& rException)
{
OSL_TRACE (
"caught exception while trying to access Thumbnail/thumbnail.png of %s: %s",
OUStringToOString(msURL,
RTL_TEXTENCODING_UTF8).getStr(),
OUStringToOString(rException.Message,
RTL_TEXTENCODING_UTF8).getStr());
SAL_WARN("sfx",
"caught exception while trying to access Thumbnail/thumbnail.png of "
<< msURL << ": " << rException.Message);
}
try
@@ -1295,22 +1292,16 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL)
}
catch (const uno::Exception& rException)
{
OSL_TRACE (
"caught exception while trying to access Thumbnails/thumbnail.png of %s: %s",
OUStringToOString(msURL,
RTL_TEXTENCODING_UTF8).getStr(),
OUStringToOString(rException.Message,
RTL_TEXTENCODING_UTF8).getStr());
SAL_WARN("sfx",
"caught exception while trying to access Thumbnails/thumbnail.png of "
<< msURL << ": " << rException.Message);
}
}
catch (const uno::Exception& rException)
{
OSL_TRACE (
"caught exception while trying to access tuhmbnail of %s: %s",
OUStringToOString(msURL,
RTL_TEXTENCODING_UTF8).getStr(),
OUStringToOString(rException.Message,
RTL_TEXTENCODING_UTF8).getStr());
SAL_WARN("sfx",
"caught exception while trying to access tuhmbnail of "
<< msURL << ": " << rException.Message);
}
// Extract the image from the stream.
sfx2/source/control/thumbnailviewacc.cxx
+1 -1
View File
@@ -585,7 +585,7 @@ void ThumbnailViewAcc::ThrowIfDisposed()
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
OSL_TRACE ("Calling disposed object. Throwing exception:");
SAL_WARN("sfx", "Calling disposed object. Throwing exception:");
throw lang::DisposedException (
OUString("object has been already disposed"),
static_cast<uno::XWeak*>(this));
sfx2/source/dialog/splitwin.cxx
+13 -13
View File
@@ -722,7 +722,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
pEmptyWin->bFadeIn = false;
SetPinned_Impl( false );
pEmptyWin->Actualize();
OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" );
pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, true )->nVisible = SfxChildVisibility::VISIBLE;
pWorkWin->ArrangeChildren_Impl();
if ( bFadeIn )
@@ -736,11 +736,11 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
#ifdef DBG_UTIL
if ( !bPinned || !pEmptyWin->bFadeIn )
{
OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" );
}
else
{
OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering real Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::InsertWindow_Impl - registering real Splitwindow" );
}
#endif
pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, true )->nVisible = SfxChildVisibility::VISIBLE;
@@ -804,11 +804,11 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, bool bHide )
#ifdef DBG_UTIL
if ( !bPinned || !pEmptyWin->bFadeIn )
{
OSL_TRACE( "SfxSplitWindow::RemoveWindow - releasing empty Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::RemoveWindow - releasing empty Splitwindow" );
}
else
{
OSL_TRACE( "SfxSplitWindow::RemoveWindow - releasing real Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::RemoveWindow - releasing real Splitwindow" );
}
#endif
pWorkWin->ReleaseChild_Impl( *GetSplitWindow() );
@@ -1063,11 +1063,11 @@ void SfxSplitWindow::SetPinned_Impl( bool bOn )
if ( pEmptyWin->bFadeIn )
{
// Unregister replacement windows
OSL_TRACE( "SfxSplitWindow::SetPinned_Impl - releasing real Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::SetPinned_Impl - releasing real Splitwindow" );
pWorkWin->ReleaseChild_Impl( *this );
Hide();
pEmptyWin->Actualize();
OSL_TRACE( "SfxSplitWindow::SetPinned_Impl - registering empty Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::SetPinned_Impl - registering empty Splitwindow" );
pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, true )->nVisible = SfxChildVisibility::VISIBLE;
}
@@ -1089,10 +1089,10 @@ void SfxSplitWindow::SetPinned_Impl( bool bOn )
if ( pEmptyWin->bFadeIn )
{
// Unregister replacement windows
OSL_TRACE( "SfxSplitWindow::SetPinned_Impl - releasing empty Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::SetPinned_Impl - releasing empty Splitwindow" );
pWorkWin->ReleaseChild_Impl( *pEmptyWin );
pEmptyWin->Hide();
OSL_TRACE( "SfxSplitWindow::SetPinned_Impl - registering real Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::SetPinned_Impl - registering real Splitwindow" );
pWorkWin->RegisterChild_Impl( *this, eAlign, true )->nVisible = SfxChildVisibility::VISIBLE;
}
}
@@ -1122,10 +1122,10 @@ void SfxSplitWindow::SetFadeIn_Impl( bool bOn )
}
else
{
OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - releasing empty Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::SetFadeIn_Impl - releasing empty Splitwindow" );
pWorkWin->ReleaseChild_Impl( *pEmptyWin );
pEmptyWin->Hide();
OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering real Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::SetFadeIn_Impl - registering real Splitwindow" );
pWorkWin->RegisterChild_Impl( *this, eAlign, true )->nVisible = SfxChildVisibility::VISIBLE;
pWorkWin->ArrangeChildren_Impl();
pWorkWin->ShowChildren_Impl();
@@ -1138,11 +1138,11 @@ void SfxSplitWindow::SetFadeIn_Impl( bool bOn )
if ( !IsFloatingMode() )
{
// The window is not "floating", should be hidden
OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - releasing real Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::SetFadeIn_Impl - releasing real Splitwindow" );
pWorkWin->ReleaseChild_Impl( *this );
Hide();
pEmptyWin->Actualize();
OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering empty Splitwindow" );
SAL_INFO("sfx", "SfxSplitWindow::SetFadeIn_Impl - registering empty Splitwindow" );
pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, true )->nVisible = SfxChildVisibility::VISIBLE;
pWorkWin->ArrangeChildren_Impl();
pWorkWin->ShowChildren_Impl();
sfx2/source/dialog/templdlg.cxx
+1 -1
View File
@@ -1750,7 +1750,7 @@ static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModM
}
catch ( css::frame::UnknownModuleException& )
{
OSL_TRACE( "getModuleIdentifier(): unknown module" );
SAL_WARN("sfx", "getModuleIdentifier(): unknown module" );
}
catch ( Exception& )
{
sfx2/source/doc/DocumentMetadataAccess.cxx
+8 -18
View File
@@ -496,7 +496,7 @@ collectFilesFromStorage(uno::Reference<embed::XStorage> const& i_xStorage,
o_rFiles.insert(i_Path + styles);
}
} catch (const uno::Exception &) {
OSL_TRACE("collectFilesFromStorage: exception?");
SAL_WARN("sfx", "collectFilesFromStorage: exception?");
}
}
@@ -543,8 +543,7 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl,
utl::MediaDescriptor::PROP_MEDIATYPE() )
>>= mimeType;
if (mimeType.startsWith(s_odfmime)) {
OSL_TRACE("readStream: "
"refusing to recurse into embedded document");
SAL_WARN("sfx", "readStream: refusing to recurse into embedded document");
return;
}
} catch (const uno::Exception &) { }
@@ -645,8 +644,7 @@ writeStream(struct DocumentMetadataAccess_Impl & i_rImpl,
utl::MediaDescriptor::PROP_MEDIATYPE() )
>>= mimeType;
if (mimeType.startsWith(s_odfmime)) {
OSL_TRACE("writeStream: "
"refusing to recurse into embedded document");
SAL_WARN("sfx", "writeStream: refusing to recurse into embedded document");
return;
}
} catch (const uno::Exception &) { }
@@ -1104,15 +1102,12 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
it != parts.end(); ++it) {
const OUString name((*it)->getStringValue());
if (!name.match(baseURI)) {
OSL_TRACE("loadMetadataFromStorage: graph not in document: %s",
OUStringToOString(name, RTL_TEXTENCODING_UTF8)
.getStr());
SAL_WARN("sfx", "loadMetadataFromStorage: graph not in document: " << name);
continue;
}
const OUString relName( name.copy(len) );
if (relName == s_manifest) {
OSL_TRACE("loadMetadataFromStorage: "
"found ourselves a recursive manifest!");
SAL_WARN("sfx", "loadMetadataFromStorage: found ourselves a recursive manifest!");
continue;
}
// remove found items from StgFiles
@@ -1136,8 +1131,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
xStylesFile.get());
}
} else if (isReservedFile(relName)) {
OSL_TRACE("loadMetadataFromStorage: "
"reserved file name in manifest");
SAL_WARN("sfx", "loadMetadataFromStorage: reserved file name in manifest");
} else {
if (isPartOfType(*m_pImpl, *it, xMetadataFile)) {
MfstMetadataFiles.push_back(relName);
@@ -1197,9 +1191,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
const uno::Reference<rdf::XURI> xName(graphs[i]);
const OUString name(xName->getStringValue());
if (!name.match(baseURI)) {
OSL_TRACE("storeMetadataToStorage: graph not in document: %s",
OUStringToOString(name, RTL_TEXTENCODING_UTF8)
.getStr());
SAL_WARN("sfx", "storeMetadataToStorage: graph not in document: " << name);
continue;
}
const OUString relName( name.copy(len) );
@@ -1207,9 +1199,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
continue;
}
if (!isFileNameValid(relName) || isReservedFile(relName)) {
OSL_TRACE("storeMetadataToStorage: invalid file name: %s",
OUStringToOString(relName, RTL_TEXTENCODING_UTF8)
.getStr());
SAL_WARN("sfx", "storeMetadataToStorage: invalid file name: " << relName);
continue;
}
try {
sfx2/source/doc/Metadatable.cxx
+14 -24
View File
@@ -654,9 +654,7 @@ bool
XmlIdRegistryDocument::TryRegisterMetadatable(Metadatable & i_rObject,
OUString const& i_rStreamName, OUString const& i_rIdref)
{
OSL_TRACE("TryRegisterMetadatable: %p (%s#%s)\n", &i_rObject,
OUStringToOString(i_rStreamName, RTL_TEXTENCODING_UTF8).getStr(),
OUStringToOString(i_rIdref, RTL_TEXTENCODING_UTF8).getStr());
SAL_INFO("sfx", "TryRegisterMetadatable: " << &i_rObject << " (" << i_rStreamName << "#" << i_rIdref << ")");
OSL_ENSURE(!dynamic_cast<MetadatableUndo*>(&i_rObject),
"TryRegisterMetadatable called for MetadatableUndo?");
@@ -705,7 +703,7 @@ XmlIdRegistryDocument::TryRegisterMetadatable(Metadatable & i_rObject,
void
XmlIdRegistryDocument::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
{
OSL_TRACE("RegisterMetadatableAndCreateID: %p", &i_rObject);
SAL_INFO("sfx", "RegisterMetadatableAndCreateID: " << &i_rObject);
OSL_ENSURE(!dynamic_cast<MetadatableUndo*>(&i_rObject),
"RegisterMetadatableAndCreateID called for MetadatableUndo?");
@@ -748,7 +746,7 @@ XmlIdRegistryDocument::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
void XmlIdRegistryDocument::UnregisterMetadatable(const Metadatable& i_rObject)
{
OSL_TRACE("UnregisterMetadatable: %p", &i_rObject);
SAL_INFO("sfx", "UnregisterMetadatable: " << &i_rObject);
OUString path;
OUString idref;
@@ -766,7 +764,7 @@ void XmlIdRegistryDocument::UnregisterMetadatable(const Metadatable& i_rObject)
void XmlIdRegistryDocument::RemoveXmlIdForElement(const Metadatable& i_rObject)
{
OSL_TRACE("RemoveXmlIdForElement: %p", &i_rObject);
SAL_INFO("sfx", "RemoveXmlIdForElement: " << &i_rObject);
const XmlIdReverseMap_t::iterator iter(
m_pImpl->m_XmlIdReverseMap.find(&i_rObject) );
@@ -782,8 +780,7 @@ void XmlIdRegistryDocument::RemoveXmlIdForElement(const Metadatable& i_rObject)
void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource,
Metadatable & i_rCopy, const bool i_bCopyPrecedesSource)
{
OSL_TRACE("RegisterCopy: %p -> %p (%d)\n",
&i_rSource, &i_rCopy, i_bCopyPrecedesSource);
SAL_INFO("sfx", "RegisterCopy: " << &i_rSource << " -> " << &i_rCopy << " (" << i_bCopyPrecedesSource << ")");
// potential sources: clipboard, undo array, splitNode
// assumption: stream change can only happen via clipboard, and is handled
@@ -825,7 +822,7 @@ void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource,
std::shared_ptr<MetadatableUndo>
XmlIdRegistryDocument::CreateUndo(Metadatable const& i_rObject)
{
OSL_TRACE("CreateUndo: %p", &i_rObject);
SAL_INFO("sfx", "CreateUndo: " << &i_rObject);
return std::make_shared<MetadatableUndo>(
i_rObject.IsInContent() );
@@ -852,7 +849,7 @@ void
XmlIdRegistryDocument::JoinMetadatables(
Metadatable & i_rMerged, Metadatable const & i_rOther)
{
OSL_TRACE("JoinMetadatables: %p <- %p", &i_rMerged, &i_rOther);
SAL_INFO("sfx", "JoinMetadatables: " << &i_rMerged << " <- " << &i_rOther);
bool mergedOwnsRef;
OUString path;
@@ -1070,9 +1067,7 @@ bool
XmlIdRegistryClipboard::TryRegisterMetadatable(Metadatable & i_rObject,
OUString const& i_rStreamName, OUString const& i_rIdref)
{
OSL_TRACE("TryRegisterMetadatable: %p (%s#%s)\n", &i_rObject,
OUStringToOString(i_rStreamName, RTL_TEXTENCODING_UTF8).getStr(),
OUStringToOString(i_rIdref, RTL_TEXTENCODING_UTF8).getStr());
SAL_INFO("sfx", "TryRegisterMetadatable: " << &i_rObject << " (" << i_rStreamName << "#" << i_rIdref <<")");
OSL_ENSURE(!dynamic_cast<MetadatableUndo*>(&i_rObject),
"TryRegisterMetadatable called for MetadatableUndo?");
@@ -1122,7 +1117,7 @@ XmlIdRegistryClipboard::TryRegisterMetadatable(Metadatable & i_rObject,
void
XmlIdRegistryClipboard::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
{
OSL_TRACE("RegisterMetadatableAndCreateID: %p", &i_rObject);
SAL_INFO("sfx", "RegisterMetadatableAndCreateID: " << &i_rObject);
OSL_ENSURE(!dynamic_cast<MetadatableUndo*>(&i_rObject),
"RegisterMetadatableAndCreateID called for MetadatableUndo?");
@@ -1156,7 +1151,7 @@ XmlIdRegistryClipboard::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
void XmlIdRegistryClipboard::UnregisterMetadatable(const Metadatable& i_rObject)
{
OSL_TRACE("UnregisterMetadatable: %p", &i_rObject);
SAL_INFO("sfx", "UnregisterMetadatable: " << &i_rObject);
OUString path;
OUString idref;
@@ -1176,7 +1171,7 @@ void XmlIdRegistryClipboard::UnregisterMetadatable(const Metadatable& i_rObject)
void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& i_rObject)
{
OSL_TRACE("RemoveXmlIdForElement: %p", &i_rObject);
SAL_INFO("sfx", "RemoveXmlIdForElement: " << &i_rObject);
ClipboardXmlIdReverseMap_t::iterator iter(
m_pImpl->m_XmlIdReverseMap.find(&i_rObject) );
@@ -1192,7 +1187,7 @@ void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& i_rObject)
std::shared_ptr<MetadatableClipboard>
XmlIdRegistryClipboard::CreateClipboard(const bool i_isInContent)
{
OSL_TRACE("CreateClipboard:");
SAL_INFO("sfx", "CreateClipboard:");
return std::make_shared<MetadatableClipboard>(
i_isInContent );
@@ -1203,13 +1198,8 @@ XmlIdRegistryClipboard::RegisterCopyClipboard(Metadatable & i_rCopy,
beans::StringPair const & i_rReference,
const bool i_isLatent)
{
OSL_TRACE("RegisterCopyClipboard: %p -> "/*"%p"*/"(%s#%s) (%d)\n",
/*&i_rSource,*/ &i_rCopy,
OUStringToOString(i_rReference.First,
RTL_TEXTENCODING_UTF8).getStr(),
OUStringToOString(i_rReference.Second,
RTL_TEXTENCODING_UTF8).getStr(),
i_isLatent);
SAL_INFO("sfx", "RegisterCopyClipboard: " << &i_rCopy
<< " -> (" << i_rReference.First << "#" << i_rReference.Second << ") (" << i_isLatent << ")");
// N.B.: when copying to the clipboard, the selection is always inserted
// into the body, even if the source is a header/footer!
sfx2/source/doc/objmisc.cxx
+2 -2
View File
@@ -1425,7 +1425,7 @@ namespace
ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL,
const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const css::uno::Any* pCaller )
{
OSL_TRACE( "in CallXScript" );
SAL_INFO("sfx", "in CallXScript" );
ErrCode nErr = ERRCODE_NONE;
bool bIsDocumentScript = ( _rScriptURL.indexOf( "location=document" ) >= 0 );
@@ -1488,7 +1488,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon
}
}
OSL_TRACE( "leaving CallXScript" );
SAL_INFO("sfx", "leaving CallXScript" );
return nErr;
}
sfx2/source/sidebar/PanelTitleBar.cxx
+1 -2
View File
@@ -150,8 +150,7 @@ void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex)
}
catch(Exception& rException)
{
OSL_TRACE("caught exception: %s",
OUStringToOString(rException.Message, RTL_TEXTENCODING_ASCII_US).getStr());
SAL_WARN("sfx", "caught exception: " << rException.Message);
}
}
}
sfx2/source/sidebar/SidebarController.cxx
+1 -1
View File
@@ -885,7 +885,7 @@ IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void)
break;
case VclEventId::WindowPaint:
OSL_TRACE("Paint");
SAL_INFO("sfx", "Paint");
break;
default:
sfx2/source/sidebar/Theme.cxx
+1 -4
View File
@@ -337,10 +337,7 @@ void Theme::UpdateTheme()
}
catch(beans::UnknownPropertyException& rException)
{
OSL_TRACE("unknown property: %s",
OUStringToOString(
rException.Message,
RTL_TEXTENCODING_ASCII_US).getStr());
SAL_WARN("sfx", "unknown property: " << rException.Message);
OSL_ASSERT(false);
}
}
sfx2/source/view/frame2.cxx
+1 -1
View File
@@ -103,7 +103,7 @@ bool SfxFrameWindow_Impl::EventNotify( NotifyEvent& rNEvt )
{
if ( pView->GetViewShell() && !pView->GetViewShell()->GetUIActiveIPClient_Impl() && !pFrame->IsInPlace() )
{
OSL_TRACE("SfxFrame: GotFocus");
SAL_INFO("sfx", "SfxFrame: GotFocus");
pView->MakeActive_Impl( false );
}
sfx2/source/view/viewprn.cxx
+3 -3
View File
@@ -226,7 +226,7 @@ int SfxPrinterController::getPageCount() const
}
catch (lang::DisposedException &)
{
OSL_TRACE("SfxPrinterController: document disposed while printing");
SAL_WARN("sfx", "SfxPrinterController: document disposed while printing");
const_cast<SfxPrinterController*>(this)->setJobState(
view::PrintableState_JOB_ABORTED);
}
@@ -251,7 +251,7 @@ Sequence< beans::PropertyValue > SfxPrinterController::getPageParameters( int i_
}
catch (lang::DisposedException &)
{
OSL_TRACE("SfxPrinterController: document disposed while printing");
SAL_WARN("sfx", "SfxPrinterController: document disposed while printing");
const_cast<SfxPrinterController*>(this)->setJobState(
view::PrintableState_JOB_ABORTED);
}
@@ -276,7 +276,7 @@ void SfxPrinterController::printPage( int i_nPage ) const
}
catch (lang::DisposedException &)
{
OSL_TRACE("SfxPrinterController: document disposed while printing");
SAL_WARN("sfx", "SfxPrinterController: document disposed while printing");
const_cast<SfxPrinterController*>(this)->setJobState(
view::PrintableState_JOB_ABORTED);
}
shell/source/backends/desktopbe/desktopbackend.cxx
+1 -4
View File
@@ -312,10 +312,7 @@ css::uno::Reference< css::uno::XInterface > createBackend(
throw;
} catch (const css::uno::Exception & e) {
// Assuming these exceptions indicate that the service is not installed:
OSL_TRACE(
"createInstance(%s) failed with %s",
OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr(),
OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
SAL_WARN("shell", "createInstance(" << name << ") failed with " << e.Message);
return css::uno::Reference< css::uno::XInterface >();
}
}
shell/source/backends/macbe/macbackend.mm
+2 -2
View File
@@ -228,12 +228,12 @@ css::uno::Any MacOSXBackend::getPropertyValue(
}
else
{
OSL_TRACE( "user documents list contains empty file path or conversion failed" );
SAL_WARN("shell", "user documents list contains empty file path or conversion failed" );
}
}
else
{
OSL_TRACE( "Got nil or empty list of user document directories" );
SAL_WARN("shell", "Got nil or empty list of user document directories" );
}
return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
} else if ( PropertyName == "ooInetFTPProxyName" )
shell/source/cmdmail/cmdmailsuppl.cxx
+1 -2
View File
@@ -204,8 +204,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
catch(const RuntimeException &e )
{
m_xConfigurationProvider.clear();
OSL_TRACE( "RuntimeException caught accessing configuration provider." );
OSL_TRACE( "%s", OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
SAL_WARN("shell", "RuntimeException caught accessing configuration provider. " << e.Message );
throw;
}
slideshow/source/engine/activitiesqueue.cxx
+1 -1
View File
@@ -141,7 +141,7 @@ namespace slideshow
// since this will also capture segmentation
// violations and the like. In such a case, we
// still better let our clients now...
OSL_TRACE( "::presentation::internal::ActivitiesQueue: Activity threw a SlideShowException, removing from ring" );
SAL_WARN("slideshow", "::presentation::internal::ActivitiesQueue: Activity threw a SlideShowException, removing from ring" );
}
if( bReinsert )
slideshow/source/engine/animationfactory.cxx
+4 -12
View File
@@ -679,9 +679,7 @@ namespace slideshow
if( !rAny.hasValue() )
{
OSL_FAIL( "getDefault(): cannot get requested shape property" );
OSL_TRACE( "getDefault(): cannot get '%s' shape property",
OUStringToOString( rPropertyName,
RTL_TEXTENCODING_ASCII_US ).getStr() );
SAL_WARN("slideshow", "getDefault(): cannot get shape property " << rPropertyName );
return ValueType();
}
else
@@ -691,9 +689,7 @@ namespace slideshow
if( !(rAny >>= aValue) )
{
OSL_FAIL( "getDefault(): cannot extract requested shape property" );
OSL_TRACE( "getDefault(): cannot extract '%s' shape property",
OUStringToOString( rPropertyName,
RTL_TEXTENCODING_ASCII_US ).getStr() );
SAL_WARN("slideshow", "getDefault(): cannot extract shape property " << rPropertyName);
return ValueType();
}
@@ -710,9 +706,7 @@ namespace slideshow
if( !rAny.hasValue() )
{
OSL_FAIL( "getDefault(): cannot get requested shape color property" );
OSL_TRACE( "getDefault(): cannot get '%s' shape color property",
OUStringToOString( rPropertyName,
RTL_TEXTENCODING_ASCII_US ).getStr() );
SAL_WARN("slideshow", "getDefault(): cannot get shape color property " << rPropertyName);
return RGBColor();
}
else
@@ -722,9 +716,7 @@ namespace slideshow
if( !(rAny >>= nValue) )
{
OSL_FAIL( "getDefault(): cannot extract requested shape color property" );
OSL_TRACE( "getDefault(): cannot extract '%s' shape color property",
OUStringToOString( rPropertyName,
RTL_TEXTENCODING_ASCII_US ).getStr() );
SAL_INFO("slideshow", "getDefault(): cannot extract shape color property " << rPropertyName);
return RGBColor();
}
slideshow/source/engine/animationnodes/animationnodefactory.cxx
+1 -1
View File
@@ -174,7 +174,7 @@ bool implCreateIteratedNodes(
}
if( ::basegfx::fTools::equalZero( nIntervalTimeout ) )
OSL_TRACE( "implCreateIteratedNodes(): "
SAL_INFO("slideshow", "implCreateIteratedNodes(): "
"iterate interval close to zero, there's "
"no point in defining such an effect "
"(visually equivalent to whole-shape effect)" );
slideshow/source/engine/attributemap.cxx
+1 -3
View File
@@ -77,9 +77,7 @@ namespace slideshow
if( !aMap.lookup( rAttrName,
eAttributeType ) )
{
OSL_TRACE( "mapAttributeName(): attribute name %s not found in map.",
OUStringToOString( rAttrName,
RTL_TEXTENCODING_ASCII_US ).getStr() );
SAL_WARN("slideshow", "mapAttributeName(): attribute name not found in map: " << rAttrName);
return ATTRIBUTE_INVALID;
}
slideshow/source/engine/eventqueue.cxx
+1 -1
View File
@@ -257,7 +257,7 @@ namespace slideshow
// since this will also capture segmentation
// violations and the like. In such a case, we
// still better let our clients now...
OSL_TRACE( "::presentation::internal::EventQueue: Event threw a SlideShowException, action might not have been fully performed" );
SAL_WARN("slideshow", "::presentation::internal::EventQueue: Event threw a SlideShowException, action might not have been fully performed" );
}
}
else
slideshow/source/engine/shapes/viewmediashape.cxx
+1 -1
View File
@@ -424,7 +424,7 @@ namespace slideshow
const uno::Sequence< uno::Any >& rVCLDeviceParams,
const OUString& rMimeType )
{
OSL_TRACE( "ViewMediaShape::implInitializePlayerWindow" );
SAL_INFO("slideshow", "ViewMediaShape::implInitializePlayerWindow" );
if( !mpMediaWindow.get() && !rBounds.isEmpty() )
{
try
slideshow/source/engine/slideshowimpl.cxx
+20 -20
View File
@@ -759,8 +759,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
if( !xPropSet.is() )
{
OSL_TRACE( "createSlideTransition(): "
"Slide has no PropertySet - assuming no transition\n" );
SAL_INFO("slideshow", "createSlideTransition(): "
"Slide has no PropertySet - assuming no transition" );
return ActivitySharedPtr();
}
@@ -769,8 +769,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
xPropSet,
"TransitionType") )
{
OSL_TRACE( "createSlideTransition(): "
"Could not extract slide transition type from XDrawPage - assuming no transition\n" );
SAL_INFO("slideshow", "createSlideTransition(): "
"Could not extract slide transition type from XDrawPage - assuming no transition" );
return ActivitySharedPtr();
}
@@ -779,8 +779,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
xPropSet,
"TransitionSubtype") )
{
OSL_TRACE( "createSlideTransition(): "
"Could not extract slide transition subtype from XDrawPage - assuming no transition\n" );
SAL_INFO("slideshow", "createSlideTransition(): "
"Could not extract slide transition subtype from XDrawPage - assuming no transition" );
return ActivitySharedPtr();
}
@@ -789,8 +789,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
xPropSet,
"TransitionDirection") )
{
OSL_TRACE( "createSlideTransition(): "
"Could not extract slide transition direction from XDrawPage - assuming default direction\n" );
SAL_INFO("slideshow", "createSlideTransition(): "
"Could not extract slide transition direction from XDrawPage - assuming default direction" );
}
sal_Int32 aUnoColor(0);
@@ -798,8 +798,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
xPropSet,
"TransitionFadeColor") )
{
OSL_TRACE( "createSlideTransition(): "
"Could not extract slide transition fade color from XDrawPage - assuming black\n" );
SAL_INFO("slideshow", "createSlideTransition(): "
"Could not extract slide transition fade color from XDrawPage - assuming black" );
}
const RGBColor aTransitionFadeColor( unoColor2RGBColor( aUnoColor ));
@@ -808,10 +808,10 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
bool bLoopSound = false;
if( !getPropertyValue( aSound, xPropSet, "Sound") )
OSL_TRACE( "createSlideTransition(): Could not determine transition sound effect URL from XDrawPage - using no sound" );
SAL_INFO("slideshow", "createSlideTransition(): Could not determine transition sound effect URL from XDrawPage - using no sound" );
if( !getPropertyValue( bLoopSound, xPropSet, "LoopSound" ) )
OSL_TRACE( "createSlideTransition(): Could not get slide property 'LoopSound' - using no sound" );
SAL_INFO("slideshow", "createSlideTransition(): Could not get slide property 'LoopSound' - using no sound" );
NumberAnimationSharedPtr pTransition(
TransitionFactory::createSlideTransition(
@@ -838,8 +838,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
xPropSet,
"TransitionDuration") )
{
OSL_TRACE( "createSlideTransition(): "
"Could not extract slide transition duration from XDrawPage - assuming no transition\n" );
SAL_INFO("slideshow", "createSlideTransition(): "
"Could not extract slide transition duration from XDrawPage - assuming no transition" );
return ActivitySharedPtr();
}
@@ -848,8 +848,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
xPropSet,
"MinimalFrameNumber") )
{
OSL_TRACE( "createSlideTransition(): "
"No minimal number of frames given - assuming 5\n" );
SAL_INFO("slideshow", "createSlideTransition(): "
"No minimal number of frames given - assuming 5" );
}
// prefetch slide transition bitmaps, but postpone it after
@@ -2163,9 +2163,9 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
xPropSet,
"Change") )
{
OSL_TRACE(
SAL_INFO("slideshow",
"queryAutomaticSlideTransition(): "
"Could not extract slide change mode from XDrawPage - assuming <none>\n" );
"Could not extract slide change mode from XDrawPage - assuming <none>" );
}
bHasAutomaticNextSlide = nChange == 1;
@@ -2175,10 +2175,10 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
xPropSet,
"HighResDuration") )
{
OSL_TRACE(
SAL_INFO("slideshow",
"queryAutomaticSlideTransition(): "
"Could not extract slide transition timeout from "
"XDrawPage - assuming 1 sec\n" );
"XDrawPage - assuming 1 sec" );
}
}
slideshow/source/engine/transitions/shapetransitionfactory.cxx
+3 -5
View File
@@ -351,11 +351,9 @@ AnimationActivitySharedPtr createShapeTransitionByType(
{
// No animation generated, maybe no table entry for given
// transition?
OSL_TRACE(
"createShapeTransitionByType(): Unknown type/subtype (%d/%d) "
"combination encountered",
xTransition->getTransition(),
xTransition->getSubtype() );
SAL_WARN("slideshow",
"createShapeTransitionByType(): Unknown type/subtype combination encountered: "
<< xTransition->getTransition() << " " << xTransition->getSubtype() );
OSL_FAIL(
"createShapeTransitionByType(): Unknown type/subtype "
"combination encountered" );
slideshow/source/engine/transitions/slidetransitionfactory.cxx
+15 -17
View File
@@ -195,7 +195,7 @@ public:
// ViewEventHandler
virtual void viewAdded( const UnoViewSharedPtr& rView ) override
{
OSL_TRACE("PluginSlideChange viewAdded");
SAL_INFO("slideshow", "PluginSlideChange viewAdded");
SlideChangeBase::viewAdded( rView );
for( const auto& pCurrView : maTransitions )
@@ -204,13 +204,13 @@ public:
return;
}
OSL_TRACE( "need to be added" );
SAL_INFO("slideshow", "need to be added" );
addTransition( rView );
}
virtual void viewRemoved( const UnoViewSharedPtr& rView ) override
{
OSL_TRACE("PluginSlideChange viewRemoved");
SAL_INFO("slideshow", "PluginSlideChange viewRemoved");
SlideChangeBase::viewRemoved( rView );
::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
@@ -220,7 +220,7 @@ public:
{
if( ( *aIter )->mpView == rView )
{
OSL_TRACE( "view removed" );
SAL_INFO("slideshow", "view removed" );
delete ( *aIter );
maTransitions.erase( aIter );
break;
@@ -230,31 +230,31 @@ public:
virtual void viewChanged( const UnoViewSharedPtr& rView ) override
{
OSL_TRACE("PluginSlideChange viewChanged");
SAL_INFO("slideshow", "PluginSlideChange viewChanged");
SlideChangeBase::viewChanged( rView );
for( const auto& pCurrView : maTransitions )
{
if( pCurrView->mpView == rView )
{
OSL_TRACE( "view changed" );
SAL_INFO("slideshow", "view changed" );
pCurrView->mxTransition->viewChanged( rView->getUnoView(),
getLeavingBitmap(ViewEntry(rView))->getXBitmap(),
getEnteringBitmap(ViewEntry(rView))->getXBitmap() );
}
else
OSL_TRACE( "view did not changed" );
SAL_INFO("slideshow", "view did not change" );
}
}
virtual void viewsChanged() override
{
OSL_TRACE("PluginSlideChange viewsChanged");
SAL_INFO("slideshow", "PluginSlideChange viewsChanged");
SlideChangeBase::viewsChanged();
for( const auto& pCurrView : maTransitions )
{
OSL_TRACE( "view changed" );
SAL_INFO("slideshow", "view changed" );
UnoViewSharedPtr pView = pCurrView->mpView;
pCurrView->mxTransition->viewChanged( pView->getUnoView(),
getLeavingBitmap(ViewEntry(pView))->getXBitmap(),
@@ -961,11 +961,10 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
{
default:
case TransitionInfo::TRANSITION_INVALID:
OSL_TRACE(
SAL_WARN("slideshow",
"TransitionFactory::createSlideTransition(): "
"Invalid type/subtype (%d/%d) combination encountered.",
nTransitionType,
nTransitionSubType );
"Invalid type/subtype combination encountered."
<< nTransitionType << " " << nTransitionSubType );
return NumberAnimationSharedPtr();
@@ -1124,11 +1123,10 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
// No animation generated, maybe no table entry for given
// transition?
OSL_TRACE(
SAL_WARN("slideshow",
"TransitionFactory::createSlideTransition(): "
"Unknown type/subtype (%d/%d) combination encountered",
nTransitionType,
nTransitionSubType );
"Unknown type/subtype combination encountered "
<< nTransitionType << " " << nTransitionSubType );
OSL_FAIL(
"TransitionFactory::createSlideTransition(): "
"Unknown type/subtype combination encountered" );
slideshow/source/inc/tools.hxx
+4 -12
View File
@@ -319,12 +319,8 @@ namespace slideshow
bool const bRet = css::uno::fromAny(a, &rValue);
#if OSL_DEBUG_LEVEL > 0
if( !bRet )
OSL_TRACE( "%s: while retrieving property %s, cannot extract Any of type %s\n",
OUStringToOString( propName,
RTL_TEXTENCODING_ASCII_US ).getStr(),
OSL_THIS_FUNC,
OUStringToOString( a.getValueTypeRef()->pTypeName,
RTL_TEXTENCODING_ASCII_US ).getStr() );
SAL_INFO("slideshow", OSL_THIS_FUNC << ": while retrieving property " << propName << ", cannot extract Any of type "
<< a.getValueTypeRef()->pTypeName);
#endif
return bRet;
}
@@ -352,12 +348,8 @@ namespace slideshow
bool const bRet = rIfc.is();
#if OSL_DEBUG_LEVEL > 0
if( !bRet )
OSL_TRACE( "%s: while retrieving property %s, cannot extract Any of type %s to interface\n",
OUStringToOString( propName,
RTL_TEXTENCODING_ASCII_US ).getStr(),
OSL_THIS_FUNC,
OUStringToOString( a.getValueTypeRef()->pTypeName,
RTL_TEXTENCODING_ASCII_US ).getStr() );
SAL_INFO("slideshow", OSL_THIS_FUNC << ": while retrieving property " << propName << ", cannot extract Any of type "
<< a.getValueTypeRef()->pTypeName << " to interface");
#endif
return bRet;
}
slideshow/test/demoshow.cxx
+4 -4
View File
@@ -355,7 +355,7 @@ void ChildWindow::init()
}
catch (const uno::Exception &e)
{
OSL_TRACE( "Exception '%s' thrown\n" ,
SAL_INFO("slideshow",( "Exception '%s' thrown\n" ,
OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
@@ -369,7 +369,7 @@ void ChildWindow::Paint( const Rectangle& /*rRect*/ )
}
catch (const uno::Exception &e)
{
OSL_TRACE( "Exception '%s' thrown\n" ,
SAL_INFO("slideshow",( "Exception '%s' thrown\n" ,
OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ).getStr() );
}
@@ -457,7 +457,7 @@ void DemoWindow::init()
}
catch (const uno::Exception &e)
{
OSL_TRACE( "Exception '%s' thrown\n" ,
SAL_INFO("slideshow",( "Exception '%s' thrown\n" ,
OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ).getStr() );
}
@@ -531,7 +531,7 @@ void DemoApp::Main()
if( !xFactory.is() )
{
OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting." );
SAL_INFO("slideshow",( "Could not bootstrap UNO, installation must be in disorder. Exiting." );
exit( 1 );
}
stoc/source/inspect/introspection.cxx
+2 -2
View File
@@ -2070,7 +2070,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
if (aIt != rPropNameMap.end())
{
/* TODO
OSL_TRACE(
SAL_INFO("stoc",(
String( "Introspection: Property \"" ) +
OOUStringToString( aPropName, CHARSET_SYSTEM ) +
String( "\" found more than once" ) );
@@ -2259,7 +2259,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
if (aIt != rPropNameMap.end())
{
/* TODO:
OSL_TRACE(
SAL_INFO("stoc",(
String( "Introspection: Property \"" ) +
OOUStringToString( aPropName, CHARSET_SYSTEM ) +
String( "\" found more than once" ) );
stoc/source/javaloader/javaloader.cxx
+1 -1
View File
@@ -284,7 +284,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
reinterpret_cast<typelib_TypeDescription *>(pType_XImplementationLoader));
throw;
}
OSL_TRACE("javaloader.cxx: mapped javaloader - 0x%p", m_javaLoader.get());
SAL_INFO("stoc", "javaloader.cxx: mapped javaloader - 0x" << m_javaLoader.get());
return m_javaLoader;
}
stoc/source/security/access_controller.cxx
+4 -6
View File
@@ -488,16 +488,14 @@ static void dumpPermissions(
{
buf.append( "> dumping default permissions:" );
}
OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "%s", str.getStr() );
SAL_INFO("stoc", buf.makeStringAndClear() );
Sequence< OUString > permissions( collection.toStrings() );
OUString const * p = permissions.getConstArray();
for ( sal_Int32 nPos = 0; nPos < permissions.getLength(); ++nPos )
{
OString str( OUStringToOString( p[ nPos ], RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "%s", str.getStr() );
SAL_INFO("stoc", p[ nPos ] );
}
OSL_TRACE( "> permission dump done" );
SAL_INFO("stoc", "> permission dump done" );
}
#endif
@@ -632,7 +630,7 @@ PermissionCollection AccessController::getEffectivePermissions(
buf.append( "\"" );
OString str(
OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "%s", str.getStr() );
SAL_INFO("stoc",( "%s", str.getStr() );
#endif
return PermissionCollection( new AllPermission() );
}
stoc/source/security/lru_cache.h
+9 -15
View File
@@ -157,12 +157,10 @@ inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup(
toFront( entry );
#ifdef __CACHE_DIAGNOSE
OUStringBuffer buf( 48 );
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> retrieved element \"") );
buf.appendAscii( "> retrieved element \"" );
buf.append( entry->m_key );
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") );
OString str( OUStringToOString(
buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "%s", str.getStr() );
buf.appendAscii( "\" from cache" );
SAL_INFO("stoc", buf.makeStringAndClear() );
#endif
return &entry->m_val;
}
@@ -186,12 +184,10 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set(
if (entry->m_key.getLength())
{
OUStringBuffer buf( 48 );
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> kicking element \"") );
buf.appendAscii( "> kicking element \"" );
buf.append( entry->m_key );
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") );
OString str( OUStringToOString(
buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "%s", str.getStr() );
buf.appendAscii( "\" from cache" );
SAL_INFO("stoc", buf.makeStringAndClear() );
}
#endif
m_key2element.erase( entry->m_key );
@@ -208,12 +204,10 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set(
entry = iFind->second;
#ifdef __CACHE_DIAGNOSE
OUStringBuffer buf( 48 );
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> replacing element \"") );
buf.appendAscii( "> replacing element \"" );
buf.append( entry->m_key );
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" in cache") );
OString str( OUStringToOString(
buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "%s", str.getStr() );
buf.appendAscii( "\" in cache" );
SAL_INFO("stoc", buf.makeStringAndClear() );
#endif
}
entry->m_val = val;
stoc/source/security/permissions.cxx
+2 -7
View File
@@ -70,12 +70,7 @@ static inline sal_Int32 makeMask(
#if OSL_DEBUG_LEVEL > 0
if (! strings[ nPos ])
{
OUStringBuffer buf( 48 );
buf.append( "### ignoring unknown socket action: " );
buf.append( item );
OString str( OUStringToOString(
buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "%s", str.getStr() );
SAL_WARN("stoc", "ignoring unknown socket action: " << item );
}
#endif
}
@@ -542,7 +537,7 @@ static void demanded_diag(
buf.append( " => ok." );
OString str(
OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "%s", str.getStr() );
SAL_INFO("stoc",( "%s", str.getStr() );
}
#endif
stoc/test/javavm/testjavavm.cxx
+2 -5
View File
@@ -89,7 +89,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
jclass cls = p_env->FindClass( "TestJavaVM");
if (cls == 0) {
OSL_TRACE( "Can't find Prog class");
SAL_WARN("stoc", "Can't find Prog class");
exit(1);
}
@@ -139,10 +139,7 @@ SAL_IMPLEMENT_MAIN()
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "### exception occurred: " );
OSL_TRACE( "%s", aMsg.getStr() );
OSL_TRACE( "\n" );
SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
Reference< XComponent > xCompContext( context, UNO_QUERY );
stoc/test/testconv.cxx
+1 -4
View File
@@ -672,10 +672,7 @@ SAL_IMPLEMENT_MAIN()
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "### exception occurred: " );
OSL_TRACE( "%s", aMsg.getStr() );
OSL_TRACE( "\n" );
SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
Reference< XComponent >( xMgr, UNO_QUERY )->dispose();
stoc/test/testcorefl.cxx
+1 -5
View File
@@ -368,11 +368,7 @@ SAL_IMPLEMENT_MAIN()
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
OString aMsg(
OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "### exception occurred: " );
OSL_TRACE( "%s", aMsg.getStr() );
OSL_TRACE( "\n" );
SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
printf( "testcorefl %s !\n", (bSucc ? "succeeded" : "failed") );
stoc/test/testiadapter.cxx
+1 -1
View File
@@ -159,7 +159,7 @@ class Test_Impl : public WeakImplHelper< XLanguageBindingTest >
public:
virtual ~Test_Impl()
{ OSL_TRACE( "> scalar Test_Impl dtor <\n" ); }
{ SAL_INFO("stoc", "> scalar Test_Impl dtor <" ); }
// XLBTestBase
virtual void SAL_CALL setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
stoc/test/testintrosp.cxx
+1 -4
View File
@@ -1196,10 +1196,7 @@ SAL_IMPLEMENT_MAIN()
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "### exception occurred: " );
OSL_TRACE( "%s", aMsg.getStr() );
OSL_TRACE( "\n" );
SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
Reference< XComponent >( xMgr, UNO_QUERY )->dispose();
stoc/test/testproxyfac.cxx
+2 -2
View File
@@ -55,7 +55,7 @@ public:
virtual ~TargetObject() {
--s_obj;
OSL_TRACE( "~TargetObject()" );
SAL_INFO("stoc", "~TargetObject()" );
}
TargetObject()
{ ++s_obj; }
@@ -113,7 +113,7 @@ public:
virtual ~TestMaster() {
--s_obj;
OSL_TRACE( "~TestMaster()" );
SAL_INFO("stoc", "~TestMaster()" );
}
virtual Any SAL_CALL queryInterface( const Type & rType )
store/source/storbios.cxx
+1 -1
View File
@@ -373,7 +373,7 @@ storeError SuperBlockPage::verify (OStorePageBIOS & rBIOS)
else
{
// Double Failure.
OSL_TRACE("OStoreSuperBlockPage::verify(): double failure.");
SAL_WARN("store", "OStoreSuperBlockPage::verify(): double failure.");
}
}
store/source/storcach.cxx
+2 -2
View File
@@ -207,7 +207,7 @@ PageCache::~PageCache()
s_x += double(x);
}
double ave = s_x / double(n);
OSL_TRACE("ave hash chain length: %g", ave);
SAL_INFO("store", "avg hash chain length: " << ave);
(void) ave;
if (m_hash_table != m_hash_table_0)
@@ -217,7 +217,7 @@ PageCache::~PageCache()
m_hash_size = theTableSize;
m_hash_shift = highbit(m_hash_size) - 1;
}
OSL_TRACE("Hits: %zu, Misses: %zu", m_nHit, m_nMissed);
SAL_INFO("store", "Hits: " << m_nHit << ", Misses: " << m_nMissed);
}
void PageCache::rescale_Impl (std::size_t new_size)
store/source/stordata.cxx
+3 -3
View File
@@ -786,7 +786,7 @@ storeError OStoreDirectoryPageObject::read (
else
{
// Unknown scope.
OSL_TRACE("OStoreDirectoryPageObject::get(): scope failed");
SAL_WARN("store", "OStoreDirectoryPageObject::get(): scope failed");
eErrCode = store_E_Unknown;
}
@@ -873,7 +873,7 @@ storeError OStoreDirectoryPageObject::write (
else
{
// Unknown scope.
OSL_TRACE("OStoreDirectoryPageObject::put(): scope failed");
SAL_WARN("store", "OStoreDirectoryPageObject::put(): scope failed");
eErrCode = store_E_Unknown;
}
@@ -995,7 +995,7 @@ storeError OStoreDirectoryPageObject::truncate (
else
{
// Unknown scope.
OSL_TRACE("OStoreDirectoryPageObject::put(): scope failed");
SAL_WARN("store", "OStoreDirectoryPageObject::put(): scope failed");
eErrCode = store_E_Unknown;
}
svtools/source/brwbox/brwbox1.cxx
+16 -16
View File
@@ -59,7 +59,7 @@ namespace
void BrowseBox::ConstructImpl( BrowserMode nMode )
{
OSL_TRACE( "BrowseBox: %p->ConstructImpl", this );
SAL_INFO("svtools", "BrowseBox:ConstructImpl " << this );
bMultiSelection = false;
pColSel = nullptr;
pDataWin = nullptr;
@@ -126,7 +126,7 @@ BrowseBox::~BrowseBox()
void BrowseBox::dispose()
{
OSL_TRACE( "BrowseBox: %p~", this );
SAL_INFO("svtools", "BrowseBox:dispose " << this );
if ( m_pImpl->m_pAccessible )
{
@@ -306,7 +306,7 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId)
{
pColSel->Select( GetColumnPos( _nSelectedColumnId ) );
ToggleSelection();
OSL_TRACE( "BrowseBox: %p->SetToggledSelectedColumn", this );
SAL_INFO("svtools", "BrowseBox::SetToggledSelectedColumn " << this );
DoShowCursor( "SetToggledSelectedColumn" );
}
}
@@ -1244,7 +1244,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint )
if ( bDoPaint )
{
// hide cursor and selection
OSL_TRACE( "BrowseBox: %p->HideCursor", this );
SAL_INFO("svtools", "BrowseBox::HideCursor " << this );
ToggleSelection();
DoHideCursor( "RowRemoved" );
}
@@ -1323,7 +1323,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint )
{
// reshow cursor and selection
ToggleSelection();
OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
SAL_INFO("svtools", "BrowseBox::ShowCursor " << this );
DoShowCursor( "RowRemoved" );
// adjust the vertical scrollbar
@@ -1595,7 +1595,7 @@ void BrowseBox::SetNoSelection()
// nothing to do
return;
OSL_TRACE( "BrowseBox: %p->HideCursor", this );
SAL_INFO("svtools", "BrowseBox::HideCursor " << this );
ToggleSelection();
// unselect all
@@ -1611,7 +1611,7 @@ void BrowseBox::SetNoSelection()
bSelect = true;
// restore screen
OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
SAL_INFO("svtools", "BrowseBox::ShowCursor " << this );
if ( isAccessibleAlive() )
{
@@ -1630,7 +1630,7 @@ void BrowseBox::SelectAll()
if ( !bMultiSelection )
return;
OSL_TRACE( "BrowseBox: %p->HideCursor", this );
SAL_INFO("svtools", "BrowseBox::HideCursor " << this );
ToggleSelection();
// select all rows
@@ -1663,7 +1663,7 @@ void BrowseBox::SelectAll()
bSelect = true;
// restore screen
OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
SAL_INFO("svtools", "BrowseBox::ShowCursor " << this );
if ( isAccessibleAlive() )
{
@@ -1700,7 +1700,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand )
return;
}
OSL_TRACE( "BrowseBox: %p->HideCursor", this );
SAL_INFO("svtools", "BrowseBox::HideCursor " << this );
// remove old selection?
if ( !bExpand || !bMultiSelection )
@@ -1742,7 +1742,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand )
bSelect = true;
// restore screen
OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
SAL_INFO("svtools", "BrowseBox::ShowCursor " << this );
if ( isAccessibleAlive() )
{
@@ -1787,7 +1787,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMak
return;
}
OSL_TRACE( "BrowseBox: %p->HideCursor", this );
SAL_INFO("svtools", "BrowseBox::HideCursor " << this );
ToggleSelection();
if ( bMultiSelection )
uRow.pSel->SelectAll(false);
@@ -1829,7 +1829,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMak
}
// restore screen
OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
SAL_INFO("svtools", "BrowseBox::ShowCursor " << this );
}
@@ -2338,11 +2338,11 @@ void BrowseBox::CursorMoved()
void BrowseBox::LoseFocus()
{
OSL_TRACE( "BrowseBox: %p->LoseFocus", this );
SAL_INFO("svtools", "BrowseBox::LoseFocus " << this );
if ( bHasFocus )
{
OSL_TRACE( "BrowseBox: %p->HideCursor", this );
SAL_INFO("svtools", "BrowseBox::HideCursor " << this );
DoHideCursor( "LoseFocus" );
if ( !bKeepHighlight )
@@ -2359,7 +2359,7 @@ void BrowseBox::LoseFocus()
void BrowseBox::GetFocus()
{
OSL_TRACE( "BrowseBox: %p->GetFocus", this );
SAL_INFO("svtools", "BrowseBox::GetFocus " << this );
if ( !bHasFocus )
{
svtools/source/brwbox/brwbox2.cxx
+1 -1
View File
@@ -1379,7 +1379,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
void BrowseBox::MouseMove( const MouseEvent& rEvt )
{
OSL_TRACE( "BrowseBox::MouseMove( MouseEvent )" );
SAL_INFO("svtools", "BrowseBox::MouseMove( MouseEvent )" );
Pointer aNewPointer;
svtools/source/control/valueacc.cxx
+1 -1
View File
@@ -693,7 +693,7 @@ void ValueSetAcc::ThrowIfDisposed()
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
OSL_TRACE ("Calling disposed object. Throwing exception:");
SAL_WARN("svx", "Calling disposed object. Throwing exception:");
throw lang::DisposedException (
OUString("object has been already disposed"),
static_cast<uno::XWeak*>(this));
svtools/source/control/valueset.cxx
+2 -2
View File
@@ -1436,7 +1436,7 @@ void ValueSet::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
void ValueSet::GetFocus()
{
OSL_TRACE ("value set getting focus");
SAL_INFO("svtools", "value set getting focus");
Invalidate();
Control::GetFocus();
@@ -1448,7 +1448,7 @@ void ValueSet::GetFocus()
void ValueSet::LoseFocus()
{
OSL_TRACE ("value set losing focus");
SAL_INFO("svtools", "value set losing focus");
if ( mbNoSelection && mnSelItemId )
ImplHideSelect( mnSelItemId );
else
svtools/source/misc/filechangedchecker.cxx
+2 -2
View File
@@ -79,10 +79,10 @@ bool FileChangedChecker::hasFileChanged()
IMPL_LINK_NOARG(FileChangedChecker, TimerHandler, Idle *, void)
{
// If the file has changed, then update the graphic in the doc
OSL_TRACE("Timeout Called");
SAL_INFO("svtools", "Timeout Called");
if(hasFileChanged())
{
OSL_TRACE("File modified");
SAL_INFO("svtools", "File modified");
mpCallback();
}
svx/source/accessibility/AccessibleShape.cxx
+5 -5
View File
@@ -117,7 +117,7 @@ AccessibleShape::~AccessibleShape()
{
delete mpChildrenManager;
delete mpText;
OSL_TRACE ("~AccessibleShape");
SAL_INFO("svx", "~AccessibleShape");
// Unregistering from the various broadcasters should be unnecessary
// since this destructor would not have been called if one of the
@@ -575,7 +575,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds()
}
}
else
OSL_TRACE (" no property BoundRect");
SAL_WARN("svx", "no property BoundRect");
}
}
@@ -638,7 +638,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds()
}
else
{
OSL_TRACE ("parent does not support component");
SAL_INFO("svx", "parent does not support component");
aBoundingBox = awt::Rectangle (
aPixelPosition.getX(), aPixelPosition.getY(),
aPixelSize.getWidth(), aPixelSize.getHeight());
@@ -676,7 +676,7 @@ awt::Point SAL_CALL AccessibleShape::getLocationOnScreen()
aLocation.Y += aParentLocation.Y;
}
else
OSL_TRACE ("getLocation: parent does not support XAccessibleComponent");
SAL_WARN("svx", "parent does not support XAccessibleComponent");
return aLocation;
}
@@ -1016,7 +1016,7 @@ void SAL_CALL
}
catch (uno::RuntimeException const&)
{
OSL_TRACE ("caught exception while disposing");
SAL_WARN("svx", "caught exception while disposing");
}
}
svx/source/accessibility/AccessibleTextHelper.cxx
+8 -8
View File
@@ -256,7 +256,7 @@ namespace accessibility
mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
{
#ifdef DBG_UTIL
OSL_TRACE( "AccessibleTextHelper_Impl received ID: %d", mnNotifierClientId );
SAL_INFO("svx", "received ID: " << mnNotifierClientId );
#endif
}
@@ -426,7 +426,7 @@ namespace accessibility
pAccTable->SetStateDirectly(AccessibleStateType::FOCUSED);
}
}
OSL_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object received focus" );
SAL_INFO("svx", "Parent object received focus" );
}
else
{
@@ -444,7 +444,7 @@ namespace accessibility
pAccTable->ResetStateDirectly(AccessibleStateType::FOCUSED);
}
}
OSL_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object lost focus" );
SAL_INFO("svx", "Parent object lost focus" );
}
}
}
@@ -471,7 +471,7 @@ namespace accessibility
SetShapeFocus( bHaveFocus );
}
OSL_TRACE("AccessibleTextHelper_Impl::SetFocus: focus changed, Object %p, state: %s", this, bHaveFocus ? "focused" : "not focused");
SAL_INFO("svx", "focus changed, Object " << this << ", state: " << (bHaveFocus ? "focused" : "not focused") );
}
bool AccessibleTextHelper_Impl::IsActive() const
@@ -518,7 +518,7 @@ namespace accessibility
// #103998# Not that important, changed from assertion to trace
if( mbThisHasFocus )
{
OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!");
SAL_INFO("svx", "Parent has focus!");
}
sal_Int32 nMaxValidParaIndex( GetTextForwarder().GetParagraphCount() - 1 );
@@ -1323,7 +1323,7 @@ namespace accessibility
catch( const uno::Exception& )
{
#ifdef DBG_UTIL
OSL_TRACE("AccessibleTextHelper_Impl::ProcessQueue: Unhandled exception.");
SAL_WARN("svx", "Unhandled exception.");
#endif
}
}
@@ -1439,7 +1439,7 @@ namespace accessibility
catch( const uno::Exception& )
{
#ifdef DBG_UTIL
OSL_TRACE("AccessibleTextHelper_Impl::Notify: Unhandled exception.");
SAL_WARN("svx", "Unhandled exception.");
#endif
mbInNotify = false;
}
@@ -1456,7 +1456,7 @@ namespace accessibility
// #106234# Unregister from EventNotifier
::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() );
#ifdef DBG_UTIL
OSL_TRACE( "AccessibleTextHelper_Impl disposed ID: %d", mnNotifierClientId );
SAL_INFO("svx", "disposed ID: " << mnNotifierClientId );
#endif
}
catch( const uno::Exception& ) {}
svx/source/accessibility/ChildrenManager.cxx
+1 -1
View File
@@ -46,7 +46,7 @@ ChildrenManager::~ChildrenManager()
mpImpl->dispose();
// empty
OSL_TRACE ("~ChildrenManager");
SAL_INFO("svx", "~ChildrenManager");
}
long ChildrenManager::GetChildCount() const throw ()
svx/source/customshapes/EnhancedCustomShape2d.cxx
+6 -5
View File
@@ -723,8 +723,8 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
const Any* pAny = rGeometryItem.GetPropertyValueByName( "Type" );
if ( pAny ) {
*pAny >>= sShapeType;
bOOXMLShape = ( sShapeType.startsWith("ooxml-") );
OSL_TRACE("shape type: %s %d", OUStringToOString( sShapeType, RTL_TEXTENCODING_ASCII_US ).getStr(), bOOXMLShape);
bOOXMLShape = sShapeType.startsWith("ooxml-");
SAL_INFO("svx", "shape type: " << sShapeType << " " << bOOXMLShape);
}
eSpType = EnhancedCustomShapeTypeNames::Get( sShapeType );
@@ -885,7 +885,7 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex )
}
catch ( ... )
{
OSL_TRACE("error: EnhancedCustomShape2d::GetEquationValueAsDouble failed");
SAL_WARN("svx", "EnhancedCustomShape2d::GetEquationValueAsDouble failed");
}
#if OSL_DEBUG_LEVEL > 0
nLevel --;
@@ -1797,7 +1797,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
fStartAngle *= F_PI180;
fSwingAngle *= F_PI180;
OSL_TRACE("ARCANGLETO scale: %f x %f angles: %f, %f", fWR, fHR, fStartAngle, fSwingAngle);
SAL_INFO("svx", "ARCANGLETO scale: " << fWR << "x" << fHR << " angles: " << fStartAngle << "," << fSwingAngle);
bool bClockwise = fSwingAngle >= 0.0;
@@ -1809,7 +1809,8 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
double fT = atan2((fWR*sin(fStartAngle)), (fHR*cos(fStartAngle)));
double fTE = atan2((fWR*sin(fStartAngle + fSwingAngle)), fHR*cos(fStartAngle + fSwingAngle));
OSL_TRACE("ARCANGLETO angles: %f, %f --> parameters: %f, %f", fStartAngle, fSwingAngle, fT, fTE );
SAL_INFO("svx", "ARCANGLETO angles: " << fStartAngle << ", " << fSwingAngle
<< " --> parameters: " << fT <<", " << fTE );
fWR *= fXScale;
fHR *= fYScale;
svx/source/fmcomp/gridcell.cxx
+1 -1
View File
@@ -2063,7 +2063,7 @@ double DbCurrencyField::GetCurrency(const Reference< css::sdb::XColumn >& _rxFie
double fValue = GetValue(_rxField, xFormatter);
if (m_nScale)
{
// OSL_TRACE("double = %.64f ",fValue);
// SAL_INFO("svx",("double = %.64f ",fValue);
fValue = ::rtl::math::pow10Exp(fValue, m_nScale);
fValue = ::rtl::math::round(fValue);
}
svx/source/form/fmtextcontrolshell.cxx
+11 -23
View File
@@ -552,7 +552,7 @@ namespace svx
{
if ( m_bNeedClipboardInvalidation )
{
OSL_TRACE( "FmTextControlShell::ClipBoard: invalidating clipboard slots" );
SAL_INFO("svx", "invalidating clipboard slots" );
m_rBindings.Invalidate( SID_CUT );
m_rBindings.Invalidate( SID_COPY );
m_rBindings.Invalidate( SID_PASTE );
@@ -611,11 +611,10 @@ namespace svx
{
#if OSL_DEBUG_LEVEL > 0
bool bFeatureIsEnabled = aFeature->second->isFeatureEnabled();
OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " );
sMessage += sUnoSlotNameAscii;
OString sMessage = "found a feature state for " + sUnoSlotNameAscii;
if ( !bFeatureIsEnabled )
sMessage += " (disabled)";
OSL_TRACE( "%s", sMessage.getStr() );
SAL_INFO("svx", sMessage );
#endif
lcl_translateUnoStateToItem( nSlotId, aFeature->second->getFeatureState(), _rSet );
@@ -623,10 +622,7 @@ namespace svx
#if OSL_DEBUG_LEVEL > 0
else
{
OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " );
sMessage += sUnoSlotNameAscii;
sMessage += ", but could not translate it into an item!";
OSL_TRACE( "%s", sMessage.getStr() );
SAL_WARN("svx", "found a feature state for " << sUnoSlotNameAscii << ", but could not translate it into an item!" );
}
#endif
}
@@ -958,7 +954,7 @@ namespace svx
bNeedSelection = true;
bNeedTextComponent = true;
bNeedWriteableControl = true;
OSL_TRACE( "FmTextControlShell::ClipBoard: need to invalidate again" );
SAL_INFO("svx", "need to invalidate again" );
m_bNeedClipboardInvalidation = true;
break;
@@ -1042,9 +1038,7 @@ namespace svx
void FmTextControlShell::formActivated( const Reference< runtime::XFormController >& _rxController )
{
#if OSL_DEBUG_LEVEL > 0
OString sTrace( "FmTextControlShell::formActivated: 0x" );
sTrace += OString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
SAL_INFO("svx", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 ));
#endif
DBG_ASSERT( _rxController.is(), "FmTextControlShell::formActivated: invalid controller!" );
@@ -1070,9 +1064,7 @@ namespace svx
void FmTextControlShell::formDeactivated( const Reference< runtime::XFormController >& _rxController )
{
#if OSL_DEBUG_LEVEL > 0
OString sTrace( "FmTextControlShell::formDeactivated: 0x" );
sTrace += OString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
SAL_INFO("svx", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 ));
#endif
(void)_rxController;
@@ -1160,7 +1152,7 @@ namespace svx
if ( m_xActiveTextComponent.is() )
{
OSL_TRACE( "FmTextControlShell::ClipBoard: stopping timer for clipboard invalidation" );
SAL_INFO("svx", "stopping timer for clipboard invalidation" );
m_aClipboardInvalidation.Stop();
}
// no more active control
@@ -1225,7 +1217,7 @@ namespace svx
if ( m_xActiveTextComponent.is() )
{
OSL_TRACE( "FmTextControlShell::ClipBoard: starting timer for clipboard invalidation" );
SAL_INFO("svx", "starting timer for clipboard invalidation" );
m_aClipboardInvalidation.Start();
}
@@ -1318,9 +1310,7 @@ namespace svx
Reference< css::awt::XControl > xControl( _rEvent.Source, UNO_QUERY );
#if OSL_DEBUG_LEVEL > 0
OString sTrace( "FmTextControlShell::focusGained: 0x" );
sTrace += OString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
SAL_INFO("svx", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 ));
#endif
DBG_ASSERT( xControl.is(), "FmTextControlShell::focusGained: suspicious focus event!" );
@@ -1334,9 +1324,7 @@ namespace svx
Reference< css::awt::XControl > xControl( _rEvent.Source, UNO_QUERY );
#if OSL_DEBUG_LEVEL > 0
OString sTrace( "FmTextControlShell::focusLost: 0x" );
sTrace += OString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
SAL_INFO("svx", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 ));
#endif
m_bActiveControl = false;
svx/source/gengal/gengal.cxx
+1 -1
View File
@@ -186,7 +186,7 @@ void GalApp::Init()
OUString envVar( "OOO_INSTALL_PREFIX");
osl_setEnvironment(envVar.pData, installPrefix.pData);
}
OSL_TRACE( "OOO_INSTALL_PREFIX=%s", getenv( "OOO_INSTALL_PREFIX" ) );
SAL_INFO("svx", "OOO_INSTALL_PREFIX=" << getenv( "OOO_INSTALL_PREFIX" ) );
uno::Reference<uno::XComponentContext> xComponentContext
= ::cppu::defaultBootstrap_InitialComponentContext();
svx/source/svdraw/svdotext.cxx
+2 -2
View File
@@ -1328,11 +1328,11 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, const Size& rTextSize,
nCurrStretchY = sal::static_int_cast<sal_uInt16>(nCurrStretchY*fFactor);
rOutliner.SetGlobalCharStretching(std::min(sal_uInt16(100),nCurrStretchX),
std::min(sal_uInt16(100),nCurrStretchY));
OSL_TRACE("SdrTextObj::onEditOutlinerStatusEvent(): zoom is %d", nCurrStretchX);
SAL_INFO("svx", "zoom is " << nCurrStretchX);
}
}
OSL_TRACE("---- SdrTextObj::onEditOutlinerStatusEvent(): final zoom is %d ----", nMinStretchX);
SAL_INFO("svx", "final zoom is " << nMinStretchX);
rOutliner.SetGlobalCharStretching(std::min(sal_uInt16(100),nMinStretchX),
std::min(sal_uInt16(100),nMinStretchY));
}
svx/source/table/accessiblecell.cxx
+2 -2
View File
@@ -336,7 +336,7 @@ css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException,
}
else
{
OSL_TRACE ("parent does not support component");
SAL_INFO("svx", "parent does not support component");
aBoundingBox = awt::Rectangle (aPixelPosition.getX(), aPixelPosition.getY(),aPixelSize.getWidth(), aPixelSize.getHeight());
}
}
@@ -370,7 +370,7 @@ css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeExce
}
else
{
OSL_TRACE ("getLocation: parent does not support XAccessibleComponent");
SAL_WARN("svx", "parent does not support XAccessibleComponent");
}
return aLocation;
svx/source/unodraw/unoshcol.cxx
+1 -1
View File
@@ -173,7 +173,7 @@ void SvxShapeCollection::dispose()
{
// in a multithreaded environment, it can't be avoided, that dispose is called twice.
// However this condition is traced, because it MAY indicate an error.
OSL_TRACE( "OComponentHelper::dispose() - dispose called twice" );
SAL_INFO("svx", "dispose called twice" );
}
}