diff options
Diffstat (limited to 'sw/source/filter/html/htmlfly.cxx')
-rw-r--r-- | sw/source/filter/html/htmlfly.cxx | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index c6446cd76c70..d2b7fd6e1d3e 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> @@ -63,7 +62,6 @@ #include "htmlfly.hxx" using namespace ::com::sun::star; -//////////////////////////////////////////////////////////// const sal_uLong HTML_FRMOPTS_IMG_ALL = HTML_FRMOPT_ALT | @@ -126,7 +124,6 @@ const sal_uLong HTML_FRMOPTS_CNTNR = HTML_FRMOPT_ABSSIZE | HTML_FRMOPT_S_PIXSIZE; - static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt ); static Writer& OutHTML_FrmFmtAsMulticol( Writer& rWrt, const SwFrmFmt& rFmt, sal_Bool bInCntnr ); @@ -142,8 +139,6 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFmt, static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt, const SdrObject& rSdrObj ); - - extern HTMLOutEvent aAnchorEventTable[]; static HTMLOutEvent aImageEventTable[] = @@ -161,8 +156,6 @@ static HTMLOutEvent aIMapEventTable[] = { 0, 0, 0 } }; - - sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt, const SdrObject*& rpSdrObj ) { @@ -524,7 +517,6 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt, HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, sal_False ); } - OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, const OUString& rAlternateTxt, sal_uInt32 nFrmOpts, @@ -556,7 +548,6 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, OutDirection( nDir ); } - // ALT if( (nFrmOpts & HTML_FRMOPT_ALT) && !rAlternateTxt.isEmpty() ) { @@ -611,7 +602,6 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, append(pStr).append("\""); } - // HSPACE und VSPACE Size aTwipSpc( 0, 0 ); if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && @@ -1149,7 +1139,6 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) ) rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts ); - if( nFrmOpts & HTML_FRMOPT_BORDER ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_border). @@ -1225,9 +1214,6 @@ Writer& OutHTML_BulletImage( Writer& rWrt, return rWrt; } - - - static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt ) { SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -1459,7 +1445,6 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt, return rWrt; } - static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt, sal_Bool bInCntnr ) { @@ -1483,7 +1468,6 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt, return rWrt; } - static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt, const SdrObject& rSdrObj ) { @@ -1514,8 +1498,6 @@ static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt, return rWrt; } - - Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, sal_Bool bHeader ) { @@ -1595,7 +1577,6 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, return rWrt; } - void SwHTMLWriter::AddLinkTarget( const OUString& rURL ) { if( rURL.isEmpty() || rURL[0] != '#' ) @@ -1673,7 +1654,7 @@ void SwHTMLWriter::AddLinkTarget( const OUString& rURL ) } else if( sCmp == "text" ) { - // + } } @@ -1720,8 +1701,6 @@ void SwHTMLWriter::CollectLinkTargets() } } - - SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly, const SdrObject *pSdrObj, sal_uInt8 nOutMode ) : |