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

[Julien Nabet (via logerrit)]

 sw/source/core/inc/swcache.hxx      |    4 ----
 sw/source/core/txtnode/fntcache.cxx |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 52cda5c5ae426761ccbdb4f20419098eab195303
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Oct 6 21:37:40 2019 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Oct 7 07:51:29 2019 +0200

    Fix FIXME in swcache.hxx
    
    by getting rid of useless IsAvail() function
    
    Change-Id: I7c3bbf74a9ef3aaa792936ef2b4887021226dd2a
    Reviewed-on: https://gerrit.libreoffice.org/80327
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index e2d5216d6212..557d9c2a2913 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -210,10 +210,6 @@ protected:
 
 public:
     virtual ~SwCacheAccess();
-
-    /// Shorthand for those who know that they did not override isAvailable()
-    /// FIXME: wtf?
-    bool IsAvail() const { return m_pObj != nullptr; }
 };
 
 
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 085317e4a259..d5999b8f9bbe 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2275,7 +2275,7 @@ SwFntAccess::SwFntAccess( const void* & rnFontCacheId,
   m_pShell( pSh )
 {
     // the used ctor of SwCacheAccess searches for rnFontCacheId+rIndex in the cache
-    if ( IsAvail() )
+    if ( m_pObj )
     {
         // fast case: known Font (rnFontCacheId), no need to check printer and zoom
         if ( !bCheck )