mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use more Color in vbahelper

Browse Source 
Change-Id: I9d153b184a394ac21d504cb503731f8c5c8ec1de
Reviewed-on: https://gerrit.libreoffice.org/50797
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-03-06 10:46:22 +02:00
parent a0a57a3567
commit b8b7f8a8f8
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vbahelper/source/msforms/vbacontrol.cxx
View File

@@ -424,7 +424,7 @@ void SAL_CALL ScVbaControl::setTag( const OUString& aTag )
::sal_Int32 SAL_CALL ScVbaControl::getForeColor() ::sal_Int32 SAL_CALL ScVbaControl::getForeColor()
{ {
sal_Int32 nForeColor = -1; Color nForeColor;
m_xProps->getPropertyValue( "TextColor" ) >>= nForeColor; m_xProps->getPropertyValue( "TextColor" ) >>= nForeColor;
return OORGBToXLRGB( nForeColor ); return OORGBToXLRGB( nForeColor );
} }

2
vbahelper/source/vbahelper/vbacolorformat.cxx
View File

@@ -77,7 +77,7 @@ ScVbaColorFormat::getRGB()
default: default:
throw uno::RuntimeException( "Second parameter of ColorFormat is wrong." ); throw uno::RuntimeException( "Second parameter of ColorFormat is wrong." );
} }
nRGB = OORGBToXLRGB( nRGB ); nRGB = OORGBToXLRGB( Color(nRGB) );
return nRGB; return nRGB;
} }

1
vbahelper/source/vbahelper/vbahelper.cxx
View File

@@ -304,6 +304,7 @@ OORGBToXLRGB( sal_Int32 nCol )
sal_Int32 nRGB = ( nAutoBits | (nBlue << 16) | (nGreen << 8) | nRed ); sal_Int32 nRGB = ( nAutoBits | (nBlue << 16) | (nGreen << 8) | nRed );
return nRGB; return nRGB;
} }
sal_Int32 sal_Int32
XLRGBToOORGB( sal_Int32 nCol ) XLRGBToOORGB( sal_Int32 nCol )
{ {