[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig include/dbaccess

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/browser/dataview.cxx              |   18 +-----
 dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx |    1 
 dbaccess/uiconfig/ui/appborderwindow.ui              |   54 +++++++++++++------
 include/dbaccess/dataview.hxx                        |    2 
 4 files changed, 43 insertions(+), 32 deletions(-)

New commits:
commit e3aad392609d50d7535c9f3228878a5a0fb1984a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 27 20:17:36 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 28 21:10:52 2020 +0200

    move FixedLine into .ui
    
    Change-Id: Ibc22de48f1ef92d8efbe0167aff3a434ecef9afb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101503
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index b293fadd3cc4..b48a3f0adb17 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -25,7 +25,6 @@
 #include <svtools/acceleratorexecute.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/event.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/settings.hxx>
 
 namespace dbaui
@@ -43,10 +42,8 @@ namespace dbaui
         :Window(pParent,nStyle)
         ,m_xContext(_rxContext)
         ,m_xController( &_rController )
-        ,m_aSeparator( VclPtr<FixedLine>::Create(this) )
     {
         m_pAccel = ::svt::AcceleratorExecute::createAcceleratorHelper();
-        m_aSeparator->Show();
     }
 
     void ODataView::Construct()
@@ -61,12 +58,11 @@ namespace dbaui
     void ODataView::dispose()
     {
         m_xController.clear();
-        m_aSeparator.disposeAndClear();
         m_pAccel.reset();
         vcl::Window::dispose();
     }
 
-    void ODataView::resizeDocumentView( tools::Rectangle& /*_rPlayground*/ )
+    void ODataView::resizeDocumentView(tools::Rectangle& /*_rPlayground*/)
     {
     }
 
@@ -85,17 +81,11 @@ namespace dbaui
         Window::Paint(rRenderContext, _rRect);
     }
 
-    void ODataView::resizeAll( const tools::Rectangle& _rPlayground )
+    void ODataView::resizeAll(const tools::Rectangle& rPlayground)
     {
-        tools::Rectangle aPlayground( _rPlayground );
-
-        // position the separator
-        const Size aSeparatorSize( aPlayground.GetWidth(), 2 );
-        m_aSeparator->SetPosSizePixel( aPlayground.TopLeft(), aSeparatorSize );
-        aPlayground.AdjustTop(aSeparatorSize.Height() + 1 );
-
         // position the controls of the document's view
-        resizeDocumentView( aPlayground );
+        tools::Rectangle aPlayground(rPlayground);
+        resizeDocumentView(aPlayground);
     }
 
     void ODataView::Resize()
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index 7d7fbbe5d9b1..fe405915185b 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDDESCWIN_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDDESCWIN_HXX
 
-#include <vcl/InterimItemWindow.hxx>
 #include <IClipBoardTest.hxx>
 #include <ChildWindow.hxx>
 #include "TableFieldControl.hxx"
diff --git a/dbaccess/uiconfig/ui/appborderwindow.ui b/dbaccess/uiconfig/ui/appborderwindow.ui
index 7083c1c65e57..5586805ea769 100644
--- a/dbaccess/uiconfig/ui/appborderwindow.ui
+++ b/dbaccess/uiconfig/ui/appborderwindow.ui
@@ -7,37 +7,61 @@
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="column_spacing">6</property>
     <child>
-      <object class="GtkBox" id="panel">
+      <object class="GtkGrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="hexpand">False</property>
+        <property name="hexpand">True</property>
         <property name="vexpand">True</property>
-        <property name="orientation">vertical</property>
+        <property name="column_spacing">6</property>
+        <child>
+          <object class="GtkBox" id="panel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="hexpand">False</property>
+            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
         <child>
-          <placeholder/>
+          <object class="GtkBox" id="detail">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+          </packing>
         </child>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="top_attach">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="detail">
+      <object class="GtkSeparator">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <placeholder/>
-        </child>
+        <property name="margin_top">3</property>
+        <property name="margin_bottom">3</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
+        <property name="left_attach">0</property>
         <property name="top_attach">0</property>
       </packing>
     </child>
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx
index bd2b6146b4d8..e6f47a351a6f 100644
--- a/include/dbaccess/dataview.hxx
+++ b/include/dbaccess/dataview.hxx
@@ -38,7 +38,6 @@ namespace svt {
     class AcceleratorExecute;
 }
 
-class FixedLine;
 class NotifyEvent;
 namespace tools { class Rectangle; }
 
@@ -51,7 +50,6 @@ namespace dbaui
 
     protected:
         rtl::Reference<IController> m_xController;  // the controller where we reside in
-        VclPtr<FixedLine>   m_aSeparator;
         ::std::unique_ptr< ::svt::AcceleratorExecute> m_pAccel;
 
     public: