diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/access/accframe.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlexpit.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 2e47aefcdcf4..0aa31107279d 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -374,7 +374,7 @@ bool SwAccessibleFrame::IsOpaque( SwViewShell const *pVSh ) const return false; const SvxBrushItem &rBack = pFrame->GetAttrSet()->GetBackground(); - if( !rBack.GetColor().GetTransparency() || + if( !rBack.GetColor().IsTransparent() || rBack.GetGraphicPos() != GPOS_NONE ) return true; diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 6213a509aa3e..3f39c585a0ab 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -801,7 +801,7 @@ void RtfAttributeOutput::TableBackgrounds( aColor = rBack.GetColor(); } - if (!aColor.GetTransparency()) + if (!aColor.IsTransparent()) { m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CLCBPAT); m_aRowDefs.append(static_cast<sal_Int32>(m_rExport.GetColor(aColor))); @@ -2644,7 +2644,7 @@ void RtfAttributeOutput::CharAnimatedText(const SvxBlinkItem& rBlink) void RtfAttributeOutput::CharBackground(const SvxBrushItem& rBrush) { - if (!rBrush.GetColor().GetTransparency()) + if (!rBrush.GetColor().IsTransparent()) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CHCBPAT); m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetColor(rBrush.GetColor()))); @@ -3460,7 +3460,7 @@ void RtfAttributeOutput::FormatBackground(const SvxBrushItem& rBrush) m_aFlyProperties.push_back(std::make_pair<OString, OString>( "fillColor", OString::number(wwUtility::RGBToBGR(rColor)))); } - else if (!rBrush.GetColor().GetTransparency()) + else if (!rBrush.GetColor().IsTransparent()) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CBPAT); m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetColor(rBrush.GetColor()))); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index e05882cd09ad..e6501dc34ca3 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1554,7 +1554,7 @@ void WW8AttributeOutput::CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisM */ bool WW8Export::TransBrush(const Color& rCol, WW8_SHD& rShd) { - if( rCol.GetTransparency() ) + if( rCol.IsTransparent() ) rShd = WW8_SHD(); // all zeros: transparent else { @@ -1562,7 +1562,7 @@ bool WW8Export::TransBrush(const Color& rCol, WW8_SHD& rShd) rShd.SetBack( msfilter::util::TransColToIco( rCol ) ); rShd.SetStyle( 0 ); } - return !rCol.GetTransparency(); + return !rCol.IsTransparent(); } static sal_uInt32 SuitableBGColor(Color nIn) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index fe4a3ec91d61..061a98923e21 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3603,7 +3603,7 @@ void SwWW8ImplReader::Read_TextForeColor(sal_uInt16, const sal_uInt8* pData, sho Color aColor(msfilter::util::BGRToRGB(SVBT32ToUInt32(pData))); // At least when transparency is 0xff and the color is black, Word renders that as black. - if (aColor.GetTransparency() && aColor != COL_AUTO) + if (aColor.IsTransparent() && aColor != COL_AUTO) { aColor.SetTransparency(0); } diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index d458936a0116..4ab794cc8a9c 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -882,7 +882,7 @@ bool SvXMLExportItemMapper::QueryXMLValue( switch( nMemberId ) { case MID_BACK_COLOR: - if ( rBrush.GetColor().GetTransparency() ) + if ( rBrush.GetColor().IsTransparent() ) aOut.append( GetXMLToken(XML_TRANSPARENT) ); else { |