diff options
| author | Harri Pitkänen <hatapitk@iki.fi> | 2011-11-08 19:36:21 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-09 16:45:55 +0000 |
| commit | 090454c4c99498a79d87c55e1903132bd068d810 (patch) | |
| tree | 0903f98d95126c9299e6a4f2d768d7c98e58d5c7 /cui | |
| parent | 02b368e392c2d0f925601aff792910c628de5476 (diff) | |
Enable features behind HTMLMODE_FULL_ABS_POS for all HTML export modes
HTMLMODE_FULL_ABS_POS appears to have been used for enabling accurate
margin settings for absolutely positioned graphics objects. If it was
disabled one could not set (in HTML editor mode) separate margins for
left and right (or bottom/top) sides of the image. The setting was
disabled for Netscape and enabled for other browsers.
This patch removes the setting and unconditionally enables the feature
in HTML editor mode. All modern browsers support
margin-{left,right,bottom,top} CSS properties.
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/border.cxx | 11 | ||||
| -rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 5 |
2 files changed, 0 insertions, 16 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 98d62e95eab8..d6c474f7c247 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -559,17 +559,6 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) aLbShadowColor.Disable(); aFlShadow .Disable(); - sal_uInt16 nLBCount = aLbLineStyle.GetEntryCount(); - // ist es ein Absatzdialog, dann alle Linien fuer - // Sw-Export, sonst ist die Page nicht da - if(!(mbHorEnabled || mbVerEnabled) - && 0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS) && - SFX_ITEM_AVAILABLE > rSet.GetItemState(GetWhich( SID_ATTR_PARA_LINESPACE ))) - { - for( sal_uInt16 i = nLBCount - 1; i > LINESTYLE_HTML_MAX; --i) - aLbLineStyle.RemoveEntry(i); - } - if( !(nSWMode & SW_BORDER_MODE_TABLE) ) { aUserDefFT.Disable(); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 2d08dede00ce..7874eaaeb8f3 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -895,11 +895,6 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) if(m_bHtmlMode) { - if( 0 == (m_nHtmlMode & HTMLMODE_FULL_ABS_POS)) - { - m_aHeightFT .Enable( sal_False ); - m_aHeightMF .Enable( sal_False ); - } if( 0 == (m_nHtmlMode & HTMLMODE_SOME_ABS_POS)) { if(GetAnchorType() == TextContentAnchorType_AT_PAGE) |