[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/fmtui/tmpdlg.cxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit ac66a47e7ed691f28e5eb1748b2209d466b0ede3
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Dec 9 11:40:30 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Dec 9 21:53:51 2018 +0100

    cppcheck: multicondition "columns" in sw/tmpdlg
    
    weld writer page style dialog and SvxBorderBackgroundDlg
    writer, format page is complete
    a2304f62e963b413b7575bedfb8d34e5f2d3ea58
    +
    SwTemplateDlg is now unused
    2fc2f235b94de9f70a28aee90564745cda313489
    
    Change-Id: I67c3ed5b2724ac7d8dacc42ad6eabf4ec68739a8
    Reviewed-on: https://gerrit.libreoffice.org/64836
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 00c6b2976e5326cd94ce81ab6d750a2c2cd99cbb)
    Reviewed-on: https://gerrit.libreoffice.org/64846
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index a35b833e251f..064fae1b8fb5 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -518,12 +518,6 @@ void SwTemplateDlgController::PageCreated(const OString& rId, SfxTabPage &rPage
     {
         static_cast<SwWrapTabPage&>(rPage).SetFormatUsed( true, false );
     }
-    else if (rId == "columns")
-    {
-        if( nType == SfxStyleFamily::Frame )
-            static_cast<SwColumnPage&>(rPage).SetFrameMode(true);
-        static_cast<SwColumnPage&>(rPage).SetFormatUsed( true );
-    }
     else if (rId == "macros")
     {
         SfxAllItemSet aNewSet(*aSet.GetPool());