[Libreoffice-commits] core.git: sd/source

[Bernhard Widl]

 sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx      |    2 +-
 sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx |    8 ++++----
 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx |    6 +++---
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx   |    2 +-
 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx     |    4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 0ab214536efce0fdecf9a79b58467c5d464c1929
Author: Bernhard Widl <bernhard.widl at cib.de>
Date:   Thu Jun 29 17:25:07 2017 +0200

    fdo#43157 convert OSL_ASSERT to assert in sd/source/ui/slidesorter/cache
    
    Change-Id: I5280fe279ac901082450fb1c5f4f601653b87598
    Reviewed-on: https://gerrit.libreoffice.org/39392
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index e783d059ade7..b45c2ade3cd0 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -441,7 +441,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOpe
             break;
 
         default:
-            OSL_ASSERT(false);
+            assert(false);
             break;
     }
 }
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
index ec5e6fbf5ea7..4adac147c359 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
@@ -106,7 +106,7 @@ Bitmap GenericPageCache::GetPreviewBitmap (
     const CacheKey aKey,
     const bool bResize)
 {
-    OSL_ASSERT(aKey != nullptr);
+    assert(aKey != nullptr);
 
     Bitmap aPreview;
     bool bMayBeUpToDate = true;
@@ -143,7 +143,7 @@ Bitmap GenericPageCache::GetPreviewBitmap (
 Bitmap GenericPageCache::GetMarkedPreviewBitmap (
     const CacheKey aKey)
 {
-    OSL_ASSERT(aKey != nullptr);
+    assert(aKey != nullptr);
 
     ProvideCacheAndProcessor();
     const SdrPage* pPage = mpCacheContext->GetPage(aKey);
@@ -156,7 +156,7 @@ void GenericPageCache::SetMarkedPreviewBitmap (
     const CacheKey aKey,
     const Bitmap& rMarkedBitmap)
 {
-    OSL_ASSERT(aKey != nullptr);
+    assert(aKey != nullptr);
 
     ProvideCacheAndProcessor();
     const SdrPage* pPage = mpCacheContext->GetPage(aKey);
@@ -167,7 +167,7 @@ void GenericPageCache::RequestPreviewBitmap (
     const CacheKey aKey,
     const bool bMayBeUpToDate)
 {
-    OSL_ASSERT(aKey != nullptr);
+    assert(aKey != nullptr);
 
     const SdrPage* pPage = mpCacheContext->GetPage(aKey);
 
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index 9b7f551e57f0..6ad5e4a45dd3 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -264,7 +264,7 @@ void PageCacheManager::ReleaseCache (const std::shared_ptr<Cache>& rpCache)
 
     if (iCache != mpPageCaches->end())
     {
-        OSL_ASSERT(iCache->second == rpCache);
+        assert(iCache->second == rpCache);
 
         PutRecentlyUsedCache(iCache->first.mpDocument,iCache->first.maPreviewSize,rpCache);
 
@@ -290,7 +290,7 @@ std::shared_ptr<PageCacheManager::Cache> PageCacheManager::ChangeSize (
             PageCacheContainer::CompareWithCache(rpCache)));
         if (iCacheToChange != mpPageCaches->end())
         {
-            OSL_ASSERT(iCacheToChange->second == rpCache);
+            assert(iCacheToChange->second == rpCache);
 
             // Now, we can change the preview size of the existing one by
             // removing the cache from the list and re-insert it with the
@@ -306,7 +306,7 @@ std::shared_ptr<PageCacheManager::Cache> PageCacheManager::ChangeSize (
         }
         else
         {
-            OSL_ASSERT(iCacheToChange != mpPageCaches->end());
+            assert(iCacheToChange != mpPageCaches->end());
         }
     }
 
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 3ce3d6377130..7b3526c05601 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -97,7 +97,7 @@ IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl, Timer *, void)
 
 void QueueProcessor::ProcessRequests()
 {
-    OSL_ASSERT(mpCacheContext.get()!=nullptr);
+    assert(mpCacheContext.get()!=nullptr);
 
     // Never process more than one request at a time in order to prevent the
     // lock up of the edit view.
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 8bc8bb3e74da..809fbf46ca01 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -103,7 +103,7 @@ void RequestQueue::AddRequest (
 {
     ::osl::MutexGuard aGuard (maMutex);
 
-    OSL_ASSERT(eRequestClass>=MIN_CLASS && eRequestClass<=MAX_CLASS);
+    assert(eRequestClass>=MIN_CLASS && eRequestClass<=MAX_CLASS);
 
     // If the request is already a member of the queue then remove it so
     // that the following insertion will use the new prioritization.
@@ -174,7 +174,7 @@ void RequestQueue::ChangeClass (
 {
     ::osl::MutexGuard aGuard (maMutex);
 
-    OSL_ASSERT(eNewRequestClass>=MIN_CLASS && eNewRequestClass<=MAX_CLASS);
+    assert(eNewRequestClass>=MIN_CLASS && eNewRequestClass<=MAX_CLASS);
 
     Container::const_iterator iRequest (
         ::std::find_if (