cui/source/inc/backgrnd.hxx | 6 ++---- cui/source/inc/page.hxx | 5 +---- cui/source/inc/paragrph.hxx | 10 ++-------- cui/source/inc/tabstpge.hxx | 4 ---- include/svx/srchdlg.hxx | 16 ---------------- sw/source/filter/html/css1atr.cxx | 8 -------- sw/source/filter/html/htmlatr.cxx | 6 ++---- 7 files changed, 7 insertions(+), 48 deletions(-)
New commits: commit d6f18c09496318adf78ab32dfa1e1edf74521c5f Author: Thomas Arnhold <[email protected]> Date: Wed Oct 16 03:28:19 2013 +0200 remove some stuff Change-Id: I766c01c3ea4c03f4c76ef70fd16037d8196242a1 diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index be0e8d3..45a1659 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -26,9 +26,6 @@ #include <svx/dlgctrl.hxx> #include <editeng/brushitem.hxx> -//------------------------------------------------------------------------ -// forwards: - class BackgroundPreviewImpl; class SvxOpenGraphicDialog; struct SvxBackgroundTable_Impl; @@ -37,8 +34,9 @@ struct SvxBackgroundPage_Impl; class SvxBrushItem; class XFillStyleItem; class XFillGradientItem; + /** class SvxBackgroundTabPage -------------------------------------------- -{k:\svx\prototyp\dialog\backgrnd.bmp} + [Description] With this TabPage a Brush (e. g. for a frame's background color) can be set. diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index d07a6b9..421b5e1 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -19,7 +19,6 @@ #ifndef _SVX_PAGE_HXX #define _SVX_PAGE_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> @@ -33,9 +32,7 @@ #include <svx/flagsdef.hxx> // class SvxPageDescPage ------------------------------------------------- - -/* {k:\svx\prototyp\dialog\page.bmp} - +/* [Description] TabPage for page settings (size, margins, ...) diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 8d27bc4..1fda0cf 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -28,14 +28,10 @@ #include <vcl/lstbox.hxx> #include <svx/flagsdef.hxx> -// forward --------------------------------------------------------------- - class SvxLineSpacingItem; // class SvxStdParagraphTabPage ------------------------------------------ - -/* {k:\svx\prototyp\dialog\parastd.bmp} - +/* [Description] With this TabPage standard attributes of a paragraph can be set (indention, distance, alignment, line spacing). @@ -175,9 +171,7 @@ public: }; // class SvxExtParagraphTabPage ------------------------------------------ - -/* {k:\svx\prototyp\dialog\paraext.bmp} - +/* [Description] With this TabPage special attributes of a paragraph can be set (hyphenation, pagebreak, orphan, widow, ...). diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index c19f085..3879bd3 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -29,14 +29,10 @@ #include <editeng/tstpitem.hxx> #include <svx/flagsdef.hxx> -// forward --------------------------------------------------------------- - class TabWin_Impl; // class SvxTabulatorTabPage --------------------------------------------- /* - {k:\svx\prototyp\dialog\tabstop.bmp} - [Description] In this TabPage tabulators are managed. diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 3488998..77a7c21 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -43,10 +43,6 @@ class SvxSearchController; struct SearchDlg_Impl; -#ifndef NO_SVX_SEARCH - -// struct SearchAttrItem ------------------------------------------------- - struct SearchAttrItem { sal_uInt16 nSlot; @@ -80,7 +76,6 @@ public: void Remove(size_t nPos, size_t nLen = 1); }; -#ifndef SV_NODIALOG // class SvxSearchDialogWrapper ------------------------------------------ @@ -98,10 +93,7 @@ public: }; // class SvxSearchDialog ------------------------------------------------- - /* - {k:\svx\prototyp\dialog\svx/srchdlg.hxx} - [Description] In this modeless dialog the attributes for a search are configured and a search is started from it. Several search types @@ -263,14 +255,6 @@ inline sal_Bool SvxSearchDialog::HasReplaceAttributes() const return ( m_pReplaceAttrText->IsEnabled() && bLen ); } - -////////////////////////////////////////////////////////////////////// - - -#endif // SV_NODIALOG -#endif // NO_SVX_SEARCH - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit d4ae0d8d30e10f7e194a06c540cac1f33a4fe0ba Author: Thomas Arnhold <[email protected]> Date: Tue Oct 15 11:47:11 2013 +0200 HTML: always export CSS option for font size This removes some kind of a hack. Before this commit the CSS option was only exported if the size didn't fit any HTML size option. Maybe size could be dropped in the future. Old: <font size=7 style="font-size: 66pt">Text 1</font> <font size=5>Text 2</font> New: <font size=7 style="font-size: 66pt">Text 1</font> <font size=5 style="font-size: 18pt">Text 2</font> Change-Id: I360038b01e0ccc5b408ff726646f91da5555db50 diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index ef3e6c5..1aa393f 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2603,14 +2603,6 @@ static Writer& OutCSS1_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; sal_uInt32 nHeight = ((const SvxFontHeightItem&)rHt).GetHeight(); - if( rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT) ) - { - // einen Hint nur dann ausgeben wenn es auch was bringt - sal_uInt16 nSize = rHTMLWrt.GetHTMLFontSize( nHeight ); - if( rHTMLWrt.aFontHeights[nSize-1] == nHeight ) - return rWrt; - } - OString sHeight(OString::number(nHeight/20) + OString(sCSS1_UNIT_pt)); rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_font_size, sHeight); diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 260ae53..de4aacd 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2783,11 +2783,9 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt ) append(static_cast<sal_Int32>(nSize)).append("\""); rWrt.Strm() << sOut.getStr(); - if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr && - rHTMLWrt.aFontHeights[nSize-1] != nHeight ) + if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr ) { - // wenn die Groesse keiner HTML-Groesse entspricht, - // wird sie noch zusatzlich als Style-Option exportiert + // always export font size as CSS option, too OutCSS1_HintStyleOpt( rWrt, rHt ); } rWrt.Strm() << '>'; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
