[Libreoffice-commits] core.git: avmedia/source basic/source canvas/source editeng/source odk/examples sal/osl scripting/source sc/source sdext/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Dec 13 06:14:40 UTC 2016
avmedia/source/macavf/framegrabber.mm | 5 -
avmedia/source/macavf/manager.mm | 3 -
avmedia/source/macavf/player.mm | 29 +---------
avmedia/source/macavf/window.mm | 7 --
basic/source/basmgr/basmgr.cxx | 1
basic/source/classes/errobject.cxx | 2
basic/source/classes/sb.cxx | 7 --
basic/source/classes/sbunoobj.cxx | 2
basic/source/comp/codegen.cxx | 3 -
basic/source/comp/parser.cxx | 1
basic/source/comp/scanner.cxx | 1
basic/source/runtime/dllmgr-x64.cxx | 2
basic/source/runtime/dllmgr-x86.cxx | 2
basic/source/sbx/sbxscan.cxx | 2
basic/source/uno/scriptcont.cxx | 2
canvas/source/cairo/cairo_canvashelper_text.cxx | 3 -
canvas/source/tools/surface.cxx | 6 --
editeng/source/accessibility/AccessibleContextBase.cxx | 3 -
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 2
sal/osl/all/loadmodulerelative.cxx | 4 -
sc/source/ui/vba/vbaglobals.cxx | 2
sc/source/ui/vba/vbahelper.cxx | 10 ---
scripting/source/provider/URIHelper.cxx | 5 -
sdext/source/pdfimport/tree/genericelements.cxx | 18 +++---
24 files changed, 22 insertions(+), 100 deletions(-)
New commits:
commit 3a705ab40597f7cb584bdeaef06701b289f911f1
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Dec 13 08:07:40 2016 +0200
OSL_TRACE->SAL in avmedia..canvas
Change-Id: Id9077ea29e7028c12f40abfd4c57756c863e3cd9
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index d951209..b4022caf 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -51,7 +51,7 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
AVAsset* pMovie = [AVURLAsset URLAssetWithURL:pNSURL options:nil];
if( !pMovie )
{
- OSL_TRACE( "AVGrabber::create() cannot load url=\"%s\"", [pNSStr UTF8String] );
+ SAL_WARN("avmedia", "AVGrabber::create() cannot load url=" << [pNSStr UTF8String] );
return false;
}
@@ -63,7 +63,7 @@ bool FrameGrabber::create( AVAsset* pMovie )
{
if( [[pMovie tracksWithMediaType:AVMediaTypeVideo] count] == 0)
{
- OSL_TRACE( "AVGrabber::create() found no video content!" );
+ SAL_WARN("avmedia", "AVGrabber::create() found no video content!" );
return false;
}
@@ -79,7 +79,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
uno::Reference< graphic::XGraphic > xRet;
if( !mpImageGen )
return xRet;
- OSL_TRACE( "AVPlayer::grabFrame( %.3fsec)", fMediaTime );
// get the requested image from the movie
CGImage* pCGImage = [mpImageGen copyCGImageAtTime:CMTimeMakeWithSeconds(fMediaTime,1000) actualTime:nullptr error:nullptr];
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index a8ff2ec..5df4af8 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -29,7 +29,6 @@ namespace avmedia { namespace macavf {
Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
- OSL_TRACE( "Constructing avmedia::macavf::Manager" );
}
@@ -44,8 +43,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
uno::Reference< media::XPlayer > xRet( pPlayer );
INetURLObject aURL( rURL );
- OSL_TRACE( "avmediamacavf: Manager::createPlayer" );
-
if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) ) )
xRet.clear();
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 48be439..7bf7494 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
{
(void) pObject;
NSString* pDictStr = [NSString stringWithFormat:@"%@", pChangeDict];
- OSL_TRACE( "MacAVObserver::onKeyChange k=\"%s\" c=%s", [pKeyPath UTF8String], [pDictStr UTF8String]);
avmedia::macavf::MacAVObserverHandler* pHandler = static_cast<avmedia::macavf::MacAVObserverHandler*>(pContext);
pHandler->handleObservation( pKeyPath );
}
@@ -39,7 +38,6 @@ using namespace ::com::sun::star;
- (void)onNotification:(NSNotification*)pNotification
{
NSString* pNoteName = (NSString*)[pNotification name];
- OSL_TRACE( "MacAVObserver::onNotification key=\"%s\"", [pNoteName UTF8String]);
HandlersForObject::iterator it = maHandlersForObject.find( [pNotification object]);
if( it != maHandlersForObject.end() )
(*it).second->handleObservation( pNoteName );
@@ -101,10 +99,8 @@ Player::~Player()
bool Player::handleObservation( NSString* pKeyPath )
{
- OSL_TRACE( "AVPlayer::handleObservation key=\"%s\"", [pKeyPath UTF8String]);
if( [pKeyPath isEqualToString:AVPlayerItemDidPlayToEndTimeNotification])
{
- OSL_TRACE( "AVPlayer replay=%d", mbLooping);
if( mbLooping )
setMediaTime( 0.0);
}
@@ -162,14 +158,8 @@ void SAL_CALL Player::start()
{
if( !mpPlayer )
return;
-#if 0
- const AVPlayerStatus eStatus = [mpPlayer status];
- OSL_TRACE ("Player::start status=%d", (int)eStatus);
- if( eStatus == AVPlayerStatusReadyToPlay)
-#endif
- {
- [mpPlayer play];
- }
+
+ [mpPlayer play];
// else // TODO: delay until it becomes ready
}
@@ -180,7 +170,6 @@ void SAL_CALL Player::stop()
if( !mpPlayer )
return;
const bool bPlaying = isPlaying();
- OSL_TRACE ("Player::stop() playing=%d", bPlaying);
if( bPlaying )
[mpPlayer pause];
}
@@ -218,7 +207,6 @@ double SAL_CALL Player::getDuration()
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
{
- OSL_TRACE ("Player::setMediaTime( %.3fsec)", fTime);
if( mpPlayer )
[mpPlayer seekToTime: CMTimeMakeWithSeconds(fTime,1000) ];
}
@@ -231,7 +219,6 @@ double SAL_CALL Player::getMediaTime()
return 0.0;
const double position = CMTimeGetSeconds( [mpPlayer currentTime] );
- OSL_TRACE( "Player::getMediaTime() = %.3fsec", position);
if( position >= mfStopTime )
if( isPlaying() )
stop();
@@ -243,7 +230,6 @@ double SAL_CALL Player::getMediaTime()
void SAL_CALL Player::setStopTime( double fTime )
throw (uno::RuntimeException)
{
- OSL_TRACE ("Player::setStopTime( %.3fsec)", fTime);
mfStopTime = fTime;
}
@@ -258,7 +244,6 @@ double SAL_CALL Player::getStopTime()
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException)
{
- OSL_TRACE ("Player::setPlaybackLoop( %d)", bSet );
mbLooping = bSet;
}
@@ -266,17 +251,13 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
sal_Bool SAL_CALL Player::isPlaybackLoop()
throw (uno::RuntimeException)
{
- const bool bRet = mbLooping;
- OSL_TRACE ("Player::isPlaybackLoop() = %d", bRet );
- return bRet;
+ return mbLooping;
}
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException)
{
- OSL_TRACE( "Player::setMute(%d), was-muted: %d unmuted-volume: %.3f", bSet, mbMuted, mfUnmutedVolume );
-
if( !mpPlayer )
return;
@@ -288,7 +269,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
sal_Bool SAL_CALL Player::isMute()
throw (uno::RuntimeException)
{
- OSL_TRACE ("Player::isMuted() = %d", mbMuted);
return mbMuted;
}
@@ -299,7 +279,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
// -40dB <-> AVPlayer volume 0.0
// 0dB <-> AVPlayer volume 1.0
mfUnmutedVolume = (nVolumeDB <= -40) ? 0.0 : pow( 10.0, nVolumeDB / 20.0 );
- OSL_TRACE( "Player::setVolume(%ddB), muted=%d, unmuted-volume: %.3f", nVolumeDB, mbMuted, mfUnmutedVolume );
// change volume
if( !mbMuted && mpPlayer )
@@ -348,7 +327,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
{
// get the preferred window size
const awt::Size aSize( getPreferredPlayerWindowSize() );
- OSL_TRACE( "Player::createPlayerWindow %dx%d argsLength: %d", aSize.Width, aSize.Height, aArguments.getLength() );
// get the parent view
sal_IntPtr nNSViewPtr = 0;
@@ -371,7 +349,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
throw (uno::RuntimeException)
{
uno::Reference< media::XFrameGrabber > xRet;
- OSL_TRACE ("Player::createFrameGrabber");
FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
AVAsset* pMovie = [[mpPlayer currentItem] asset];
diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index ba97063..6b3f354 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -37,7 +37,6 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Pla
, mpView( i_pParentView )
, mpPlayerLayer( nullptr )
{
- OSL_TRACE ("Constructing an avmedia::macavf::Window");
if( !mpView ) // sanity check
return;
@@ -46,7 +45,6 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Pla
AVAsset* pMovie = [[pAVPlayer currentItem] asset];
const int nVideoCount = [pMovie tracksWithMediaType:AVMediaTypeVideo].count;
const int nAudioCount = [pMovie tracksWithMediaType:AVMediaTypeAudio].count;
- OSL_TRACE( "Found %d video and %d audio tracks.", nVideoCount, nAudioCount );
(void)nAudioCount;
if( nVideoCount <= 0 )
return;
@@ -77,7 +75,6 @@ Window::~Window()
bool Window::handleObservation( NSString* pKeyPath )
{
- OSL_TRACE( "AVPlayer::handleObservation key=\"%s\"", [pKeyPath UTF8String]);
const BOOL bReadyForDisplay = [mpPlayerLayer isReadyForDisplay];
[mpPlayerLayer setHidden:!bReadyForDisplay];
return true;
@@ -115,7 +112,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 /* Flags */ )
throw (uno::RuntimeException)
{
- OSL_TRACE( "AVWindow::setPosSize( %dx%d%+d%+d)", (int)Width,(int)Height,(int)X,(int)Y);//######
if( !mpView )
return;
NSRect aRect = [mpView frame];
@@ -147,21 +143,18 @@ awt::Rectangle SAL_CALL Window::getPosSize()
void SAL_CALL Window::setVisible( sal_Bool bVisible )
throw (uno::RuntimeException)
{
- OSL_TRACE ("Window::setVisible(%d)", bVisible);
}
void SAL_CALL Window::setEnable( sal_Bool bEnable )
throw (uno::RuntimeException)
{
- OSL_TRACE ("Window::setEnable(%d)", bEnable);
}
void SAL_CALL Window::setFocus()
throw (uno::RuntimeException)
{
- OSL_TRACE ("Window::setFocus");
}
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 236c14e..5df35bc 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -207,7 +207,6 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr,
if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( aModuleName ) )
{
ModuleInfo aInfo = xVBAModuleInfo->getModuleInfo( aModuleName );
- OSL_TRACE("#addLibraryModulesImpl - aMod");
pLib->MakeModule( aModuleName, aInfo, aMod );
}
else
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 19f1213..190aec3 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -170,7 +170,6 @@ SbxErrObject::SbxErrObject( const OUString& rName, const uno::Any& rUnoObj )
: SbUnoObject( rName, rUnoObj )
, m_pErrObject( nullptr )
{
- OSL_TRACE("SbxErrObject::SbxErrObject ctor");
rUnoObj >>= m_xErr;
if ( m_xErr.is() )
{
@@ -181,7 +180,6 @@ SbxErrObject::SbxErrObject( const OUString& rName, const uno::Any& rUnoObj )
SbxErrObject::~SbxErrObject()
{
- OSL_TRACE("SbxErrObject::~SbxErrObject dtor");
}
uno::Reference< vba::XErrObject > const &
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index b991514..e587522 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1950,7 +1950,7 @@ Reference< frame::XModel > StarBASIC::GetModelFromBasic( SbxObject* pBasic )
}
if ( !pThisComponent )
{
- OSL_TRACE("Failed to get ThisComponent");
+ SAL_WARN("basic", "Failed to get ThisComponent");
// the application Basic, at the latest, should have this variable
return nullptr;
}
@@ -1970,11 +1970,6 @@ Reference< frame::XModel > StarBASIC::GetModelFromBasic( SbxObject* pBasic )
{
return nullptr;
}
-#if OSL_DEBUG_LEVEL > 0
- OSL_TRACE("Have model ThisComponent points to url %s",
- OUStringToOString( xModel->getURL(),
- RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-#endif
return xModel;
}
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 18c0009..56d07c3 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -152,7 +152,6 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj )
if ( SbUnoObject::getDefaultPropName( pUnoObj, sDfltPropName ) )
{
- OSL_TRACE("SetSbUnoObjectDfltPropName setting default prop for %s", OUStringToOString( pObj->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
pUnoObj->SetDfltProperty( sDfltPropName );
}
}
@@ -1713,7 +1712,6 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const OUString& rClass)
}
// match interface name with passed class name
- OSL_TRACE("Checking if object implements %s", OUStringToOString( aClassName, RTL_TEXTENCODING_UTF8 ).getStr() );
if ( (aClassName.getLength() <= aInterfaceName.getLength()) &&
aInterfaceName.endsWithIgnoreAsciiCase( aClassName ) )
{
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index c114d60..94e1356 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -143,7 +143,6 @@ void SbiCodeGen::Save()
int nIfaceCount = 0;
if( rMod.mnType == css::script::ModuleType::CLASS )
{
- OSL_TRACE("COdeGen::save() classmodule processing");
rMod.bIsProxyModule = true;
p->SetFlag( SbiImageFlags::CLASSMODULE );
GetSbData()->pClassFac->AddClassModule( &rMod );
@@ -262,8 +261,6 @@ void SbiCodeGen::Save()
{
aPropName = aPropName.copy( aIfaceName.getLength() + 1 );
}
- OSL_TRACE("*** getProcedureProperty for thing %s",
- OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() );
rMod.GetProcedureProperty( aPropName, ePropType );
}
if( nPass == 1 )
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 1dda3110..da7048d 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -130,7 +130,6 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
bCodeCompleting =
bExplicit = false;
bClassModule = ( pm->GetModuleType() == css::script::ModuleType::CLASS );
- OSL_TRACE("Parser - %s, bClassModule %d", OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule );
pPool = &aPublics;
for(SbxDataType & eDefType : eDefTypes)
eDefType = SbxVARIANT; // no explicit default type
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index bb263a8..092a239e 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -574,7 +574,6 @@ eoln:
// object _
// .Method
// ^^^ <- spaces is legal in MSO VBA
- OSL_TRACE("*** resetting bSpaces***");
bSpaces = false;
}
return bRes;
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 5ef5f36..4c8a040 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -690,7 +690,7 @@ public:
Dll::~Dll() {
if (handle != nullptr && !FreeLibrary(handle)) {
- OSL_TRACE("FreeLibrary(%p) failed with %u", handle, GetLastError());
+ SAL_WARN("basic", "FreeLibrary(" << handle << ") failed with " << GetLastError());
}
}
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index fd41317..7cc4c91 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -644,7 +644,7 @@ public:
Dll::~Dll() {
if (handle != 0 && !FreeLibrary(handle)) {
- OSL_TRACE("FreeLibrary(%p) failed with %u", handle, GetLastError());
+ SAL_WARN("basic", "FreeLibrary(" << handle << ") failed with " << GetLastError());
}
}
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 411d1f0..d06f4e0 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -257,7 +257,7 @@ SbxError ImpScan( const OUString& rWSrc, double& nVal, SbxDataType& rType,
#if HAVE_FEATURE_SCRIPTING
else if ( SbiRuntime::isVBAEnabled() )
{
- OSL_TRACE("Reporting error converting");
+ SAL_WARN("basic", "Reporting error converting");
return ERRCODE_SBX_CONVERSION;
}
#endif
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index e08e1e6..b50153e 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -311,7 +311,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
}
catch(const uno::Exception&)
{
- OSL_TRACE("Failed to get document object for %s", OUStringToOString( aElementName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_WARN("basic", "Failed to get document object for " << aElementName );
}
}
}
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index ff4edd1..72084ae 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -300,9 +300,6 @@ namespace cairocanvas
clip_cairo_from_dev(*mpVirtualDevice);
- OSL_TRACE(":cairocanvas::CanvasHelper::drawText(O,t,f,v,r,d): %s", OUStringToOString( text.Text.copy( text.StartPosition, text.Length ),
- RTL_TEXTENCODING_UTF8 ).getStr());
-
rtl::Reference< TextLayout > pTextLayout( new TextLayout(text, textDirection, 0, CanvasFont::Reference(dynamic_cast< CanvasFont* >( xFont.get() )), mpSurfaceProvider) );
pTextLayout->draw(mpCairo, *mpVirtualDevice, aOutpos, viewState, renderState);
}
diff --git a/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx
index ec924f7..e596ea5 100644
--- a/canvas/source/tools/surface.cxx
+++ b/canvas/source/tools/surface.cxx
@@ -379,12 +379,6 @@ namespace canvas
vertex.a = static_cast<float>(fAlpha);
vertex.z = 0.0f;
-#if defined(TRIANGLE_LOG) && defined(DBG_UTIL)
- OSL_TRACE( "Surface::draw(): numvertices %d numtriangles %d\n",
- nVertexCount,
- nVertexCount/3 );
-#endif
-
pRenderModule->beginPrimitive( canvas::IRenderModule::PrimitiveType::Triangle );
// issue an endPrimitive() when leaving the scope
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index eea5451..57d9f36 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -147,8 +147,6 @@ void AccessibleContextBase::SetRelationSet (
const uno::Reference<XAccessibleRelationSet>& rxNewRelationSet)
throw (css::uno::RuntimeException)
{
- OSL_TRACE ("setting relation set");
-
// Try to emit some meaningfull events indicating differing relations in
// both sets.
typedef std::pair<short int,short int> RD;
@@ -571,7 +569,6 @@ void AccessibleContextBase::ThrowIfDisposed()
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
- OSL_TRACE ("Calling disposed object. Throwing exception:");
throw lang::DisposedException ("object has been already disposed",
static_cast<uno::XWeak*>(this));
}
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index 5d3eb2c..4b23c4e 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -327,8 +327,6 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
break;
}
}
- OSL_TRACE( "Dropdownbox control - selected entry text : %s",
- rtl::OUStringToOString( aText, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
}
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index ef3df35..bc599c5 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -48,9 +48,7 @@ oslModule SAL_CALL osl_loadModuleRelative(
abs = rtl::Uri::convertRelToAbs(base, relativePath);
} catch (const rtl::MalformedUriException & e) {
(void) e; // avoid warnings
- SAL_INFO("sal.osl",
- "rtl::MalformedUriException <" << e.getMessage() << ">");
- //TODO: let some OSL_TRACE variant take care of text conversion?
+ SAL_INFO("sal.osl", "rtl::MalformedUriException <" << e.getMessage() << ">");
return nullptr;
}
return osl_loadModule(abs.pData, mode);
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index 12e8230..b015950 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -58,7 +58,6 @@ ScVbaGlobals::~ScVbaGlobals()
uno::Reference<excel::XApplication > const &
ScVbaGlobals::getApplication() throw (uno::RuntimeException)
{
-// SAL_WARNx("sc", "In ScVbaGlobals::getApplication");
if ( !mxApplication.is() )
mxApplication.set( new ScVbaApplication( mxContext) );
return mxApplication;
@@ -73,7 +72,6 @@ ScVbaGlobals::getExcel() throw (uno::RuntimeException, std::exception)
uno::Reference< excel::XWorkbook > SAL_CALL
ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception)
{
-// SAL_WARNx("sc", "In ScVbaGlobals::getActiveWorkbook");
uno::Reference< excel::XWorkbook > xWorkbook( getApplication()->getActiveWorkbook(), uno::UNO_QUERY);
if ( xWorkbook.is() )
{
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index 2c2e6bb..65dc4cc 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -236,7 +236,7 @@ getCurrentDocument() throw (uno::RuntimeException)
SbxObject* basicChosen = pBasic ;
if ( basicChosen == NULL)
{
- SAL_WARNx("sc", "getModelFromBasic() StarBASIC* is NULL" );
+ SAL_WARN("sc", "getModelFromBasic() StarBASIC* is NULL" );
return xModel;
}
SbxObject* p = pBasic;
@@ -272,16 +272,10 @@ getCurrentDocument() throw (uno::RuntimeException)
}
return xModel;
}
- else
- {
- SAL_WARNx("sc", "Have model ThisComponent points to url %s",
- OUStringToOString( xModel->getURL(),
- RTL_TEXTENCODING_ASCII_US ).pData->buffer );
- }
}
else
{
- SAL_WARNx("sc", "Failed to get ThisComponent");
+ SAL_WARN("sc", "Failed to get ThisComponent");
throw uno::RuntimeException( "Can't determine the currently selected document" );
}
return xModel;
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 3d51a8f..f205e6c 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -152,13 +152,8 @@ ScriptingFrameworkURIHelper::initBaseURI()
OUString child = children[i];
sal_Int32 idx = child.lastIndexOf(test);
- // SAL_WARNx("scripting", "Trying: %s", PRTSTR(child));
- // SAL_WARNx("scripting", "idx=%d, testlen=%d, children=%d",
- // idx, test.getLength(), child.getLength());
-
if ( idx != -1 && (idx + test.getLength()) == child.getLength() )
{
- // SAL_WARNx("scripting", "FOUND PATH: %s", PRTSTR(child));
if ( bAppendScriptsPart )
{
m_sBaseURI = child.concat( SCRIPTS_PART );
diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx
index c5c61a4..1ffc3c1b 100644
--- a/sdext/source/pdfimport/tree/genericelements.cxx
+++ b/sdext/source/pdfimport/tree/genericelements.cxx
@@ -90,12 +90,11 @@ void Element::updateGeometryWith( const Element* pMergeFrom )
#include <typeinfo>
void Element::emitStructure( int nLevel)
{
- OSL_TRACE( "%*s<%s %p> (%.1f,%.1f)+(%.1fx%.1f)\n",
- nLevel, "", typeid( *this ).name(), this,
- x, y, w, h );
+ SAL_INFO( "sdext", std::string(nLevel, ' ') << "<" << typeid( *this ).name() << " " << this << "> ("
+ << std::setprecision(1) << x << "," << y << ")+(" << w << "x" << h << ")" );
for( std::list< Element* >::iterator it = Children.begin(); it != Children.end(); ++it )
(*it)->emitStructure(nLevel+1 );
- OSL_TRACE( "%*s</%s>", nLevel, "", typeid( *this ).name() );
+ SAL_INFO( "sdext", std::string(nLevel, ' ') << "</" << typeid( *this ).name() << ">" );
}
#endif
@@ -165,23 +164,24 @@ void PolyPolyElement::visitedBy( ElementTreeVisitor& rV
#if OSL_DEBUG_LEVEL > 0
void PolyPolyElement::emitStructure( int nLevel)
{
- OSL_TRACE( "%*s<%s %p>", nLevel, "", typeid( *this ).name(), this );
- OSL_TRACE( "path=" );
+ SAL_WARN( "sdext", std::string(nLevel, ' ') << "<" << typeid( *this ).name() << " " << this << ">" );
+ SAL_WARN( "sdext", "path=" );
int nPoly = PolyPoly.count();
for( int i = 0; i < nPoly; i++ )
{
+ OUStringBuffer buff;
basegfx::B2DPolygon aPoly = PolyPoly.getB2DPolygon( i );
int nPoints = aPoly.count();
for( int n = 0; n < nPoints; n++ )
{
basegfx::B2DPoint aPoint = aPoly.getB2DPoint( n );
- OSL_TRACE( " (%g,%g)", aPoint.getX(), aPoint.getY() );
+ buff.append( " (").append(aPoint.getX()).append(",").append(aPoint.getY()).append(")");
}
- OSL_TRACE( "\n" );
+ SAL_WARN( "sdext", " " << buff.makeStringAndClear() );
}
for( std::list< Element* >::iterator it = Children.begin(); it != Children.end(); ++it )
(*it)->emitStructure( nLevel+1 );
- OSL_TRACE( "%*s</%s>", nLevel, "", typeid( *this ).name() );
+ SAL_WARN( "sdext", std::string(nLevel, ' ') << "</" << typeid( *this ).name() << ">");
}
#endif
More information about the Libreoffice-commits
mailing list