[Libreoffice-commits] core.git: 2 commits - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/inc/cuitabline.hxx    |    1 -
 cui/source/tabpages/border.cxx   |    4 +++-
 cui/source/tabpages/tplneend.cxx |    7 -------
 3 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 473736e0afefa658b8c1357307f6c4fd5469a7d0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 23 19:47:58 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 24 12:30:25 2019 +0200

    remove SvxLineEndDefTabPage::Resize
    
    Change-Id: I70128f34ab1ab56ec4f99a5533606bd1d49561c8
    Reviewed-on: https://gerrit.libreoffice.org/79439
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index f7b123502b3a..305c6b3d3f90 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -386,7 +386,6 @@ public:
     void    SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
-    virtual void Resize() override;
 };
 
 #endif // INCLUDED_CUI_SOURCE_INC_CUITABLINE_HXX
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 7901503d2d9e..b146fecff049 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -101,13 +101,6 @@ void SvxLineEndDefTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-void SvxLineEndDefTabPage::Resize()
-{
-    rXLSet.Put(XLineStartWidthItem(m_aCtlPreview.GetOutputSize().Height()  / 2));
-    rXLSet.Put(XLineEndWidthItem(m_aCtlPreview.GetOutputSize().Height() / 2));
-    SfxTabPage::Resize();
-}
-
 void SvxLineEndDefTabPage::Construct()
 {
     m_xLbLineEnds->Fill( pLineEndList );
commit cda309c1b8302c6bf4e2bbc24afd82f05d552599
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 24 09:35:21 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 24 12:30:05 2019 +0200

    get text colour without vcl::Window
    
    Change-Id: Ib1a9d438de9a310cf101aeda37f36a791b86ec76
    Reviewed-on: https://gerrit.libreoffice.org/79438
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index d8bed85f67cd..4ff40e150845 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/htmlmode.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 #include <svx/flagsdef.hxx>
 #include <svl/grabbagitem.hxx>
 #include <svl/intitem.hxx>
@@ -758,7 +759,8 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
             aColor = COL_BLACK;
 
         m_xLbLineColor->SelectEntry(aColor);
-        m_xLbLineStyle->SetColor(GetTextColor());
+        auto nTextColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
+        m_xLbLineStyle->SetColor(nTextColor);
 
         // Select all visible lines, if they are all equal.
         if( bWidthEq && bColorEq )