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

[Stephan Bergmann]

 embeddedobj/source/commonembedding/persistence.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea5fffddcfc6d8741c5492b227daddae1874f100
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 13 22:13:42 2017 +0100

    Remove misguided comment
    
    ...introduced with 7757a18cfd77996f4ce8aef2cbb8c70425ae92da "INTEGRATION: CWS
    oj14", but for one !xDoc.is() is explicitly handled below, and for another
    xLoadable is only used if !xDoc.is().  So the requirement is apparently that not
    both are null, indeed.
    
    Change-Id: I1b59e99c86c88c5266b33e9ff782054fa40dd34d

diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 6acde54..26faa84 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -498,7 +498,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag
 
     uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY );
     uno::Reference< document::XStorageBasedDocument > xDoc( xDocument, uno::UNO_QUERY );
-    if ( !xDoc.is() && !xLoadable.is() ) ///BUG: This should be || instead of && ?
+    if ( !xDoc.is() && !xLoadable.is() )
         throw uno::RuntimeException();
 
     ::comphelper::NamedValueCollection aLoadArgs;