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

[Joren De Cuyper]

 sw/source/ui/table/splittbl.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 64a3b58a9ace11c6a01708e8de14712e27e02043
Author: Joren De Cuyper <joren.libreoffice at telenet.be>
Date:   Mon Mar 25 22:11:59 2013 +0100

    fix fdo#62670 - TABLE: Splitting a table options are mixed
    
    Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b
    Reviewed-on: https://gerrit.libreoffice.org/3042
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx
index f82d642..d85bb95 100644
--- a/sw/source/ui/table/splittbl.cxx
+++ b/sw/source/ui/table/splittbl.cxx
@@ -30,7 +30,7 @@ SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh )
     get(mpCntntCopyRB, "copyheading");
     get(mpBoxAttrCopyWithParaRB, "customheadingapplystyle");
     get(mpBoxAttrCopyNoParaRB, "customheading");
-    get(mpBorderCopyRB, "customheading");
+    get(mpBorderCopyRB, "noheading");
 }
 
 void SwSplitTblDlg::Apply()
@@ -38,7 +38,7 @@ void SwSplitTblDlg::Apply()
     m_nSplit = HEADLINE_CNTNTCOPY;
     if(mpBoxAttrCopyWithParaRB->IsChecked())
         m_nSplit = HEADLINE_BOXATRCOLLCOPY;
-    if(mpBoxAttrCopyNoParaRB->IsChecked())
+    else if(mpBoxAttrCopyNoParaRB->IsChecked())
         m_nSplit = HEADLINE_BOXATTRCOPY;
     else if(mpBorderCopyRB->IsChecked())
         m_nSplit = HEADLINE_BORDERCOPY;
@@ -46,6 +46,4 @@ void SwSplitTblDlg::Apply()
     rShell.SplitTable(m_nSplit);
 }
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */