summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx12
-rw-r--r--sd/source/ui/framework/configuration/Configuration.cxx4
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationClassifier.cxx12
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationController.cxx14
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx16
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.cxx18
-rw-r--r--sd/source/ui/framework/module/ModuleController.cxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx2
-rw-r--r--sd/source/ui/tools/TimerBasedTaskExecution.cxx6
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx26
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx20
13 files changed, 73 insertions, 73 deletions
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 741e2607eee8..5cd99fbc1cb4 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -41,7 +41,7 @@ void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest)
{
Reference<container::XNamed> xNamed (rxRequest, UNO_QUERY);
if (xNamed.is())
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << xNamed->getName());
+ SAL_INFO("sd.fwk", __func__ << ": " << xNamed->getName());
}
#endif
@@ -83,11 +83,11 @@ void ChangeRequestQueueProcessor::AddRequest (
#if DEBUG_SD_CONFIGURATION_TRACE
if (maQueue.empty())
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Adding requests to empty queue");
+ SAL_INFO("sd.fwk", __func__ << ": Adding requests to empty queue");
ConfigurationTracer::TraceConfiguration(
mxConfiguration, "current configuration of queue processor");
}
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Adding request");
+ SAL_INFO("sd.fwk", __func__ << ": Adding request");
TraceRequest(rxRequest);
#endif
@@ -103,7 +103,7 @@ void ChangeRequestQueueProcessor::StartProcessing()
&& mxConfiguration.is()
&& ! maQueue.empty())
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ChangeRequestQueueProcessor scheduling processing");
+ SAL_INFO("sd.fwk", __func__ << ": ChangeRequestQueueProcessor scheduling processing");
mnUserEventId = Application::PostUserEvent(
LINK(this,ChangeRequestQueueProcessor,ProcessEvent));
}
@@ -128,7 +128,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent()
{
::osl::MutexGuard aGuard (maMutex);
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ProcessOneEvent");
+ SAL_INFO("sd.fwk", __func__ << ": ProcessOneEvent");
if (!mxConfiguration.is() || maQueue.empty())
return;
@@ -149,7 +149,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent()
if (!maQueue.empty())
return;
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": All requests are processed");
+ SAL_INFO("sd.fwk", __func__ << ": All requests are processed");
// The queue is empty so tell the ConfigurationManager to update
// its state.
if (mpConfigurationUpdater != nullptr)
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 05f5d924b9c1..53bbaa339316 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -102,7 +102,7 @@ void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResour
if (mpResourceContainer->insert(rxResourceId).second)
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Configuration::addResource() " <<
+ SAL_INFO("sd.fwk", __func__ << ": Configuration::addResource() " <<
FrameworkHelper::ResourceIdToString(rxResourceId));
PostEvent(rxResourceId, true);
}
@@ -118,7 +118,7 @@ void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxRes
ResourceContainer::iterator iResource (mpResourceContainer->find(rxResourceId));
if (iResource != mpResourceContainer->end())
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Configuration::removeResource() " <<
+ SAL_INFO("sd.fwk", __func__ << ": Configuration::removeResource() " <<
FrameworkHelper::ResourceIdToString(rxResourceId));
PostEvent(rxResourceId,false);
mpResourceContainer->erase(iResource);
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index 443757793685..e2b799a0c912 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -68,9 +68,9 @@ void ConfigurationClassifier::PartitionResources (
aC2minusC1,
aC1andC2);
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": copying resource ids to C1-C2");
+ SAL_INFO("sd.fwk", __func__ << ": copying resource ids to C1-C2");
CopyResources(aC1minusC2, mxConfiguration1, maC1minusC2);
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": copying resource ids to C2-C1");
+ SAL_INFO("sd.fwk", __func__ << ": copying resource ids to C2-C1");
CopyResources(aC2minusC1, mxConfiguration2, maC2minusC1);
// Process the unique resources that belong to both configurations.
@@ -135,13 +135,13 @@ void ConfigurationClassifier::CopyResources (
rTarget.reserve(rTarget.size() + 1 + nL);
rTarget.push_back(rxResource);
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": copying " <<
+ SAL_INFO("sd.fwk", __func__ << ": copying " <<
FrameworkHelper::ResourceIdToString(rxResource));
for (const Reference<XResourceId>& rBoundResource : aBoundResources)
{
rTarget.push_back(rBoundResource);
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": copying " <<
+ SAL_INFO("sd.fwk", __func__ << ": copying " <<
FrameworkHelper::ResourceIdToString(rBoundResource));
}
}
@@ -154,11 +154,11 @@ void ConfigurationClassifier::TraceResourceIdVector (
const ResourceIdVector& rResources)
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << pMessage);
+ SAL_INFO("sd.fwk", __func__ << ": " << pMessage);
for (const auto& rxResource : rResources)
{
OUString sResource (FrameworkHelper::ResourceIdToString(rxResource));
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << sResource);
+ SAL_INFO("sd.fwk", __func__ << ": " << sResource);
}
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 023605ed625f..470d9777f7f6 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -117,14 +117,14 @@ void SAL_CALL ConfigurationController::disposing()
if (mpImplementation == nullptr)
return;
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::disposing");
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": requesting empty configuration");
+ SAL_INFO("sd.fwk", __func__ << ": ConfigurationController::disposing");
+ SAL_INFO("sd.fwk", __func__ << ": requesting empty configuration");
// To destroy all resources an empty configuration is requested and then,
// synchronously, all resulting requests are processed.
mpImplementation->mpQueueProcessor->Clear();
restoreConfiguration(new Configuration(this,false));
mpImplementation->mpQueueProcessor->ProcessUntilEmpty();
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": all requests processed");
+ SAL_INFO("sd.fwk", __func__ << ": all requests processed");
// Now that all resources have been deactivated, mark the controller as
// disposed.
@@ -238,12 +238,12 @@ void SAL_CALL ConfigurationController::requestResourceActivation (
// we just return silently during that stage.
if (rBHelper.bInDispose)
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::requestResourceActivation(): ignoring " <<
+ SAL_INFO("sd.fwk", __func__ << ": ConfigurationController::requestResourceActivation(): ignoring " <<
FrameworkHelper::ResourceIdToString(rxResourceId));
return;
}
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::requestResourceActivation() " <<
+ SAL_INFO("sd.fwk", __func__ << ": ConfigurationController::requestResourceActivation() " <<
FrameworkHelper::ResourceIdToString(rxResourceId));
if (!rxResourceId.is())
@@ -286,7 +286,7 @@ void SAL_CALL ConfigurationController::requestResourceDeactivation (
::osl::MutexGuard aGuard (maMutex);
ThrowIfDisposed();
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::requestResourceDeactivation() " <<
+ SAL_INFO("sd.fwk", __func__ << ": ConfigurationController::requestResourceDeactivation() " <<
FrameworkHelper::ResourceIdToString(rxResourceId));
if (!rxResourceId.is())
@@ -404,7 +404,7 @@ void SAL_CALL ConfigurationController::restoreConfiguration (
// Get lists of resources that are to be activated or deactivated.
Reference<XConfiguration> xCurrentConfiguration (mpImplementation->mxRequestedConfiguration);
#if OSL_DEBUG_LEVEL >=1
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::restoreConfiguration(");
+ SAL_INFO("sd.fwk", __func__ << ": 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 98842a1d8994..904011d7d5c0 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -107,7 +107,7 @@ void ConfigurationControllerResourceManager::ActivateResource (
return;
}
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " <<
+ SAL_INFO("sd.fwk", __func__ << ": activating resource " <<
FrameworkHelper::ResourceIdToString(rxResourceId));
// 1. Get the factory.
@@ -115,7 +115,7 @@ void ConfigurationControllerResourceManager::ActivateResource (
Reference<XResourceFactory> xFactory (mpResourceFactoryContainer->GetFactory(sResourceURL));
if ( ! xFactory.is())
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": no factory found for " << sResourceURL);
+ SAL_INFO("sd.fwk", __func__ << ": no factory found for " << sResourceURL);
return;
}
@@ -137,7 +137,7 @@ void ConfigurationControllerResourceManager::ActivateResource (
if (xResource.is())
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": successfully created");
+ SAL_INFO("sd.fwk", __func__ << ": successfully created");
// 3. Add resource to URL->Object map.
AddResource(xResource, xFactory);
@@ -152,7 +152,7 @@ void ConfigurationControllerResourceManager::ActivateResource (
}
else
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": resource creation failed");
+ SAL_INFO("sd.fwk", __func__ << ": resource creation failed");
}
}
catch (RuntimeException&)
@@ -230,10 +230,10 @@ void ConfigurationControllerResourceManager::DeactivateResource (
#if OSL_DEBUG_LEVEL >= 1
if (bSuccess)
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": successfully deactivated " <<
+ SAL_INFO("sd.fwk", __func__ << ": successfully deactivated " <<
FrameworkHelper::ResourceIdToString(rxResourceId));
else
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " <<
+ SAL_INFO("sd.fwk", __func__ << ": activating resource " <<
FrameworkHelper::ResourceIdToString(rxResourceId)
<< " failed");
#endif
@@ -256,7 +256,7 @@ void ConfigurationControllerResourceManager::AddResource (
maResourceMap[rxResource->getResourceId()] = aDescriptor;
#if OSL_DEBUG_LEVEL >= 2
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationControllerResourceManager::AddResource(): added " <<
+ SAL_INFO("sd.fwk", __func__ << ": ConfigurationControllerResourceManager::AddResource(): added " <<
FrameworkHelper::ResourceIdToString(rxResource->getResourceId()) <<
" -> " << rxResource.get());
#endif
@@ -272,7 +272,7 @@ ConfigurationControllerResourceManager::ResourceDescriptor
if (iResource != maResourceMap.end())
{
#if OSL_DEBUG_LEVEL >= 2
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationControllerResourceManager::RemoveResource(): removing " <<
+ SAL_INFO("sd.fwk", __func__ << ": ConfigurationControllerResourceManager::RemoveResource(): removing " <<
FrameworkHelper::ResourceIdToString(rxResourceId) <<
" -> " << &iResource);
#endif
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 6083757b4087..8b536831561d 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -98,7 +98,7 @@ void ConfigurationUpdater::RequestUpdate (
// Find out whether we really can update the configuration.
if (IsUpdatePossible())
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration start");
+ SAL_INFO("sd.fwk", __func__ << ": UpdateConfiguration start");
// Call UpdateConfiguration while that is possible and while someone
// set mbUpdatePending to true in the middle of it.
@@ -111,7 +111,7 @@ void ConfigurationUpdater::RequestUpdate (
else
{
mbUpdatePending = true;
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": scheduling update for later");
+ SAL_INFO("sd.fwk", __func__ << ": scheduling update for later");
}
}
@@ -126,7 +126,7 @@ bool ConfigurationUpdater::IsUpdatePossible() const
void ConfigurationUpdater::UpdateConfiguration()
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration update");
+ SAL_INFO("sd.fwk", __func__ << ": UpdateConfiguration update");
SetUpdateBeingProcessed(true);
comphelper::ScopeGuard aScopeGuard (
[this] () { return this->SetUpdateBeingProcessed(false); });
@@ -140,7 +140,7 @@ void ConfigurationUpdater::UpdateConfiguration()
if (aClassifier.Partition())
{
#if DEBUG_SD_CONFIGURATION_TRACE
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationUpdater::UpdateConfiguration(");
+ SAL_INFO("sd.fwk", __func__ << ": ConfigurationUpdater::UpdateConfiguration(");
ConfigurationTracer::TraceConfiguration(
mxRequestedConfiguration, "requested configuration");
ConfigurationTracer::TraceConfiguration(
@@ -171,7 +171,7 @@ void ConfigurationUpdater::UpdateConfiguration()
}
else
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": nothing to do");
+ SAL_INFO("sd.fwk", __func__ << ": nothing to do");
#if DEBUG_SD_CONFIGURATION_TRACE
ConfigurationTracer::TraceConfiguration(
mxRequestedConfiguration, "requested configuration");
@@ -185,8 +185,8 @@ void ConfigurationUpdater::UpdateConfiguration()
DBG_UNHANDLED_EXCEPTION("sd");
}
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationUpdater::UpdateConfiguration)");
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration end");
+ SAL_INFO("sd.fwk", __func__ << ": ConfigurationUpdater::UpdateConfiguration)");
+ SAL_INFO("sd.fwk", __func__ << ": UpdateConfiguration end");
}
void ConfigurationUpdater::CleanRequestedConfiguration()
@@ -250,7 +250,7 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie
mpResourceManager->ActivateResources(rClassifier.GetC1minusC2(), mxCurrentConfiguration);
#if DEBUG_SD_CONFIGURATION_TRACE
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::UpdateConfiguration)");
+ SAL_INFO("sd.fwk", __func__ << ": ConfigurationController::UpdateConfiguration)");
ConfigurationTracer::TraceConfiguration(
mxRequestedConfiguration, "requested configuration");
ConfigurationTracer::TraceConfiguration(
@@ -322,7 +322,7 @@ void ConfigurationUpdater::CheckPureAnchors (
if (bDeactiveCurrentResource)
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": deactivating pure anchor " <<
+ SAL_INFO("sd.fwk", __func__ << ": deactivating pure anchor " <<
FrameworkHelper::ResourceIdToString(xResourceId) <<
"because it has no children");
// Erase element from current configuration.
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index b18d9be163e7..b01074c3ca74 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -128,13 +128,13 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues)
"URL",
aURLs);
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::adding factory " << sServiceName);
+ SAL_INFO("sd.fwk", __func__ << ": ModuleController::adding factory " << sServiceName);
// Add the resource URLs to the map.
for (const auto& rResource : aURLs)
{
(*mpResourceToFactoryMap)[rResource] = sServiceName;
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << rResource);
+ SAL_INFO("sd.fwk", __func__ << ": " << rResource);
}
}
@@ -186,7 +186,7 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues)
// at the configuration controller.
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(sServiceName, aArguments, xContext);
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::created startup service " << sServiceName);
+ SAL_INFO("sd.fwk", __func__ << ": ModuleController::created startup service " << sServiceName);
}
catch (Exception&)
{
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 9c9d029ea622..025f6251afaf 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -342,7 +342,7 @@ void BitmapCache::ReCalculateTotalCacheSize()
}
mbIsFull = (mnNormalCacheSize >= mnMaximalNormalCacheSize);
- SAL_INFO("sd.sls", OSL_THIS_FUNC << ": cache size is " << mnNormalCacheSize << "/" << mnPreciousCacheSize);
+ SAL_INFO("sd.sls", __func__ << ": cache size is " << mnNormalCacheSize << "/" << mnPreciousCacheSize);
}
void BitmapCache::Recycle (const BitmapCache& rCache)
@@ -426,7 +426,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOpe
if ( ! rEntry.IsPrecious() && mnNormalCacheSize>mnMaximalNormalCacheSize)
{
mbIsFull = true;
- SAL_INFO("sd.sls", OSL_THIS_FUNC << ": cache size is " << mnNormalCacheSize << " > " << mnMaximalNormalCacheSize);
+ SAL_INFO("sd.sls", __func__ << ": cache size is " << mnNormalCacheSize << " > " << mnMaximalNormalCacheSize);
mpCacheCompactor->RequestCompaction();
}
break;
@@ -507,7 +507,7 @@ void BitmapCache::CacheEntry::Compress (const std::shared_ptr<BitmapCompressor>&
if (nOldSize == 0)
nOldSize = 1;
sal_Int32 nRatio (100L * nNewSize / nOldSize);
- SAL_INFO("sd.sls", OSL_THIS_FUNC << ": compressing bitmap for " << %x << " from " << nOldSize << " to " << nNewSize << " bytes (" << nRatio << "%)");
+ SAL_INFO("sd.sls", __func__ << ": compressing bitmap for " << %x << " from " << nOldSize << " to " << nNewSize << " bytes (" << nRatio << "%)");
#endif
mpCompressor = rpCompressor;
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index fa598567f84f..b4a44530ca57 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -168,7 +168,7 @@ void CacheCompactionByCompression::Run()
if (mrCache.GetSize() <= mnMaximalCacheSize)
return;
- SAL_INFO("sd.sls", OSL_THIS_FUNC << ": bitmap cache uses too much space: " << mrCache.GetSize() << " > " << mnMaximalCacheSize);
+ SAL_INFO("sd.sls", __func__ << ": bitmap cache uses too much space: " << mrCache.GetSize() << " > " << mnMaximalCacheSize);
::std::unique_ptr< ::sd::slidesorter::cache::BitmapCache::CacheIndex> pIndex (
mrCache.GetCacheIndex());
@@ -182,7 +182,7 @@ void CacheCompactionByCompression::Run()
break;
}
mrCache.ReCalculateTotalCacheSize();
- SAL_INFO("sd.sls", OSL_THIS_FUNC << ": there are now " << mrCache.GetSize() << " bytes occupied");
+ SAL_INFO("sd.sls", __func__ << ": there are now " << mrCache.GetSize() << " bytes occupied");
}
} // end of anonymous namespace
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index a1fb53b2975e..f84d6265ee56 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -136,7 +136,7 @@ void RequestQueue::AddRequest (
}
#if OSL_DEBUG_LEVEL >=2
- SAL_INFO("sd.sls", OSL_THIS_FUNC << ": " << (bRemoved?"replaced":"added")
+ SAL_INFO("sd.sls", __func__ << ": " << (bRemoved?"replaced":"added")
<< " request for page " << ((aKey->GetPageNum()-1)/2)
<< " with priority class " << static_cast<int>(eRequestClass));
#endif
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index 8ae7fddada92..0bd705bd60fe 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -110,17 +110,17 @@ IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback, Timer *, void)
// mnMaxTimePerStep. Note that the last step may take longer
// than allowed.
sal_uInt32 nStartTime (::tools::Time( ::tools::Time::SYSTEM ).GetMSFromTime());
- SAL_INFO("sd.tools", OSL_THIS_FUNC << ": starting TimerBasedTaskExecution at " << nStartTime);
+ SAL_INFO("sd.tools", __func__ << ": starting TimerBasedTaskExecution at " << nStartTime);
do
{
mpTask->RunNextStep();
sal_uInt32 nDuration (::tools::Time( ::tools::Time::SYSTEM ).GetMSFromTime()-nStartTime);
- SAL_INFO("sd.tools", OSL_THIS_FUNC << ": executed step in " << nDuration);
+ SAL_INFO("sd.tools", __func__ << ": executed step in " << nDuration);
if (nDuration > mnMaxTimePerStep)
break;
}
while (mpTask->HasNextStep());
- SAL_INFO("sd.tools", OSL_THIS_FUNC << ": TimerBasedTaskExecution sleeping");
+ SAL_INFO("sd.tools", __func__ << ": TimerBasedTaskExecution sleeping");
maTimer.Start();
}
else
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 7f084e3952e7..808fcc0545a6 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -606,7 +606,7 @@ void ToolBarManager::Implementation::ResetToolBars (ToolBarGroup eGroup)
void ToolBarManager::Implementation::ResetAllToolBars()
{
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": resetting all tool bars");
+ SAL_INFO("sd.view", __func__ << ": resetting all tool bars");
for (auto i : o3tl::enumrange<ToolBarGroup>())
ResetToolBars(i);
}
@@ -679,7 +679,7 @@ void ToolBarManager::Implementation::PreUpdate()
mbPreUpdatePending = false;
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": ToolBarManager::PreUpdate [");
+ SAL_INFO("sd.view", __func__ << ": ToolBarManager::PreUpdate [");
// Get the list of tool bars that are not used anymore and are to be
// deactivated.
@@ -690,12 +690,12 @@ void ToolBarManager::Implementation::PreUpdate()
for (const auto& aToolBar : aToolBars)
{
OUString sFullName (GetToolBarResourceName(aToolBar));
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning off tool bar " << sFullName);
+ SAL_INFO("sd.view", __func__ << ": turning off tool bar " << sFullName);
mxLayouter->destroyElement(sFullName);
maToolBarList.MarkToolBarAsNotActive(aToolBar);
}
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": ToolBarManager::PreUpdate ]");
+ SAL_INFO("sd.view", __func__ << ": ToolBarManager::PreUpdate ]");
}
void ToolBarManager::Implementation::PostUpdate()
@@ -713,18 +713,18 @@ void ToolBarManager::Implementation::PostUpdate()
std::vector<OUString> aToolBars;
maToolBarList.GetToolBarsToActivate(aToolBars);
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": ToolBarManager::PostUpdate [");
+ SAL_INFO("sd.view", __func__ << ": ToolBarManager::PostUpdate [");
// Turn on the tool bars that are visible in the new context.
for (const auto& aToolBar : aToolBars)
{
OUString sFullName (GetToolBarResourceName(aToolBar));
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning on tool bar " << sFullName);
+ SAL_INFO("sd.view", __func__ << ": turning on tool bar " << sFullName);
mxLayouter->requestElement(sFullName);
maToolBarList.MarkToolBarAsActive(aToolBar);
}
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": ToolBarManager::PostUpdate ]");
+ SAL_INFO("sd.view", __func__ << ": ToolBarManager::PostUpdate ]");
}
void ToolBarManager::Implementation::LockViewShellManager()
@@ -736,7 +736,7 @@ void ToolBarManager::Implementation::LockViewShellManager()
void ToolBarManager::Implementation::LockUpdate()
{
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": LockUpdate " << mnLockCount);
+ SAL_INFO("sd.view", __func__ << ": LockUpdate " << mnLockCount);
::osl::MutexGuard aGuard(maMutex);
DBG_ASSERT(mnLockCount<100, "ToolBarManager lock count unusually high");
@@ -751,7 +751,7 @@ void ToolBarManager::Implementation::LockUpdate()
void ToolBarManager::Implementation::UnlockUpdate()
{
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": UnlockUpdate " << mnLockCount);
+ SAL_INFO("sd.view", __func__ << ": UnlockUpdate " << mnLockCount);
::osl::MutexGuard aGuard(maMutex);
OSL_ASSERT(mnLockCount>0);
@@ -922,14 +922,14 @@ using namespace ::sd;
LayouterLock::LayouterLock (const Reference<frame::XLayoutManager>& rxLayouter)
: mxLayouter(rxLayouter)
{
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": LayouterLock " << (mxLayouter.is() ? 1 :0));
+ SAL_INFO("sd.view", __func__ << ": LayouterLock " << (mxLayouter.is() ? 1 :0));
if (mxLayouter.is())
mxLayouter->lock();
}
LayouterLock::~LayouterLock()
{
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": ~LayouterLock " << (mxLayouter.is() ? 1 :0));
+ SAL_INFO("sd.view", __func__ << ": ~LayouterLock " << (mxLayouter.is() ? 1 :0));
if (mxLayouter.is())
mxLayouter->unlock();
}
@@ -1374,7 +1374,7 @@ void ToolBarShellList::UpdateShells (
std::insert_iterator<GroupedShellList>(aList,aList.begin()));
for (const auto& rShell : aList)
{
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": deactivating tool bar shell " << static_cast<sal_uInt32>(rShell.mnId));
+ SAL_INFO("sd.view", __func__ << ": deactivating tool bar shell " << static_cast<sal_uInt32>(rShell.mnId));
rpManager->DeactivateSubShell(*rpMainViewShell, rShell.mnId);
}
@@ -1386,7 +1386,7 @@ void ToolBarShellList::UpdateShells (
std::insert_iterator<GroupedShellList>(aList,aList.begin()));
for (const auto& rShell : aList)
{
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": activating tool bar shell " << static_cast<sal_uInt32>(rShell.mnId));
+ SAL_INFO("sd.view", __func__ << ": activating tool bar shell " << static_cast<sal_uInt32>(rShell.mnId));
rpManager->ActivateSubShell(*rpMainViewShell, rShell.mnId);
}
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 3b9308d8c5f0..08081f9b153e 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -732,9 +732,9 @@ void ViewShellManager::Implementation::UpdateShellStack()
aSfxShellStack.push_back(mrBase.GetSubShell(nIndex));
#if OSL_DEBUG_LEVEL >= 2
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": Current SFX Stack");
+ SAL_INFO("sd.view", __func__ << ": Current SFX Stack");
DumpShellStack(aSfxShellStack);
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": Target Stack");
+ SAL_INFO("sd.view", __func__ << ": Target Stack");
DumpShellStack(aTargetStack);
#endif
@@ -750,7 +750,7 @@ void ViewShellManager::Implementation::UpdateShellStack()
i != iLast; ++i)
{
SfxShell* const pShell = *i;
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": removing shell " << pShell << " from stack");
+ SAL_INFO("sd.view", __func__ << ": removing shell " << pShell << " from stack");
mrBase.RemoveSubShell(pShell);
}
aSfxShellStack.erase(iSfxShell, aSfxShellStack.end());
@@ -759,7 +759,7 @@ void ViewShellManager::Implementation::UpdateShellStack()
mbShellStackIsUpToDate = false;
while (iTargetShell != aTargetStack.end())
{
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": pushing shell " << *iTargetShell << " on stack");
+ SAL_INFO("sd.view", __func__ << ": pushing shell " << *iTargetShell << " on stack");
mrBase.AddSubShell(**iTargetShell);
++iTargetShell;
@@ -783,7 +783,7 @@ void ViewShellManager::Implementation::UpdateShellStack()
mbShellStackIsUpToDate = true;
#if OSL_DEBUG_LEVEL >= 2
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": New current stack");
+ SAL_INFO("sd.view", __func__ << ": New current stack");
DumpSfxShellStack();
#endif
}
@@ -799,7 +799,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe
: nullptr;
#if OSL_DEBUG_LEVEL >= 2
- SAL_INFO("sd.view", OSL_THIS_FUNC << "TakeShellsFromStack( " << pShell << ")");
+ SAL_INFO("sd.view", __func__ << "TakeShellsFromStack( " << pShell << ")");
DumpSfxShellStack();
#endif
@@ -836,7 +836,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe
while (true)
{
SfxShell* pShellOnStack = mrBase.GetSubShell(0);
- SAL_INFO("sd.view", OSL_THIS_FUNC << "removing shell " << pShellOnStack << " from stack");
+ SAL_INFO("sd.view", __func__ << "removing shell " << pShellOnStack << " from stack");
mrBase.RemoveSubShell(pShellOnStack);
if (pShellOnStack == pShell)
break;
@@ -853,7 +853,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe
mpTopShell->SetUndoManager(pUndoManager);
#if OSL_DEBUG_LEVEL >= 2
- SAL_INFO("sd.view", OSL_THIS_FUNC << "Sfx shell stack is:");
+ SAL_INFO("sd.view", __func__ << "Sfx shell stack is:");
DumpSfxShellStack();
#endif
}
@@ -1081,11 +1081,11 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack)
ShellStack::const_reverse_iterator iEntry;
for (iEntry=rStack.rbegin(); iEntry!=rStack.rend(); ++iEntry)
if (*iEntry != NULL)
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": " <<
+ SAL_INFO("sd.view", __func__ << ": " <<
*iEntry << " : " <<
(*iEntry)->GetName());
else
- SAL_INFO("sd.view", OSL_THIS_FUNC << " null");
+ SAL_INFO("sd.view", __func__ << " null");
}
void ViewShellManager::Implementation::DumpSfxShellStack()
generated by cgit (git 2.34.1) at 2024-07-04 08:44:56 +0000