diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-25 11:16:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-25 12:02:34 +0200 |
| commit | 678041c48fe3f03fd4f12a92b6a66cff33d6382b (patch) | |
| tree | 23d6a8dc523456f1e776a14a10dbc69fb5b4749c /sw/source/filter/html/htmlforw.cxx | |
| parent | e027b1d1d68432149d6f1ffbe8d7469d17c19e71 (diff) | |
convert HTML_FRM_OPTS to o3tl::typed_flags
Change-Id: I3d8ac978ff626f792e3cff6e2b12a7680addf303
Diffstat (limited to 'sw/source/filter/html/htmlforw.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlforw.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index eab6e05d87e4..897ba95f976d 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -68,19 +68,19 @@ using namespace ::com::sun::star; -const sal_uInt32 HTML_FRMOPTS_CONTROL = - 0; -const sal_uInt32 HTML_FRMOPTS_CONTROL_CSS1 = - HTML_FRMOPT_S_ALIGN | - HTML_FRMOPT_S_SIZE | - HTML_FRMOPT_S_SPACE | - HTML_FRMOPT_BRCLEAR; -const sal_uInt32 HTML_FRMOPTS_IMG_CONTROL = - HTML_FRMOPT_ALIGN | - HTML_FRMOPT_BRCLEAR; -const sal_uInt32 HTML_FRMOPTS_IMG_CONTROL_CSS1 = - HTML_FRMOPT_S_ALIGN | - HTML_FRMOPT_S_SPACE; +const HtmlFrmOpts HTML_FRMOPTS_CONTROL = + HtmlFrmOpts::NONE; +const HtmlFrmOpts HTML_FRMOPTS_CONTROL_CSS1 = + HtmlFrmOpts::SAlign | + HtmlFrmOpts::SSize | + HtmlFrmOpts::SSpace | + HtmlFrmOpts::BrClear; +const HtmlFrmOpts HTML_FRMOPTS_IMG_CONTROL = + HtmlFrmOpts::Align | + HtmlFrmOpts::BrClear; +const HtmlFrmOpts HTML_FRMOPTS_IMG_CONTROL_CSS1 = + HtmlFrmOpts::SAlign | + HtmlFrmOpts::SSpace; static void lcl_html_outEvents( SvStream& rStrm, const uno::Reference< form::XFormComponent >& rFormComp, @@ -718,7 +718,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, bool bEmptyValue = false; uno::Any aTmp = xPropSet->getPropertyValue( "ClassId" ); sal_Int16 nClassId = *o3tl::doAccess<sal_Int16>(aTmp); - sal_uInt32 nFrameOpts = HTML_FRMOPTS_CONTROL; + HtmlFrmOpts nFrameOpts = HTML_FRMOPTS_CONTROL; switch( nClassId ) { case form::FormComponentType::CHECKBOX: @@ -1039,7 +1039,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, : HTML_FRMOPTS_CONTROL_CSS1); } OString aEndTags; - if( nFrameOpts != 0 ) + if( nFrameOpts != HtmlFrmOpts::NONE ) aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrameOpts ); if( rHTMLWrt.m_bCfgOutStyles ) |