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

[Mike Kaganski]

 sfx2/source/view/frmload.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 429f4e294e87e1172a925f164ad9e3ef125019a3
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Mon Jun 27 23:44:34 2016 +1000

    Don't call a function when its result is already stored in variable
    
    const bExternalModel was already set to xModel.is(), and xModel
    hasn't been modified since then.
    
    Change-Id: I8cc6e6776e633287cc755b0489458cadbf1ae664
    Reviewed-on: https://gerrit.libreoffice.org/26716
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index da63bd9..4077e9d 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -668,7 +668,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
         ::comphelper::NamedValueCollection aViewCreationArgs( impl_extractViewCreationArgs( aDescriptor ) );
 
         // no model passed from outside? => create one from scratch
-        if ( !xModel.is() )
+        if ( !bExternalModel )
         {
             bool bInternalFilter = aDescriptor.getOrDefault<OUString>("FilterProvider", OUString()).isEmpty();