diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-08 10:06:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-09 07:14:22 +0100 |
| commit | ba43b0cb7a62f34fcda214d43122c7c66df2e5a0 (patch) | |
| tree | 146d062c82fd942ff06b087390e5901c3eba0cfa /basctl/source/accessibility/accessibledialogwindow.cxx | |
| parent | tdf#116301: write correct content type for diagramDrawing (diff) | |
| download | core-ba43b0cb7a62f34fcda214d43122c7c66df2e5a0.tar.gz core-ba43b0cb7a62f34fcda214d43122c7c66df2e5a0.zip | |
drop getColor() method of Color
no longer necessary
Change-Id: I9e0fcea1134e8c5e27f9effbb5eb79fe5446e33d
Reviewed-on: https://gerrit.libreoffice.org/50925
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basctl/source/accessibility/accessibledialogwindow.cxx')
| -rw-r--r-- | basctl/source/accessibility/accessibledialogwindow.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 473f698d53d8..c7f66797e2a8 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -758,11 +758,11 @@ sal_Int32 AccessibleDialogWindow::getForeground( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nColor = 0; + Color nColor; if ( m_pDialogWindow ) { if ( m_pDialogWindow->IsControlForeground() ) - nColor = m_pDialogWindow->GetControlForeground().GetColor(); + nColor = m_pDialogWindow->GetControlForeground(); else { vcl::Font aFont; @@ -770,11 +770,11 @@ sal_Int32 AccessibleDialogWindow::getForeground( ) aFont = m_pDialogWindow->GetControlFont(); else aFont = m_pDialogWindow->GetFont(); - nColor = aFont.GetColor().GetColor(); + nColor = aFont.GetColor(); } } - return nColor; + return sal_Int32(nColor); } @@ -782,16 +782,16 @@ sal_Int32 AccessibleDialogWindow::getBackground( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nColor = 0; + Color nColor; if ( m_pDialogWindow ) { if ( m_pDialogWindow->IsControlBackground() ) - nColor = m_pDialogWindow->GetControlBackground().GetColor(); + nColor = m_pDialogWindow->GetControlBackground(); else - nColor = m_pDialogWindow->GetBackground().GetColor().GetColor(); + nColor = m_pDialogWindow->GetBackground().GetColor(); } - return nColor; + return sal_Int32(nColor); } |