diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-20 15:22:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-21 06:05:41 +0100 |
| commit | 72593849bb644684a8c00f70a3f18bcfabca737f (patch) | |
| tree | 6325d6a52bce0f0539dde6fee53aa7fd792e8eb2 /starmath | |
| parent | bcb1e01c32e09d9abeb91b73303f2eb6b3b5abfe (diff) | |
ColorData->Color in sd..svx
Change-Id: I70de56b6bfb1ea4655ec03510fad92bf6645f64e
Reviewed-on: https://gerrit.libreoffice.org/50046
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/accessibility.cxx | 4 | ||||
| -rw-r--r-- | starmath/source/tmpdevice.cxx | 4 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index afb79f841ee3..59ab5412c806 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -264,7 +264,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getBackground() if (!pWin) throw RuntimeException(); Wallpaper aWall( pWin->GetDisplayBackground() ); - ColorData nCol; + Color nCol; if (aWall.IsBitmap() || aWall.IsGradient()) nCol = pWin->GetSettings().GetStyleSettings().GetWindowColor().GetColor(); else @@ -1689,7 +1689,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getBackground() if (!pWin) throw RuntimeException(); Wallpaper aWall( pWin->GetDisplayBackground() ); - ColorData nCol; + Color nCol; if (aWall.IsBitmap() || aWall.IsGradient()) nCol = pWin->GetSettings().GetStyleSettings().GetWindowColor().GetColor(); else diff --git a/starmath/source/tmpdevice.cxx b/starmath/source/tmpdevice.cxx index e47bc1b72ffb..3e822a3f7854 100644 --- a/starmath/source/tmpdevice.cxx +++ b/starmath/source/tmpdevice.cxx @@ -45,8 +45,8 @@ SmTmpDevice::SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm) : Color SmTmpDevice::Impl_GetColor( const Color& rColor ) { - ColorData nNewCol = rColor.GetColor(); - if (COL_AUTO == nNewCol) + Color nNewCol = rColor.GetColor(); + if (nNewCol == COL_AUTO) { if (OUTDEV_PRINTER == rOutDev.GetOutDevType()) nNewCol = COL_BLACK; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index e007b78b0cab..fbd977d07ff2 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -133,7 +133,7 @@ void SmGraphicWindow::ApplyColorConfigValues(const svtools::ColorConfig &rColorC { // Note: SetTextColor not necessary since the nodes that // get painted have the color information. - SetBackground(Color(static_cast<ColorData>(rColorCfg.GetColorValue(svtools::DOCCOLOR).nColor))); + SetBackground(rColorCfg.GetColorValue(svtools::DOCCOLOR).nColor); } |