diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/htmldrawwriter.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index d6005f1730ed..1eef03d8a148 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2630,7 +2630,7 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) OString sOut = "<" OOO_STRING_SVTOOLS_HTML_font " " OOO_STRING_SVTOOLS_HTML_O_color "="; rWrt.Strm().WriteOString( sOut ); - HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor, rHTMLWrt.m_eDestEnc ).WriteChar( '>' ); + HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor ).WriteChar( '>' ); } else HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, false ); diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index 6195eac9c0b6..2af0c66397fd 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -274,7 +274,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt, sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append("="); rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); - HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor, rHTMLWrt.m_eDestEnc ); + HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor ); } if (!sOut.isEmpty()) diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 5596225a6245..040fdd5b86e4 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -878,7 +878,7 @@ static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat, Color aColor( pColorItem->GetValue() ); if( COL_AUTO == aColor.GetColor() ) aColor.SetColor( COL_BLACK ); - HTMLOutFuncs::Out_Color( rHWrt.Strm(), aColor, rHWrt.m_eDestEnc ); + HTMLOutFuncs::Out_Color( rHWrt.Strm(), aColor ); if( RES_POOLCOLL_STANDARD==pFormat->GetPoolFormatId() ) rHWrt.m_pDfltColor = new Color( aColor ); } @@ -1211,7 +1211,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic OStringBuffer sOut; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append('='); Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); - HTMLOutFuncs::Out_Color( Strm(), rBackColor, m_eDestEnc); + HTMLOutFuncs::Out_Color( Strm(), rBackColor); } if( !bGraphic ) diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 5e8827da34e5..c14b15d19d96 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -495,7 +495,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo TransferableDataHelper aD( new SvEmbedTransferHelper( xObj, pOLEGraph, nAspect ) ); uno::Any aAny = aD.GetAny(rFlavor, rDestDoc); if( aAny.hasValue() ) - bOK = SetAny( aAny, rFlavor ); + bOK = SetAny( aAny ); } // the following solution will be used in the case when the object can not generate the image @@ -505,7 +505,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo { pOLEGraph = FindOLEReplacementGraphic(); if ( pOLEGraph ) - bOK = SetGDIMetaFile( pOLEGraph->GetGDIMetaFile(), rFlavor ); + bOK = SetGDIMetaFile( pOLEGraph->GetGDIMetaFile() ); } } else @@ -519,7 +519,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo case SotClipboardFormatId::OBJECTDESCRIPTOR: case SotClipboardFormatId::LINKSRCDESCRIPTOR: - bOK = SetTransferableObjectDescriptor( m_aObjDesc, rFlavor ); + bOK = SetTransferableObjectDescriptor( m_aObjDesc ); break; case SotClipboardFormatId::DRAWING: @@ -558,12 +558,12 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo case SotClipboardFormatId::SVXB: if( m_eBufferType & TransferBufferType::Graphic && m_pOrigGraphic ) - bOK = SetGraphic( *m_pOrigGraphic, rFlavor ); + bOK = SetGraphic( *m_pOrigGraphic ); break; case SotClipboardFormatId::GDIMETAFILE: if( m_eBufferType & TransferBufferType::Graphic ) - bOK = SetGDIMetaFile( m_pClpGraphic->GetGDIMetaFile(), rFlavor ); + bOK = SetGDIMetaFile( m_pClpGraphic->GetGDIMetaFile() ); break; case SotClipboardFormatId::BITMAP: case SotClipboardFormatId::PNG: @@ -574,7 +574,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo case SotClipboardFormatId::SVIM: if( m_pImageMap ) - bOK = SetImageMap( *m_pImageMap, rFlavor ); + bOK = SetImageMap( *m_pImageMap ); break; case SotClipboardFormatId::INET_IMAGE: |