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

[Zolnai Tamás]

 sw/source/uibase/shells/tabsh.cxx |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit badec7478035008f514e0976a94438fe2e32dc40
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Tue Apr 21 15:28:36 2015 +0200

    tdf#90766: Table - keep with paragraph setting is broken
    
    Modify input set before dialog is created
    
    Change-Id: I66d9ed5c07fcdfe4841d071be9b5252aa925b987

diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 888bf21..0631ece 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -562,6 +562,16 @@ void SwTableShell::Execute(SfxRequest &rReq)
             FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &rSh.GetView()));
             SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
             boost::scoped_ptr<SwTableRep> pTblRep(::lcl_TableParamToItemSet( aCoreSet, rSh ));
+
+            aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
+            rSh.GetTblAttr(aCoreSet);
+            // GetTblAttr overwrites the background!
+            SvxBrushItem aBrush( RES_BACKGROUND );
+            if(rSh.GetBoxBackground(aBrush))
+                aCoreSet.Put( aBrush );
+            else
+                aCoreSet.InvalidateItem( RES_BACKGROUND );
+
             boost::scoped_ptr<SfxAbstractTabDialog> pDlg;
             {
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -573,14 +583,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 if (pItem)
                     pDlg->SetCurPageId(OUStringToOString(static_cast<const SfxStringItem *>(pItem)->GetValue(), RTL_TEXTENCODING_UTF8));
             }
-            aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
-            rSh.GetTblAttr(aCoreSet);
-            // GetTblAttr overwrites the background!
-            SvxBrushItem aBrush( RES_BACKGROUND );
-            if(rSh.GetBoxBackground(aBrush))
-                aCoreSet.Put( aBrush );
-            else
-                aCoreSet.InvalidateItem( RES_BACKGROUND );
+
 
             if ( (!pDlg && rReq.GetArgs()) || (pDlg && pDlg->Execute() == RET_OK) )
             {