diff options
Diffstat (limited to 'vbahelper')
| -rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 2 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbacolorformat.cxx | 2 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 0db919760dc6..8ea64d041ee5 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -424,7 +424,7 @@ void SAL_CALL ScVbaControl::setTag( const OUString& aTag ) ::sal_Int32 SAL_CALL ScVbaControl::getForeColor() { - sal_Int32 nForeColor = -1; + Color nForeColor; m_xProps->getPropertyValue( "TextColor" ) >>= nForeColor; return OORGBToXLRGB( nForeColor ); } diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx index 39ec1c090d93..a052f90c1385 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.cxx +++ b/vbahelper/source/vbahelper/vbacolorformat.cxx @@ -77,7 +77,7 @@ ScVbaColorFormat::getRGB() default: throw uno::RuntimeException( "Second parameter of ColorFormat is wrong." ); } - nRGB = OORGBToXLRGB( nRGB ); + nRGB = OORGBToXLRGB( Color(nRGB) ); return nRGB; } diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index b7432c59935c..77174c82fb93 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -304,6 +304,7 @@ OORGBToXLRGB( sal_Int32 nCol ) sal_Int32 nRGB = ( nAutoBits | (nBlue << 16) | (nGreen << 8) | nRed ); return nRGB; } + sal_Int32 XLRGBToOORGB( sal_Int32 nCol ) { |