diff options
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/accessibility/accessibledialogcontrolshape.cxx | 16 | ||||
| -rw-r--r-- | basctl/source/accessibility/accessibledialogwindow.cxx | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 5502cde6d32b..25f90d11090c 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -447,12 +447,12 @@ sal_Int32 AccessibleDialogControlShape::getForeground( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nColor = 0; + Color nColor; vcl::Window* pWindow = GetWindow(); if ( pWindow ) { if ( pWindow->IsControlForeground() ) - nColor = pWindow->GetControlForeground().GetColor(); + nColor = pWindow->GetControlForeground(); else { vcl::Font aFont; @@ -460,11 +460,11 @@ sal_Int32 AccessibleDialogControlShape::getForeground( ) aFont = pWindow->GetControlFont(); else aFont = pWindow->GetFont(); - nColor = aFont.GetColor().GetColor(); + nColor = aFont.GetColor(); } } - return nColor; + return sal_Int32(nColor); } @@ -472,17 +472,17 @@ sal_Int32 AccessibleDialogControlShape::getBackground( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nColor = 0; + Color nColor; vcl::Window* pWindow = GetWindow(); if ( pWindow ) { if ( pWindow->IsControlBackground() ) - nColor = pWindow->GetControlBackground().GetColor(); + nColor = pWindow->GetControlBackground(); else - nColor = pWindow->GetBackground().GetColor().GetColor(); + nColor = pWindow->GetBackground().GetColor(); } - return nColor; + return sal_Int32(nColor); } 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); } |