[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - framework/source

Maxim Monastirsky momonasmon at gmail.com
Tue Apr 19 11:45:49 UTC 2016


 framework/source/uielement/popuptoolbarcontroller.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ec5e521c6ec77aff5acddce8f53c848948fcef48
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Fri Apr 1 00:20:25 2016 +0300

    tdf#98849 SaveToolbarController: Correct initial modified state
    
    Regression of 69882b0ef861099fd6bfa802d6f7ba5d1391c269
    
    Change-Id: I3698efff2f1e62e513d779400eff7f1c4a4145e4
    (cherry picked from commit 30b10b1a589945b570445518163feb6eac8e95e1)
    Reviewed-on: https://gerrit.libreoffice.org/23715
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index ace6884..35a5432 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -379,7 +379,10 @@ void SaveToolbarController::initialize( const css::uno::Sequence< css::uno::Any
         m_xModifiable.set( xController, css::uno::UNO_QUERY );
 
     if ( m_xModifiable.is() )
+    {
         m_xModifiable->addModifyListener( this );
+        m_bModified = m_xModifiable->isModified();
+    }
 }
 
 sal_Bool SaveToolbarController::opensSubToolbar()


More information about the Libreoffice-commits mailing list