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

Caolán McNamara caolanm at redhat.com
Wed Apr 4 19:53:33 UTC 2018


 cui/source/dialogs/insdlg.cxx |    1 -
 sfx2/source/doc/iframe.cxx    |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b8cc75068544857cdcf06d10d1667dabb7faabad
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 4 14:44:24 2018 +0100

    drop mysterious bare SetUpdateMode call
    
    Change-Id: I9ab52107e87c7154a50ed5ae89bd89c354e25b51
    Reviewed-on: https://gerrit.libreoffice.org/52387
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index a20a282ae513..8e3532aa84f9 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -462,7 +462,6 @@ short SfxInsertFloatingFrameDialog::execute()
                 m_xRBFrameBorderOff->set_active(!bSet);
             }
 
-//TODO            SetUpdateMode( true );
             bOK = true;
         }
         catch ( uno::Exception& )
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index ccc726dbc865..fced99a75c0b 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -393,7 +393,8 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const
 ::sal_Int16 SAL_CALL IFrameObject::execute()
 {
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-    ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateEditObjectDialog(nullptr, ".uno:InsertObjectFloatingFrame", mxObj)); //TODO
+    //we really should set a parent here
+    ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateEditObjectDialog(nullptr, ".uno:InsertObjectFloatingFrame", mxObj));
     if ( pDlg )
         pDlg->Execute();
     return 0;


More information about the Libreoffice-commits mailing list