summaryrefslogtreecommitdiffstats
path: root/sc/source
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/filter/excel/xistyle.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx2
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx2
-rw-r--r--sc/source/filter/orcus/interface.cxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx4
-rw-r--r--sc/source/ui/view/editsh.cxx2
-rw-r--r--sc/source/ui/view/formatsh.cxx8
-rw-r--r--sc/source/ui/view/output2.cxx2
-rw-r--r--sc/source/ui/view/tabvwshf.cxx2
9 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 995219fc710a..a8a5cd56a78f 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -366,7 +366,7 @@ void XclImpFont::FillToItemSet( SfxItemSet& rItemSet, XclFontItemType eType, boo
// Font color - pass AUTO_COL to item
if( mbColorUsed )
- PUTITEM( SvxColorItem( maData.maColor, ATTR_FONT_COLOR ), ATTR_FONT_COLOR, EE_CHAR_COLOR );
+ PUTITEM( SvxColorItem( maData.maColor, ColorSets::getColorSetsFromItemSet(rItemSet), ATTR_FONT_COLOR ), ATTR_FONT_COLOR, EE_CHAR_COLOR );
// Font weight (for all script types)
if( mbWeightUsed )
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index e320269352ed..ba9761336bc7 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1438,7 +1438,7 @@ void ScHTMLLayoutParser::FontOn( HtmlImportInfo* pInfo )
{
Color aColor;
rOption.GetColor( aColor );
- mxActEntry->aItemSet.Put( SvxColorItem( aColor, ATTR_FONT_COLOR ) );
+ mxActEntry->aItemSet.Put( SvxColorItem( aColor, ColorSets::getColorSetsFromItemSet(mxActEntry->aItemSet), ATTR_FONT_COLOR ) );
}
break;
default: break;
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index b0c574f09378..7e6dce759fc6 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -929,7 +929,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, bool bEditEngineText, bool bSkip
// character color
if( maUsedFlags.mbColorUsed )
{
- ScfTools::PutItem( rItemSet,SvxColorItem( maApiData.mnColor, bEditEngineText ? static_cast<sal_uInt16>(EE_CHAR_COLOR) : ATTR_FONT_COLOR), bSkipPoolDefs );
+ ScfTools::PutItem( rItemSet,SvxColorItem( maApiData.mnColor, ColorSets::getColorSetsFromItemSet(rItemSet), bEditEngineText ? static_cast<sal_uInt16>(EE_CHAR_COLOR) : ATTR_FONT_COLOR), bSkipPoolDefs );
}
// underline style
if( maUsedFlags.mbUnderlineUsed )
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index b996449c8218..715a4b2899d1 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -1365,7 +1365,7 @@ void ScOrcusStyles::font::applyToItemSet(SfxItemSet& rSet) const
FontWeight eWeight = mbBold ? WEIGHT_BOLD : WEIGHT_NORMAL;
rSet.Put(SvxWeightItem(eWeight, ATTR_FONT_WEIGHT));
- rSet.Put( SvxColorItem(maColor, ATTR_FONT_COLOR));
+ rSet.Put( SvxColorItem(maColor, ColorSets::getColorSetsFromItemSet(rSet), ATTR_FONT_COLOR));
if(!maName.isEmpty())
rSet.Put( SvxFontItem( FAMILY_DONTKNOW, maName, maName, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ));
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index a8bf4a39e8f9..4e1affc638ac 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -410,7 +410,7 @@ handle_r1c1:
ESelection aSel( 0, nStart, 0, nPos );
SfxItemSet aSet( mpEditEngine->GetEmptyItemSet() );
- aSet.Put( SvxColorItem( nColor, EE_CHAR_COLOR ) );
+ aSet.Put( SvxColorItem( nColor, ColorSets::getColorSetsFromItemSet(aSet), EE_CHAR_COLOR ) );
mpEditEngine->QuickSetAttribs( aSet, aSel );
++nCount;
}
@@ -610,7 +610,7 @@ void ScInputHandler::UpdateRange( sal_uInt16 nIndex, const ScRange& rNew )
lcl_Replace( pTopView, aNewStr, aOldSel );
lcl_Replace( pTableView, aNewStr, aOldSel );
- aSet.Put( SvxColorItem( nNewColor, EE_CHAR_COLOR ) );
+ aSet.Put( SvxColorItem( nNewColor, ColorSets::getColorSetsFromItemSet(aSet), EE_CHAR_COLOR ) );
mpEditEngine->QuickSetAttribs( aSet, aOldSel );
bInRangeUpdate = true;
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index f51e8f49290f..027ce966711a 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -978,7 +978,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
else
aColor = Color( ColorTransparency, sColor.toInt32( 16 ) );
- aSet.Put( SvxColorItem( aColor, EE_CHAR_COLOR ) );
+ aSet.Put( SvxColorItem( aColor, ColorSets::getColorSetsFromItemSet(aSet), EE_CHAR_COLOR ) );
}
else
{
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index a418f3185c8a..495b3088bc51 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2066,7 +2066,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
{
case SID_BACKGROUND_COLOR:
{
- rSet.Put( SvxColorItem( rBrushItem.GetColor(), SID_BACKGROUND_COLOR ) );
+ rSet.Put( SvxColorItem( rBrushItem.GetColor(), ColorSets::getColorSetsFromItemSet(rSet), SID_BACKGROUND_COLOR ) );
if(SfxItemState::DONTCARE == rAttrSet.GetItemState(ATTR_BACKGROUND))
{
rSet.InvalidateItem(SID_BACKGROUND_COLOR);
@@ -2206,16 +2206,16 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
if(bColDisable) // if different lines have different colors
{
aCol = COL_TRANSPARENT;
- rSet.Put( SvxColorItem(aCol, SID_FRAME_LINECOLOR ) );
+ rSet.Put( SvxColorItem(aCol, ColorSets::getColorSetsFromItemSet(rSet), SID_FRAME_LINECOLOR ) );
rSet.InvalidateItem(SID_FRAME_LINECOLOR);
}
else if (!bCol) // if no line available
{
aCol = COL_AUTO;
- rSet.Put( SvxColorItem(aCol, SID_FRAME_LINECOLOR ) );
+ rSet.Put( SvxColorItem(aCol, ColorSets::getColorSetsFromItemSet(rSet), SID_FRAME_LINECOLOR ) );
}
else
- rSet.Put( SvxColorItem(aCol, SID_FRAME_LINECOLOR ) );
+ rSet.Put( SvxColorItem(aCol, ColorSets::getColorSetsFromItemSet(rSet), SID_FRAME_LINECOLOR ) );
}
else // if( nWhich == SID_FRAME_LINESTYLE)
{
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 2d45fa62eaa7..e040d1a3278b 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -916,7 +916,7 @@ static void lcl_SetEditColor( EditEngine& rEngine, const Color& rColor )
{
ESelection aSel( 0, 0, rEngine.GetParagraphCount(), 0 );
SfxItemSet aSet( rEngine.GetEmptyItemSet() );
- aSet.Put( SvxColorItem( rColor, EE_CHAR_COLOR ) );
+ aSet.Put( SvxColorItem( rColor, ColorSets::getColorSetsFromItemSet(aSet), EE_CHAR_COLOR ) );
rEngine.QuickSetAttribs( aSet, aSel );
// function is called with update mode set to FALSE
}
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 57b0bf6696d1..7e3ecc332edb 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -992,7 +992,7 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
case FID_TAB_SET_TAB_BG_COLOR:
{
Color aColor = rDoc.GetTabBgColor( nTab );
- rSet.Put( SvxColorItem( aColor, nWhich ) );
+ rSet.Put( SvxColorItem( aColor, ColorSets::getColorSetsFromItemSet(rSet), nWhich ) );
}
break;
generated by cgit (git 2.34.1) at 2024-06-09 06:28:39 +0000