Remove obsolote border dialog

Change-Id: I57f3db05a21caeff04f280a0c13c3facfe23c3c1

8 files changed, 3 insertions, 202 deletions

diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 16c61b107bbd..1ebe8a42b44e 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -59,7 +59,6 @@
 #include "srtdlg.hxx" //add for SwSortDlg
 #include "tautofmt.hxx" //add for SwAutoFormatDlg
 #include "tblnumfm.hxx" //add for SwNumFmtDlg
-#include "uiborder.hxx" //add for SwBorderDlg
 #include "wrap.hxx" //add for SwWrapDlg
 #include "colwd.hxx" //add for SwTableWidthDlg
 #include "tabledlg.hxx" //add for SwTableTabDlg
@@ -184,7 +183,7 @@ sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetPara() const
     return pDlg->GetPara();
 }
 
-//add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwBorderDlg SwWrapDlg  SwFldEditDlg begin
+//add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwWrapDlg  SwFldEditDlg begin
 const SfxItemSet* SwAbstractSfxDialog_Impl::GetOutputItemSet() const
 {
     return pDlg->GetOutputItemSet();
@@ -885,23 +884,6 @@ AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(Wi
     return new AbstractSwAutoFormatDlg_Impl(pDlg);
 }
 
-SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType,int nResId )
-{
-    SfxModalDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RC_DLG_SWBORDERDLG :
-            pDlg = new SwBorderDlg( pParent, rSet, nType );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new SwAbstractSfxDialog_Impl( pDlg );
-    return 0;
-}
-
 SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId )
 {
     SfxModalDialog* pDlg=NULL;
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index ff9ee11c25da..7d77e7f87b20 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -84,7 +84,7 @@ class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
 
 //add for SwInsertAbstractDlg end
 
-// add for SwAddrDlg, SwDropCapsDlg, SwBackgroundDlg SwNumFmtDlg  SwWrapDlg SwBorderDlg, SwFldEditDlg  begin
+// add for SwAddrDlg, SwDropCapsDlg, SwBackgroundDlg SwNumFmtDlg  SwWrapDlg, SwFldEditDlg  begin
 class SfxNoLayoutSingleTabDialog;
 class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
 {
@@ -93,7 +93,7 @@ class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
     virtual void        SetText( const OUString& rStr );
     virtual OUString    GetText() const;
 };
-// add for SwAddrDlg,SwDropCapsDlg , SwBackgroundDlg  SwNumFmtDlg SwWrapDlg SwBorderDlg, SwFldEditDlg  end
+// add for SwAddrDlg,SwDropCapsDlg , SwBackgroundDlg  SwNumFmtDlg SwWrapDlg, SwFldEditDlg  end
 
 // add for SwAsciiFilterDlg begin
 class AbstractSwAsciiFilterDlg_Impl : public AbstractSwAsciiFilterDlg
@@ -477,7 +477,6 @@ public:
     virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
                                                             sal_Bool bSetAutoFmt = sal_True,
                                                             const SwTableAutoFmt* pSelFmt = 0 );
-    virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType,int nResId );//add for SwBorderDlg
 
     virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ); //add for SwWrapDlg
     virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc);
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index b98334f53831..462290cdcd13 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -38,7 +38,6 @@
 #include "swuipardlg.hxx"
 #include <pattern.hxx>
 #include <poolfmt.hxx>
-#include <uiborder.hxx>
 #include <uitool.hxx>
 
 #include <envfmt.hrc>
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index 0cf431b02368..679fc121be72 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -102,10 +102,6 @@ String STR_COLL_HEADER
 {
     Text [ en-US ] = " (Template: " ;
 };
-String STR_FRMUI_BORDER
-{
-    Text [ en-US ] = "Borders" ;
-};
 String STR_FRMUI_PATTERN
 {
     Text [ en-US ] = "Background" ;
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
deleted file mode 100644
index 2f4b1efc2f10..000000000000
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svx/svxdlg.hxx>
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
-#include <svl/itemset.hxx>
-#include <svx/flagsdef.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <svl/intitem.hxx>
-
-#include "swtypes.hxx"
-#include "uiborder.hxx"
-#include "frmui.hrc"
-
-
-
-
-SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) :
-
-    SfxNoLayoutSingleTabDialog(pParent, rSet, 0)
-
-{
-    SetText(SW_RESSTR(STR_FRMUI_BORDER));
-
-    // create TabPage
-    SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-    OSL_ENSURE(pFact, "Dialogdiet fail!");
-    ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER );
-    if ( fnCreatePage )
-    {
-        SfxTabPage* pNewPage = (*fnCreatePage)( this, rSet );
-        SfxAllItemSet aSet(*(rSet.GetPool()));
-        aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,nType));
-        if(SW_BORDER_MODE_TABLE == nType)
-            aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_HIDESHADOWCTL));
-        pNewPage->PageCreated(aSet);
-        SetTabPage(pNewPage);
-    }
-}
-
-
-
-SwBorderDlg::~SwBorderDlg()
-{
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc
index 612a32b227a5..cc03279e8eca 100644
--- a/sw/source/ui/inc/frmui.hrc
+++ b/sw/source/ui/inc/frmui.hrc
@@ -45,7 +45,6 @@
 
 #define STR_TOPPRT              (STR_FRMDLG_BEGIN + 1)
 
-#define STR_BORDER              (STR_FRMDLG_BEGIN + 16)
 #define STR_COLUMN              (STR_FRMDLG_BEGIN + 17)
 #define STR_CHAR                (STR_FRMDLG_BEGIN + 19)
 
diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx
deleted file mode 100644
index 20e5e872de4a..000000000000
--- a/sw/source/ui/inc/uiborder.hxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _UIBORDER_HXX
-#define _UIBORDER_HXX
-
-
-#include <sfx2/basedlgs.hxx>
-class Window;
-class SfxItemSet;
-
-class SwBorderDlg : public SfxNoLayoutSingleTabDialog
-{
-public:
-
-     // nType may be:
-     // SW_BORDER_MODE_PARA
-     // SW_BORDER_MODE_TABLE
-     // SW_BORDER_MODE_FRAME
-
-     SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType);
-    ~SwBorderDlg();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index ea1f6a6ba189..67087fb6d090 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -2358,73 +2358,6 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
             }
         }
         break;
-        case FN_FORMAT_BORDER_DLG:
-        {
-            SfxItemSet   aSet( rSh.GetAttrPool(),
-                               RES_BOX              , RES_SHADOW,
-                               SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
-                               0 );
-            SfxAbstractDialog * pDlg = 0;
-            // Table cell(s) selected?
-            if ( rSh.IsTableMode() )
-            {
-                // Set border attributes Get/SetTabBorders()
-                ::PrepareBoxInfo( aSet, rSh );
-                rSh.GetTabBorders( aSet );
-                SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
-                OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
-
-                pDlg = pFact->CreateSwBorderDlg( pMDI, aSet, SW_BORDER_MODE_TABLE, RC_DLG_SWBORDERDLG );
-                OSL_ENSURE(pDlg, "Dialogdiet fail!");
-                if ( pDlg->Execute() == RET_OK )
-                {
-                    rSh.SetTabBorders( *pDlg->GetOutputItemSet() );
-                    pOutSet = pDlg->GetOutputItemSet();
-                }
-            }
-            else if ( rSh.IsFrmSelected() )
-            {
-                // Set border attributes via Frame-Manager
-                SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
-                aSet.Put( aMgr.GetAttrSet() );
-
-                SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
-                OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
-
-                pDlg = pFact->CreateSwBorderDlg( pMDI, aSet, SW_BORDER_MODE_FRAME, RC_DLG_SWBORDERDLG );
-                OSL_ENSURE(pDlg, "Dialogdiet fail!");
-                if ( pDlg->Execute() == RET_OK )
-                {
-                    aMgr.SetAttrSet( *pDlg->GetOutputItemSet() );
-                    aMgr.UpdateFlyFrm();
-                    pOutSet = pDlg->GetOutputItemSet();
-                }
-            }
-            else
-            {
-                // Set border attributes via Shell quite normal
-                rSh.GetCurAttr( aSet );
-                ::PrepareBoxInfo( aSet, rSh );
-
-                SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
-                OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
-
-                pDlg = pFact->CreateSwBorderDlg( pMDI, aSet, SW_BORDER_MODE_PARA, RC_DLG_SWBORDERDLG );
-                OSL_ENSURE(pDlg, "Dialogdiet fail!");
-                if ( pDlg->Execute() == RET_OK )
-                {
-                    rSh.SetAttr( *pDlg->GetOutputItemSet() );
-                    pOutSet = pDlg->GetOutputItemSet();
-                }
-            }
-            if(pOutSet)
-            {
-                rReq.Done(*pOutSet);
-                bDone = true;
-            }
-            delete pDlg;
-        }
-        break;
         case FN_FORMAT_BACKGROUND_DLG:
         {
             SfxItemSet aSet( rSh.GetAttrPool(),