[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-0' - sfx2/source

Katarina Behrens Katarina.Behrens at cib.de
Fri Jul 14 15:28:45 UTC 2017


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

New commits:
commit fe34bb37b58dd35e387a782612898ecc3f19400b
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Fri Jul 7 17:26:27 2017 +0200

    tdf#108852: Put signature infobar into the right frame
    
    and thus avoid crash when user clicks 'show signatures' button
    in a window where signature bar shouldn't even be
    
    Change-Id: I5eba8d1ddd8c76dd10acedfa03d732df586748de
    Reviewed-on: https://gerrit.libreoffice.org/39705
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit bc882e977144d60b850288045e3f6aab7cbad6f7)
    Reviewed-on: https://gerrit.libreoffice.org/39971
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 6b5374a694b0..16265c2510d5 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1035,7 +1035,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
             }
             case SID_SIGNATURE:
             {
-                SfxViewFrame *pFrame = SfxViewFrame::Current();
+                SfxViewFrame *pFrame = SfxViewFrame::GetFirst(this);
                 if ( pFrame )
                 {
                     SignatureState eState = GetDocumentSignatureState();


More information about the Libreoffice-commits mailing list