Revert the TOPBOTTOM border window type, this needs another approach.

This reverts commit 51fdf273e9893d3d05c99a09e1c2e5835a78e891.

In order to be able to draw the toolbars docked on the left or on the right
nicely and reliably, we have to avoid any border in the shell; instead, the
docking areas will draw the separating lines (when finished).

Change-Id: I74c18a7e471a66ac0a436c2bf01f5be016280d22

6 files changed, 6 insertions, 34 deletions

diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx
index 079b84a991d6..aaf94e461e38 100644
--- a/sfx2/source/view/impviewframe.hxx
+++ b/sfx2/source/view/impviewframe.hxx
@@ -78,7 +78,6 @@ public:
                             Window( &rParent, nBits | WB_BORDER | WB_CLIPCHILDREN ),
                             pFrame( p )
                         {
-                            SetBorderStyle( WINDOW_BORDER_TOPBOTTOM );
                             p->GetFrame().GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER );
                         }
 
diff --git a/vcl/inc/vcl/decoview.hxx b/vcl/inc/vcl/decoview.hxx
index cb66422e2d08..add5d20b828d 100644
--- a/vcl/inc/vcl/decoview.hxx
+++ b/vcl/inc/vcl/decoview.hxx
@@ -43,8 +43,7 @@ class OutputDevice;
 #define FRAME_DRAW_GROUP                    ((sal_uInt16)0x0003)
 #define FRAME_DRAW_DOUBLEIN                 ((sal_uInt16)0x0004)
 #define FRAME_DRAW_DOUBLEOUT                ((sal_uInt16)0x0005)
-#define FRAME_DRAW_TOPBOTTOM                ((sal_uInt16)0x0006)
-#define FRAME_DRAW_NWF                      ((sal_uInt16)0x0007)
+#define FRAME_DRAW_NWF                      ((sal_uInt16)0x0006)
 #define FRAME_DRAW_MENU                     ((sal_uInt16)0x0010)
 #define FRAME_DRAW_WINDOWBORDER             ((sal_uInt16)0x0020)
 #define FRAME_DRAW_BORDERWINDOWBORDER       ((sal_uInt16)0x0040)
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index aaf7f3a095c7..63b50257a62f 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -290,8 +290,7 @@ typedef sal_uInt16 StateChangedType;
 #define WINDOW_BORDER_NORMAL            ((sal_uInt16)0x0001)
 #define WINDOW_BORDER_MONO              ((sal_uInt16)0x0002)
 #define WINDOW_BORDER_MENU              ((sal_uInt16)0x0010)
-#define WINDOW_BORDER_TOPBOTTOM         ((sal_uInt16)0x0020)
-#define WINDOW_BORDER_NWF               ((sal_uInt16)0x0040)
+#define WINDOW_BORDER_NWF               ((sal_uInt16)0x0020)
 #define WINDOW_BORDER_NOBORDER          ((sal_uInt16)0x1000)
 #define WINDOW_BORDER_REMOVEBORDER      ((sal_uInt16)0x2000)
 
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 94a21e9a8a72..527c31cc7f3e 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1200,8 +1200,6 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
             // ist, dann Border nach aussen
             if ( mpBorderWindow->mbSmallOutBorder )
                 nStyle |= FRAME_DRAW_DOUBLEOUT;
-            else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM )
-                nStyle |= FRAME_DRAW_TOPBOTTOM;
             else if ( nBorderStyle & WINDOW_BORDER_NWF )
                 nStyle |= FRAME_DRAW_NWF;
             else
@@ -1382,8 +1380,6 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*
         // ist, dann Border nach aussen
         if ( mpBorderWindow->mbSmallOutBorder )
             nStyle |= FRAME_DRAW_DOUBLEOUT;
-        else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM )
-            nStyle |= FRAME_DRAW_TOPBOTTOM;
         else if ( nBorderStyle & WINDOW_BORDER_NWF )
             nStyle |= FRAME_DRAW_NWF;
         else
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 4c71722fc0bc..2825959e14a2 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -736,11 +736,6 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect,
                     rRect.Bottom() -= 2;
                     break;
 
-                case FRAME_DRAW_TOPBOTTOM:
-                    ++rRect.Top();
-                    --rRect.Bottom();
-                    break;
-
                 case FRAME_DRAW_NWF:
                     // enough space for the native rendering
                     rRect.Left() += 4;
@@ -830,16 +825,6 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect,
                     }
                     break;
 
-                case FRAME_DRAW_TOPBOTTOM:
-                    pDev->SetLineColor( rStyleSettings.GetShadowColor() );
-                    pDev->DrawLine( Point( rRect.Left(), rRect.Top() ), Point( rRect.Right(), rRect.Top() ) );
-                    pDev->DrawLine( Point( rRect.Left(), rRect.Bottom() ), Point( rRect.Right(), rRect.Bottom() ) );
-
-                    // adjust target rectangle
-                    ++rRect.Top();
-                    --rRect.Bottom();
-                    break;
-
                 case FRAME_DRAW_NWF:
                     // no rendering, just enough space for the native rendering
                     rRect.Left() += 4;
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 4d8ba82a1459..a0ccfb6a509f 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1184,16 +1184,10 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  ControlType nType,
 
         if( nStyle & FRAME_DRAW_NODRAW )
         {
-            if( (nStyle & FRAME_DRAW_TOPBOTTOM) == FRAME_DRAW_TOPBOTTOM )
-                rNativeContentRegion = Rectangle(x1,
-                                                 y1+frameWidth,
-                                                 x2,
-                                                 y2-frameWidth);
-            else
-                rNativeContentRegion = Rectangle(x1+frameWidth,
-                                                 y1+frameWidth,
-                                                 x2-frameWidth,
-                                                 y2-frameWidth);
+            rNativeContentRegion = Rectangle(x1+frameWidth,
+                                             y1+frameWidth,
+                                             x2-frameWidth,
+                                             y2-frameWidth);
         }
         else
             rNativeContentRegion = rControlRegion;