diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-09-20 10:18:12 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-21 09:28:39 +0200 |
commit | be6a8677a6ddb6387272a78406ec2149c4319f3d (patch) | |
tree | 0e6be3608de08f831f596a5c2dc5a3590d4a62c6 /sd | |
parent | change font name in Thai fall-back font lists in VCL.xcu (diff) | |
download | core-be6a8677a6ddb6387272a78406ec2149c4319f3d.tar.gz core-be6a8677a6ddb6387272a78406ec2149c4319f3d.zip |
OSL_TRACE: Remove trailing newlines
Done with perl regex:
s/(\n\s*OSL_TRACE\(\s*\"[^\n]+?)\s*(\\n)+(\"[^\n]*\)\;\n)/$1$3/gs;
- removed trailing whitespaces and (multiple) newlines
Diffstat (limited to 'sd')
5 files changed, 18 insertions, 18 deletions
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 573330b753b0..84d9c8564e90 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -109,11 +109,11 @@ void ChangeRequestQueueProcessor::AddRequest ( #ifdef VERBOSE if (maQueue.empty()) { - OSL_TRACE("Adding requests to empty queue\n"); + OSL_TRACE("Adding requests to empty queue"); ConfigurationTracer::TraceConfiguration( mxConfiguration, "current configuration of queue processor"); } - OSL_TRACE("Adding request\n"); + OSL_TRACE("Adding request"); TraceRequest(rxRequest); #endif @@ -133,7 +133,7 @@ void ChangeRequestQueueProcessor::StartProcessing (void) && ! maQueue.empty()) { #ifdef VERBOSE - OSL_TRACE("ChangeRequestQueueProcessor scheduling processing\n"); + OSL_TRACE("ChangeRequestQueueProcessor scheduling processing"); #endif mnUserEventId = Application::PostUserEvent( LINK(this,ChangeRequestQueueProcessor,ProcessEvent)); @@ -170,7 +170,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void) ::osl::MutexGuard aGuard (maMutex); #ifdef VERBOSE - OSL_TRACE("ProcessOneEvent\n"); + OSL_TRACE("ProcessOneEvent"); #endif if (mxConfiguration.is() @@ -192,7 +192,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void) if (maQueue.empty()) { #ifdef VERBOSE - OSL_TRACE("All requests are processed\n"); + OSL_TRACE("All requests are processed"); #endif // The queue is empty so tell the ConfigurationManager to update // its state. diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 1724e764d506..52cc840d7179 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -185,7 +185,7 @@ void SAL_CALL ConfigurationController::disposing (void) return; #if defined VERBOSE && VERBOSE>=1 - OSL_TRACE("ConfigurationController::disposing\n"); + OSL_TRACE("ConfigurationController::disposing"); OSL_TRACE(" requesting empty configuration\n"); #endif // To destroy all resources an empty configuration is requested and then, @@ -194,7 +194,7 @@ void SAL_CALL ConfigurationController::disposing (void) restoreConfiguration(new Configuration(this,false)); mpImplementation->mpQueueProcessor->ProcessUntilEmpty(); #if defined VERBOSE && VERBOSE>=1 - OSL_TRACE(" all requests processed\n"); + OSL_TRACE(" all requests processed"); #endif // Now that all resources have been deactivated, mark the controller as @@ -550,7 +550,7 @@ void SAL_CALL ConfigurationController::restoreConfiguration ( // Get lists of resources that are to be activated or deactivated. Reference<XConfiguration> xCurrentConfiguration (mpImplementation->mxRequestedConfiguration); #if defined VERBOSE && VERBOSE>=1 - OSL_TRACE("ConfigurationController::restoreConfiguration(\n"); + OSL_TRACE("ConfigurationController::restoreConfiguration("); ConfigurationTracer::TraceConfiguration(rxNewConfiguration, "requested configuration"); ConfigurationTracer::TraceConfiguration(xCurrentConfiguration, "current configuration"); #endif diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index e1c285f149af..f4327aa6d43c 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -176,7 +176,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( if (xResource.is()) { #if defined VERBOSE && VERBOSE>=1 - OSL_TRACE(" successfully created\n"); + OSL_TRACE(" successfully created"); #endif // 3. Add resource to URL->Object map. AddResource(xResource, xFactory); @@ -193,7 +193,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( else { #if defined VERBOSE && VERBOSE>=1 - OSL_TRACE(" resource creation failed\n"); + OSL_TRACE(" resource creation failed"); #endif } } diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 57c887d6f02c..893c5068d450 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -366,7 +366,7 @@ void SlideSorterModel::Resync (void) && maPageDescriptors[nIndex]->GetPage() != GetPage(nIndex)) { - OSL_TRACE("page %d differs\n", nIndex); + OSL_TRACE("page %d differs", nIndex); bIsUpToDate = false; break; } diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 509d878d5ad9..8a95f112fad7 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -709,7 +709,7 @@ void ToolBarManager::Implementation::ResetToolBars (ToolBarGroup eGroup) void ToolBarManager::Implementation::ResetAllToolBars (void) { #ifdef VERBOSE - OSL_TRACE("resetting all tool bars\n"); + OSL_TRACE("resetting all tool bars"); #endif for (int i=TBG__FIRST; i<=TBG__LAST; ++i) ResetToolBars((ToolBarGroup)i); @@ -823,7 +823,7 @@ void ToolBarManager::Implementation::PreUpdate (void) } #ifdef VERBOSE - OSL_TRACE("ToolBarManager::PreUpdate ]\n"); + OSL_TRACE("ToolBarManager::PreUpdate ]"); #endif } } @@ -863,7 +863,7 @@ void ToolBarManager::Implementation::PostUpdate (void) } #ifdef VERBOSE - OSL_TRACE("ToolBarManager::PostUpdate ]\n"); + OSL_TRACE("ToolBarManager::PostUpdate ]"); #endif } } @@ -884,7 +884,7 @@ void ToolBarManager::Implementation::LockViewShellManager (void) void ToolBarManager::Implementation::LockUpdate (void) { #ifdef VERBOSE - OSL_TRACE("LockUpdate %d\n", mnLockCount); + OSL_TRACE("LockUpdate %d", mnLockCount); #endif ::osl::MutexGuard aGuard(maMutex); @@ -904,7 +904,7 @@ void ToolBarManager::Implementation::LockUpdate (void) void ToolBarManager::Implementation::UnlockUpdate (void) { #ifdef VERBOSE - OSL_TRACE("UnlockUpdate %d\n", mnLockCount); + OSL_TRACE("UnlockUpdate %d", mnLockCount); #endif ::osl::MutexGuard aGuard(maMutex); @@ -1665,7 +1665,7 @@ void ToolBarShellList::UpdateShells ( for (GroupedShellList::iterator iShell=aList.begin(); iShell!=aList.end(); ++iShell) { #ifdef VERBOSE - OSL_TRACE("deactivating tool bar shell %d\n", iShell->mnId); + OSL_TRACE("deactivating tool bar shell %d", iShell->mnId); #endif rpManager->DeactivateSubShell(*rpMainViewShell, iShell->mnId); } @@ -1679,7 +1679,7 @@ void ToolBarShellList::UpdateShells ( for (GroupedShellList::iterator iShell=aList.begin(); iShell!=aList.end(); ++iShell) { #ifdef VERBOSE - OSL_TRACE("activating tool bar shell %d\n", iShell->mnId); + OSL_TRACE("activating tool bar shell %d", iShell->mnId); #endif rpManager->ActivateSubShell(*rpMainViewShell, iShell->mnId); } |