Kaydet (Commit) badec747 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

tdf#90766: Table - keep with paragraph setting is broken

Modify input set before dialog is created

Change-Id: I66d9ed5c07fcdfe4841d071be9b5252aa925b987
üst 636c5a63
...@@ -562,6 +562,16 @@ void SwTableShell::Execute(SfxRequest &rReq) ...@@ -562,6 +562,16 @@ void SwTableShell::Execute(SfxRequest &rReq)
FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &rSh.GetView())); FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &rSh.GetView()));
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
boost::scoped_ptr<SwTableRep> pTblRep(::lcl_TableParamToItemSet( aCoreSet, rSh )); 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; boost::scoped_ptr<SfxAbstractTabDialog> pDlg;
{ {
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
...@@ -573,14 +583,7 @@ void SwTableShell::Execute(SfxRequest &rReq) ...@@ -573,14 +583,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if (pItem) if (pItem)
pDlg->SetCurPageId(OUStringToOString(static_cast<const SfxStringItem *>(pItem)->GetValue(), RTL_TEXTENCODING_UTF8)); 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) ) if ( (!pDlg && rReq.GetArgs()) || (pDlg && pDlg->Execute() == RET_OK) )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment