From 26a016be816826c80fc914a927758a814f29136c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 6 Mar 2018 13:08:51 +0200 Subject: use more Color in sfx2..svtools Change-Id: Idd951841ce7e9c4b4e5229bc24efe5c7b8042617 Reviewed-on: https://gerrit.libreoffice.org/50817 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sfx2/source/control/thumbnailviewacc.cxx | 8 ++++---- sfx2/source/dialog/backingwindow.cxx | 4 ++-- sfx2/source/sidebar/Tools.cxx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sfx2/source') diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 600e8d705e21..04a7435ccb54 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -394,14 +394,14 @@ void SAL_CALL ThumbnailViewAcc::grabFocus() sal_Int32 SAL_CALL ThumbnailViewAcc::getForeground( ) { ThrowIfDisposed(); - sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor(); + Color nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor(); return static_cast(nColor); } sal_Int32 SAL_CALL ThumbnailViewAcc::getBackground( ) { ThrowIfDisposed(); - sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); + Color nColor = Application::GetSettings().GetStyleSettings().GetWindowColor(); return static_cast(nColor); } @@ -884,13 +884,13 @@ void SAL_CALL ThumbnailViewItemAcc::grabFocus() sal_Int32 SAL_CALL ThumbnailViewItemAcc::getForeground( ) { - sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor(); + Color nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor(); return static_cast(nColor); } sal_Int32 SAL_CALL ThumbnailViewItemAcc::getBackground( ) { - return static_cast(Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor()); + return static_cast(Application::GetSettings().GetStyleSettings().GetWindowColor()); } sal_Int64 SAL_CALL ThumbnailViewItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 8966a27face4..d2a30e25acdf 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -72,7 +72,7 @@ float const fMultiplier = 1.4f; BackingWindow::BackingWindow( vcl::Window* i_pParent ) : Window( i_pParent ), mbLocalViewInitialized(false), - maButtonsTextColor(officecfg::Office::Common::Help::StartCenter::StartCenterTextColor::get()), + maButtonsTextColor(Color(officecfg::Office::Common::Help::StartCenter::StartCenterTextColor::get())), mbInitControls( false ) { m_pUIBuilder.reset(new VclBuilder(this, getUIRootDir(), "sfx/ui/startcenter.ui", "StartCenter" )); @@ -279,7 +279,7 @@ void BackingWindow::initControls() mpHelpButton->SetControlForeground(maButtonsTextColor); mpExtensionsButton->SetControlForeground(maButtonsTextColor); - const Color aButtonsBackground(officecfg::Office::Common::Help::StartCenter::StartCenterBackgroundColor::get()); + const Color aButtonsBackground = Color(officecfg::Office::Common::Help::StartCenter::StartCenterBackgroundColor::get()); mpAllButtonsBox->SetBackground(aButtonsBackground); mpSmallButtonsBox->SetBackground(aButtonsBackground); diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx index deeb3eb56808..727cd6f24bec 100644 --- a/sfx2/source/sidebar/Tools.cxx +++ b/sfx2/source/sidebar/Tools.cxx @@ -97,8 +97,8 @@ Gradient Tools::AwtToVclGradient (const css::awt::Gradient& rAwtGradient) { Gradient aVclGradient ( GradientStyle(rAwtGradient.Style), - rAwtGradient.StartColor, - rAwtGradient.EndColor); + Color(rAwtGradient.StartColor), + Color(rAwtGradient.EndColor)); aVclGradient.SetAngle(rAwtGradient.Angle); aVclGradient.SetBorder(rAwtGradient.Border); aVclGradient.SetOfsX(rAwtGradient.XOffset); -- cgit