summaryrefslogtreecommitdiff
path: root/sw/inc/format.hxx
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2023-02-14 18:03:55 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2023-02-24 07:32:23 +0000
commitdb115bec9254417ef7a3faf687478fe5424ab378 (patch)
tree0b5f58cda73137302fd955db3e0958dda71358fb /sw/inc/format.hxx
parent7e7b69829db63e64b8aed8d03c6eaed6d8f1a27c (diff)
tdf#78510 sw,cui: split SvxLRSpaceItem for SwTextNode, SwTextFormatColl
Leave editengine and non-paragraph usages of SvxLRSpaceItem as-is for now. Add new items RES_MARGIN_LEFT etc., order them so that paragraphs can have 3 consecutive items RES_MARGIN_FIRSTLINE..RES_MARGIN_RIGHT and non-paragraphs also have 2-4 consecutive items RES_MARGIN_RIGHT..RES_MARGIN_LEFT (only the 3 paragraph ones are actually used now). The HTML import filter is particularly annoying because it parses CSS stuff into SfxItemSets without knowing where the items will be applied, so it can't know whether to create SvxLeftMarginItem or SvxTextLeftMarginItem... the split items are created in ParseCSS1_* functions and then converted later if necessary. WW8 import has some weird code as well, SwWW8ImplReader::Read_LR() creates 3 items and then something wants to set every item on its own so SwWW8FltControlStack::SetAttrInDoc() turned out rather weird. Convert the paragraph dialog to handle the split items (by mapping them to SID_ATTR_PARA_FIRSTLINESPACE/SID_ATTR_PARA_LEFTSPACE/ SID_ATTR_PARA_RIGHTSPACE), but the SvxRuler looks a bit more confusing so convert in sw shells for now and leave that for later (also unclear if changing these slot items like SID_ATTR_PARA_LRSPACE breaks any ABIs?). Change-Id: I40431821868fd3e1cceba121b5539ff9ae6befbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147024 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/inc/format.hxx')
-rw-r--r--sw/inc/format.hxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index c5b599d36d31..9313b863dfbb 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -212,6 +212,12 @@ public:
inline const SwFormatAnchor &GetAnchor( bool = true ) const;
inline const SwFormatCol &GetCol( bool = true ) const;
inline const SvxPaperBinItem &GetPaperBin( bool = true ) const;
+ inline const SvxLeftMarginItem & GetLeftMargin(bool = true) const;
+ inline const SvxTextLeftMarginItem &GetTextLeftMargin(bool = true) const;
+ inline const SvxFirstLineIndentItem &GetFirstLineIndent(bool = true) const;
+ inline const SvxRightMarginItem & GetRightMargin(bool = true) const;
+ inline const SvxGutterLeftMarginItem &GetGutterLeftMargin(bool = true) const;
+ inline const SvxGutterRightMarginItem &GetGutterRightMargin(bool = true) const;
inline const SvxLRSpaceItem &GetLRSpace( bool = true ) const;
inline const SvxULSpaceItem &GetULSpace( bool = true ) const;
inline const SwFormatContent &GetContent( bool = true ) const;