summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/Accessibility/AccessibleCellBase.cxx8
-rw-r--r--sc/source/ui/Accessibility/AccessibleCsvControl.cxx8
-rw-r--r--sc/source/ui/app/rfindlst.cxx4
-rw-r--r--sc/source/ui/cctrl/cbuttonw.cxx2
-rw-r--r--sc/source/ui/optdlg/opredlin.cxx18
-rw-r--r--sc/source/ui/sidebar/CellBorderUpdater.cxx2
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx4
-rw-r--r--sc/source/ui/unoobj/condformatuno.cxx13
-rw-r--r--sc/source/ui/unoobj/confuno.cxx2
-rw-r--r--sc/source/ui/unoobj/viewuno.cxx4
-rw-r--r--sc/source/ui/vba/vbaborders.cxx2
-rw-r--r--sc/source/ui/vba/vbainterior.cxx19
-rw-r--r--sc/source/ui/vba/vbapalette.cxx16
-rw-r--r--sc/source/ui/view/formatsh.cxx2
-rw-r--r--sc/source/ui/view/viewdata.cxx7
15 files changed, 53 insertions, 58 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 0ab07a04f1e9..b8ca55e48091 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -476,10 +476,10 @@ OUString ScAccessibleCellBase::getBorderAttrs()
bool bIn = mpDoc && mpDoc->IsCellInChangeTrack(maCellAddress,&aColor);
if (bIn)
{
- aTopBorder.Color = aColor.GetColor();
- aBottomBorder.Color = aColor.GetColor();
- aLeftBorder.Color = aColor.GetColor();
- aRightBorder.Color = aColor.GetColor();
+ aTopBorder.Color = sal_Int32(aColor);
+ aBottomBorder.Color = sal_Int32(aColor);
+ aLeftBorder.Color = sal_Int32(aColor);
+ aRightBorder.Color = sal_Int32(aColor);
aTopBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
aBottomBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
aLeftBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 442e5d9d4d9b..85985c4b722c 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -344,14 +344,14 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getForeground( )
{
SolarMutexGuard aGuard;
ensureAlive();
- return implGetRuler().GetSettings().GetStyleSettings().GetLabelTextColor().GetColor();
+ return sal_Int32(implGetRuler().GetSettings().GetStyleSettings().GetLabelTextColor());
}
sal_Int32 SAL_CALL ScAccessibleCsvRuler::getBackground( )
{
SolarMutexGuard aGuard;
ensureAlive();
- return implGetRuler().GetSettings().GetStyleSettings().GetFaceColor().GetColor();
+ return sal_Int32(implGetRuler().GetSettings().GetStyleSettings().GetFaceColor());
}
// XAccessibleContext ---------------------------------------------------------
@@ -878,7 +878,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getForeground( )
{
SolarMutexGuard aGuard;
ensureAlive();
- return implGetGrid().GetSettings().GetStyleSettings().GetButtonTextColor().GetColor();
+ return sal_Int32(implGetGrid().GetSettings().GetStyleSettings().GetButtonTextColor());
}
sal_Int32 SAL_CALL ScAccessibleCsvGrid::getBackground( )
@@ -1395,7 +1395,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvCell::getForeground( )
{
SolarMutexGuard aGuard;
ensureAlive();
- return implGetGrid().GetSettings().GetStyleSettings().GetButtonTextColor().GetColor();
+ return sal_Int32(implGetGrid().GetSettings().GetStyleSettings().GetButtonTextColor());
}
sal_Int32 SAL_CALL ScAccessibleCsvCell::getBackground( )
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index bf4d9a719f3d..93ee2d254f0f 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -58,8 +58,8 @@ Color ScRangeFindList::FindColor( const ScRange& rRef, const size_t nIndex )
{
sal_Int32 nOldCntr = 0;
sal_Int32 nNewCntr = 0;
- Color nOldColor = 0;
- Color nNewColor = 0;
+ Color nOldColor = Color(0);
+ Color nNewColor = Color(0);
DBG_ASSERT( (nIndex < maEntries.size()), "nIndex out of range!" );
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index acca81ea9266..c8e12e6fbeec 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -112,7 +112,7 @@ void ScDDComboBoxButton::ImpDrawArrow( const tools::Rectangle& rRect )
tools::Rectangle aTempRect = aPixRect;
const StyleSettings& rSett = Application::GetSettings().GetStyleSettings();
- Color aColor( rSett.GetButtonTextColor().GetColor() );
+ Color aColor( rSett.GetButtonTextColor() );
pOut->SetFillColor( aColor );
pOut->SetLineColor( aColor );
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 586f15761276..ba781c86e01c 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -76,16 +76,16 @@ bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ )
{
ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
- sal_uLong nNew = m_pContentColorLB->GetSelectEntryColor().GetColor();
+ Color nNew = m_pContentColorLB->GetSelectEntryColor();
aAppOptions.SetTrackContentColor(nNew);
- nNew = m_pMoveColorLB->GetSelectEntryColor().GetColor();
+ nNew = m_pMoveColorLB->GetSelectEntryColor();
aAppOptions.SetTrackMoveColor(nNew);
- nNew = m_pInsertColorLB->GetSelectEntryColor().GetColor();
+ nNew = m_pInsertColorLB->GetSelectEntryColor();
aAppOptions.SetTrackInsertColor(nNew);
- nNew = m_pRemoveColorLB->GetSelectEntryColor().GetColor();
+ nNew = m_pRemoveColorLB->GetSelectEntryColor();
aAppOptions.SetTrackDeleteColor(nNew);
SC_MOD()->SetAppOptions(aAppOptions);
@@ -103,17 +103,17 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ )
{
ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
- sal_uLong nColor = aAppOptions.GetTrackContentColor();
- m_pContentColorLB->SelectEntry(Color(nColor));
+ Color nColor = aAppOptions.GetTrackContentColor();
+ m_pContentColorLB->SelectEntry(nColor);
nColor = aAppOptions.GetTrackMoveColor();
- m_pMoveColorLB->SelectEntry(Color(nColor));
+ m_pMoveColorLB->SelectEntry(nColor);
nColor = aAppOptions.GetTrackInsertColor();
- m_pInsertColorLB->SelectEntry(Color(nColor));
+ m_pInsertColorLB->SelectEntry(nColor);
nColor = aAppOptions.GetTrackDeleteColor();
- m_pRemoveColorLB->SelectEntry(Color(nColor));
+ m_pRemoveColorLB->SelectEntry(nColor);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/CellBorderUpdater.cxx b/sc/source/ui/sidebar/CellBorderUpdater.cxx
index cc7edb54d63a..3f06f92eb7b8 100644
--- a/sc/source/ui/sidebar/CellBorderUpdater.cxx
+++ b/sc/source/ui/sidebar/CellBorderUpdater.cxx
@@ -45,7 +45,7 @@ void CellBorderUpdater::UpdateCellBorder(bool bTop, bool bBot, bool bLeft, bool
ScopedVclPtr<VirtualDevice> pVirDev(VclPtr<VirtualDevice>::Create());
pVirDev->SetOutputSizePixel(aBmpSize);
pVirDev->SetLineColor( ::Application::GetSettings().GetStyleSettings().GetFieldTextColor() ) ;
- pVirDev->SetFillColor( COL_BLACK);
+ pVirDev->SetFillColor(COL_BLACK);
Point aTL(2, 1), aTR(42,1), aBL(2, 41), aBR(42, 41), aHL(2,21), aHR(42, 21), aVT(22,1), aVB(22, 41);
if(bLeft)
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index dad666ff6b02..12c9d94241ad 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -8366,7 +8366,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
ScScenarioFlags nFlags;
rDoc.GetScenarioData( nTab, aComment, aColor, nFlags );
- rAny <<= static_cast<sal_Int32>(aColor.GetColor());
+ rAny <<= aColor;
}
}
else if ( pEntry->nWID == SC_WID_UNO_PROTECT )
@@ -8443,7 +8443,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
}
else if ( pEntry->nWID == SC_WID_UNO_TABCOLOR )
{
- rAny <<= sal_Int32(rDoc.GetTabBgColor(nTab).GetColor());
+ rAny <<= rDoc.GetTabBgColor(nTab);
}
else if ( pEntry->nWID == SC_WID_UNO_CODENAME )
{
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index b3078655ffc6..50fb8a76e326 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -882,7 +882,7 @@ void setColorScaleEntry(ScColorScaleEntry* pEntry, uno::Reference<sheet::XColorS
throw lang::IllegalArgumentException();
pEntry->SetType(eType);
- pEntry->SetColor(xEntry->getColor());
+ pEntry->SetColor(Color(xEntry->getColor()));
switch (eType)
{
case COLORSCALE_FORMULA:
@@ -1011,7 +1011,7 @@ ScColorScaleEntry* ScColorScaleEntryObj::getCoreObject()
util::Color ScColorScaleEntryObj::getColor()
{
Color aColor = getCoreObject()->GetColor();
- return aColor.GetColor();
+ return sal_Int32(aColor);
}
void ScColorScaleEntryObj::setColor(util::Color aColor)
@@ -1318,22 +1318,19 @@ uno::Any SAL_CALL ScDataBarFormatObj::getPropertyValue( const OUString& aPropert
break;
case DataBar_Color:
{
- sal_Int32 nColor = getCoreObject()->GetDataBarData()->maPositiveColor.GetColor();
- aAny <<= nColor;
+ aAny <<= getCoreObject()->GetDataBarData()->maPositiveColor;
}
break;
case AxisColor:
{
- sal_Int32 nAxisColor = getCoreObject()->GetDataBarData()->maAxisColor.GetColor();
- aAny <<= nAxisColor;
+ aAny <<= getCoreObject()->GetDataBarData()->maAxisColor;
}
break;
case NegativeColor:
{
if (getCoreObject()->GetDataBarData()->mbNeg && getCoreObject()->GetDataBarData()->mpNegativeColor)
{
- sal_Int32 nNegativeColor = getCoreObject()->GetDataBarData()->mpNegativeColor->GetColor();
- aAny <<= nNegativeColor;
+ aAny <<= *getCoreObject()->GetDataBarData()->mpNegativeColor;
}
}
break;
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 01528c65697c..fefdcc3773b7 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -422,7 +422,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
{
OUString aColorName;
Color aColor = aViewOpt.GetGridColor(&aColorName);
- aRet <<= static_cast<sal_Int64>(aColor.GetColor());
+ aRet <<= aColor;
}
else if ( aPropertyName == SC_UNO_SHOWPAGEBR )
aRet <<= aViewOpt.GetOption( VOPT_PAGEBREAKS );
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 094d1d4d4557..d2538279d043 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1828,7 +1828,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
}
else if ( aPropertyName == SC_UNO_GRIDCOLOR )
{
- sal_Int32 nIntVal = 0;
+ Color nIntVal;
if ( aValue >>= nIntVal )
aNewOpt.SetGridColor( nIntVal, OUString() );
}
@@ -1908,7 +1908,7 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName
else if ( aPropertyName == SC_UNO_SHOWOBJ ) aRet <<= static_cast<sal_Int16>( rOpt.GetObjMode( VOBJ_TYPE_OLE ) );
else if ( aPropertyName == SC_UNO_SHOWCHARTS ) aRet <<= static_cast<sal_Int16>( rOpt.GetObjMode( VOBJ_TYPE_CHART ) );
else if ( aPropertyName == SC_UNO_SHOWDRAW ) aRet <<= static_cast<sal_Int16>( rOpt.GetObjMode( VOBJ_TYPE_DRAW ) );
- else if ( aPropertyName == SC_UNO_GRIDCOLOR ) aRet <<= static_cast<sal_Int32>( rOpt.GetGridColor().GetColor() );
+ else if ( aPropertyName == SC_UNO_GRIDCOLOR ) aRet <<= rOpt.GetGridColor();
else if ( aPropertyName == SC_UNO_VISAREA ) aRet <<= GetVisArea();
else if ( aPropertyName == SC_UNO_ZOOMTYPE ) aRet <<= GetZoomType();
else if ( aPropertyName == SC_UNO_ZOOMVALUE ) aRet <<= GetZoom();
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 19688010aad9..b56ceff1c540 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -164,7 +164,7 @@ public:
{
table::BorderLine aBorderLine;
if ( getBorderLine( aBorderLine ) )
- return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) );
+ return uno::makeAny( OORGBToXLRGB( Color(aBorderLine.Color) ) );
throw uno::RuntimeException("No Implementation available" );
}
void SAL_CALL setColor( const uno::Any& _color ) override
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index c40224a04f04..783baa466705 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -41,7 +41,6 @@
#include "vbapalette.hxx"
#include <document.hxx>
-#define COLORMAST 0xFFFFFF
typedef std::map< sal_Int32, sal_Int32 > PatternMap;
typedef std::pair< sal_Int32, sal_Int32 > PatternPair;
using namespace ::com::sun::star;
@@ -82,7 +81,7 @@ static PatternMap aPatternMap( lcl_getPatternMap() );
ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >& xProps, ScDocument* pScDoc ) : ScVbaInterior_BASE( xParent, xContext ), m_xProps(xProps), m_pScDoc( pScDoc )
{
// auto color
- m_aPattColor = sal_uInt32(0x0);
+ m_aPattColor = Color(0);
m_nPattern = 0;
if ( !m_xProps.is() )
throw lang::IllegalArgumentException("properties", uno::Reference< uno::XInterface >(), 2 );
@@ -120,18 +119,18 @@ ScVbaInterior::SetMixedColor()
if( aPatternColor.hasValue() )
{
sal_uInt32 nPatternColor = GetAttributeData( aPatternColor );
- m_aPattColor = nPatternColor;
+ m_aPattColor = Color(nPatternColor);
}
- sal_Int32 nPatternColor = m_aPattColor.GetColor();
+ Color nPatternColor = m_aPattColor;
// back color
Color aBackColor( GetBackColor() );
// set mixed color
Color aMixedColor;
if( nPattern > 0 )
- aMixedColor = GetPatternColor( Color(nPatternColor), aBackColor, static_cast<sal_uInt32>(nPattern) );
+ aMixedColor = GetPatternColor( nPatternColor, aBackColor, static_cast<sal_uInt32>(nPattern) );
else
aMixedColor = GetPatternColor( aBackColor, aBackColor, static_cast<sal_uInt32>(nPattern) );
- sal_Int32 nMixedColor = aMixedColor.GetColor() & COLORMAST;
+ Color nMixedColor = aMixedColor.GetRGBColor();
m_xProps->setPropertyValue( BACKCOLOR , uno::makeAny( nMixedColor ) );
}
@@ -319,7 +318,7 @@ ScVbaInterior::GetBackColor()
if( aColor.hasValue() )
{
nColor = GetAttributeData( aColor );
- aBackColor = nColor;
+ aBackColor = Color(nColor);
}
else
{
@@ -328,7 +327,7 @@ ScVbaInterior::GetBackColor()
if( aAny >>= nColor )
{
nColor = XLRGBToOORGB( nColor );
- aBackColor = nColor;
+ aBackColor = Color(nColor);
SetUserDefinedAttributes( BACKCOLOR, SetAttributeData( nColor ) );
}
}
@@ -342,7 +341,7 @@ ScVbaInterior::getPatternColor()
if( aPatternColor.hasValue() )
{
sal_uInt32 nPatternColor = GetAttributeData( aPatternColor );
- return uno::makeAny( OORGBToXLRGB( nPatternColor ) );
+ return uno::makeAny( OORGBToXLRGB( Color(nPatternColor) ) );
}
return uno::makeAny( sal_Int32( 0 ) );
}
@@ -374,7 +373,7 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex )
if( nColorIndex == 0 )
return;
- sal_Int32 nPattColor = 0;
+ Color nPattColor;
GetIndexColor( nColorIndex ) >>= nPattColor;
setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) );
diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx
index 3bb8d9f28c6b..de7f0aaf3319 100644
--- a/sc/source/ui/vba/vbapalette.cxx
+++ b/sc/source/ui/vba/vbapalette.cxx
@@ -31,20 +31,20 @@ using namespace ::ooo::vba;
/** Standard EGA colors, bright. */
#define EXC_PALETTE_EGA_COLORS_LIGHT \
- 0x000000, 0xFFFFFF, 0xFF0000, 0x00FF00, 0x0000FF, 0xFFFF00, 0xFF00FF, 0x00FFFF
-/** Standard EGA colors, dark. */
+ Color(0x000000), Color(0xFFFFFF), Color(0xFF0000), Color(0x00FF00), Color(0x0000FF), Color(0xFFFF00), Color(0xFF00FF), Color(0x00FFFF)
+/** Standard EGA colors), dark. */
#define EXC_PALETTE_EGA_COLORS_DARK \
- 0x800000, 0x008000, 0x000080, 0x808000, 0x800080, 0x008080, 0xC0C0C0, 0x808080
+ Color(0x800000), Color(0x008000), Color(0x000080), Color(0x808000), Color(0x800080), Color(0x008080), Color(0xC0C0C0), Color(0x808080)
static const Color spnDefColorTable8[] =
{
/* 8 */ EXC_PALETTE_EGA_COLORS_LIGHT,
/* 16 */ EXC_PALETTE_EGA_COLORS_DARK,
-/* 24 */ 0x9999FF, 0x993366, 0xFFFFCC, 0xCCFFFF, 0x660066, 0xFF8080, 0x0066CC, 0xCCCCFF,
-/* 32 */ 0x000080, 0xFF00FF, 0xFFFF00, 0x00FFFF, 0x800080, 0x800000, 0x008080, 0x0000FF,
-/* 40 */ 0x00CCFF, 0xCCFFFF, 0xCCFFCC, 0xFFFF99, 0x99CCFF, 0xFF99CC, 0xCC99FF, 0xFFCC99,
-/* 48 */ 0x3366FF, 0x33CCCC, 0x99CC00, 0xFFCC00, 0xFF9900, 0xFF6600, 0x666699, 0x969696,
-/* 56 */ 0x003366, 0x339966, 0x003300, 0x333300, 0x993300, 0x993366, 0x333399, 0x333333
+/* 24 */ Color(0x9999FF), Color(0x993366), Color(0xFFFFCC), Color(0xCCFFFF), Color(0x660066), Color(0xFF8080), Color(0x0066CC), Color(0xCCCCFF),
+/* 32 */ Color(0x000080), Color(0xFF00FF), Color(0xFFFF00), Color(0x00FFFF), Color(0x800080), Color(0x800000), Color(0x008080), Color(0x0000FF),
+/* 40 */ Color(0x00CCFF), Color(0xCCFFFF), Color(0xCCFFCC), Color(0xFFFF99), Color(0x99CCFF), Color(0xFF99CC), Color(0xCC99FF), Color(0xFFCC99),
+/* 48 */ Color(0x3366FF), Color(0x33CCCC), Color(0x99CC00), Color(0xFFCC00), Color(0xFF9900), Color(0xFF6600), Color(0x666699), Color(0x969696),
+/* 56 */ Color(0x003366), Color(0x339966), Color(0x003300), Color(0x333300), Color(0x993300), Color(0x993366), Color(0x333399), Color(0x333333)
};
typedef ::cppu::WeakImplHelper< container::XIndexAccess > XIndexAccess_BASE;
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index f8f5cb10250d..6c735a9a4362 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2071,7 +2071,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
case SID_FRAME_LINECOLOR:
{
// handled together because both need the cell border information for decisions
- Color aCol = 0;
+ Color aCol;
editeng::SvxBorderLine aLine(nullptr,0,SvxBorderLineStyle::SOLID);
bool bCol = false;
bool bColDisable = false, bStyleDisable = false;
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 52c6f456d97b..1b7bdb769d87 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -3325,7 +3325,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe
pSettings[SC_GRIDCOLOR].Name = SC_UNO_GRIDCOLOR;
OUString aColorName;
Color aColor = pOptions->GetGridColor(&aColorName);
- pSettings[SC_GRIDCOLOR].Value <<= static_cast<sal_Int64>(aColor.GetColor());
+ pSettings[SC_GRIDCOLOR].Value <<= aColor;
pSettings[SC_SHOWPAGEBR].Name = SC_UNO_SHOWPAGEBR;
pSettings[SC_SHOWPAGEBR].Value <<= pOptions->GetOption( VOPT_PAGEBREAKS );
pSettings[SC_COLROWHDR].Name = SC_UNO_COLROWHDR;
@@ -3454,10 +3454,9 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
pOptions->SetOption(VOPT_GRID, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
else if ( sName == SC_UNO_GRIDCOLOR )
{
- sal_Int64 nColor = 0;
- if (rSettings[i].Value >>= nColor)
+ Color aColor;
+ if (rSettings[i].Value >>= aColor)
{
- Color aColor(static_cast<sal_uInt32>(nColor));
// #i47435# set automatic grid color explicitly
if( aColor == COL_AUTO )
aColor = SC_STD_GRIDCOLOR;
generated by cgit (git 2.34.1) at 2024-08-10 12:31:25 +0000