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

[David Tardon]

 svx/source/table/tablecontroller.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9e5342509b302ba1f816f21cc3ad1cb7093982e0
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jun 3 14:22:07 2013 +0200

    copy values from the original item set
    
    ... because SfxAbstractDialog::GetOutputItemSet() only contains the
    items that have been _changed_ in the dialog.
    
    Change-Id: Iaf20bb42b65e420fe4e7aff979378eff7b5e5df2
    (cherry picked from commit 9cd71f996e3625e8174c46bf85e336c1ee90df7f)
    
    Change-Id: I9100dbe05c418a9dd1b819534a08076c9a4aed1c
    Reviewed-on: https://gerrit.libreoffice.org/4145
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 9368675..16a2c2c 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -726,7 +726,8 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
         std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact ? pFact->CreateSvxFormatCellsDialog( NULL, &aNewAttr, pTableObj->GetModel(), pTableObj) : 0 );
         if( pDlg.get() && pDlg->Execute() )
         {
-            SfxItemSet aNewSet( *(pDlg->GetOutputItemSet ()) );
+            SfxItemSet aNewSet( aNewAttr );
+            aNewSet.Put( *(pDlg->GetOutputItemSet ()) );
 
             SvxBoxItem aNewBoxItem( static_cast< const SvxBoxItem& >( aNewSet.Get( SDRATTR_TABLE_BORDER ) ) );