diff options
| author | Harri Pitkänen <hatapitk@iki.fi> | 2011-10-06 20:58:11 +0300 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-06 20:03:33 +0100 |
| commit | 77cb41a734c507722c652d0a675ccbf18e3d6b99 (patch) | |
| tree | 3dc483301503c3956dbbf22fd2fc94c528bfa0ef /cui/source | |
| parent | 0e600dd2805f9284b01a1030f0ad1b720acdaeae (diff) | |
Remove code related to previously disabled HTML 3.2 export
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/tabpages/page.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 59977eba1251..fe0af3237a8f 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -89,9 +89,6 @@ public: /** Returns the HTML export mode, as read from the configuration. */ inline sal_Int32 GetExportMode() const { return mnExpMode; } - /** Returns true, if the current HTML export mode is set to HTML 3.2. */ - inline bool IsExportModeHTML32() const { return mnExpMode == 0; } // 0 == HTML_CFG_HTML32, see offmgr/htmlcfg.hxx - virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); @@ -310,10 +307,6 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) bWeb = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON); - // #109989# get the HTML export setting from configuration. - // !! This is a hack, see comments in SvxHtmlExportModeConfigItem_Impl class above. - bool bHTML32 = SvxHtmlExportModeConfigItem_Impl().IsExportModeHTML32(); - // fill text flow listbox with valid entries aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_LTR_HORI ), FRMDIR_HORI_LEFT_TOP ); if( bCTL ) @@ -328,8 +321,8 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : } } - // #109989# show the text direction box in Writer/Web too, but only, if HTML export mode is not HTML3.2. - if( !(bWeb && bHTML32) && (bCJK || bCTL) && + // #109989# show the text direction box in Writer/Web too + if( (bCJK || bCTL) && SFX_ITEM_UNKNOWN < rAttr.GetItemState(GetWhich( SID_ATTR_FRAMEDIRECTION ))) { aTextFlowLbl.Show(); |