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

[Tor Lillqvist]

 sfx2/source/doc/objserv.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1851e87627a48b826afee01f79bfb948eb5691d4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Nov 2 11:26:27 2016 +0200

    It's ODF version, not document version
    
    Change-Id: I3e6a54dd92ebafebabf9e75b44b9f0b5f0b6aa8a

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 5a77b77..fc68165 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1384,7 +1384,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
     ImplGetSignatureState(); // document signature
     if (GetMedium() && GetMedium()->GetFilter() && GetMedium()->GetFilter()->IsOwnFormat())
         ImplGetSignatureState( true ); // script signature
-    bool bHasSign = ( pImpl->nScriptingSignatureState != SignatureState::NOSIGNATURES || pImpl->nDocumentSignatureState != SignatureState::NOSIGNATURES );
+oh    bool bHasSign = ( pImpl->nScriptingSignatureState != SignatureState::NOSIGNATURES || pImpl->nDocumentSignatureState != SignatureState::NOSIGNATURES );
 
     // the target ODF version on saving
 
@@ -1402,7 +1402,9 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
     OUString aODFVersion;
     try
     {
-        // check the version of the document
+        // check the ODF version of the document
+        // No idea what relevance this has if the document has not been loaded from ODF (or is not
+        // being saved to ODF)
         uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW );
         xPropSet->getPropertyValue("Version") >>= aODFVersion;
     }