summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorAttila Bakos (NISZ) <bakos.attilakaroly@nisz.hu>2022-02-07 17:09:42 +0100
committerLászló Németh <nemeth@numbertext.org>2022-03-01 17:53:01 +0100
commit0d29394598db2e336a9982cbb7041ea407b2bf6d (patch)
tree13fccc70320e734ce09f11e6e3f6c68e9da49dd1 /sw/inc
parent16665c48fef0ac178f224cccb1ddced69311835c (diff)
tdf#147126 sw: fix missing as_char anchoring of group textboxes
which resulted lost (invisible) text content before implementing its support now. Cleanup to SwTextBoxHelper by removing its unneeded functions. testFDO78590 was commented out temporarily because it has a pure VML groupshape inside and it's converted to WPG during the test run resulting crash on reopening, because lack of its support in DocumentContentOperationsManager, trying to convert the content to a text frame inside a text frame. Regression from commit 2951cbdf3a6e2b62461665546b47e1d253fcb834 "tdf#143574 OOXML export/import of textboxes in group shapes". Change-Id: Ic6ce3549d390ae763044f54e991f390677704396 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129627 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/textboxhelper.hxx15
1 files changed, 1 insertions, 14 deletions
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index a41c6c9eaf87..fd194a639bcc 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -92,10 +92,6 @@ public:
/// Copy shape attributes to the text frame
static void updateTextBoxMargin(SdrObject* pObj);
- /// Sets the surround to through for the textframe of the given shape,
- /// not to interfere with the layout. Returns true on success.
- static bool setWrapThrough(SwFrameFormat* pShape);
-
/// Sets the anchor of the associated textframe of the given shape, and
/// returns true on success.
static bool changeAnchor(SwFrameFormat* pShape, SdrObject* pObj);
@@ -104,19 +100,9 @@ public:
/// returns true on success.
static bool doTextBoxPositioning(SwFrameFormat* pShape, SdrObject* pObj);
- /// Returns true if the anchor different for the given shape, and the
- /// associated textframe of the given shape.
- /// Note: In case of AS_CHAR anchor the anchor type must be different,
- /// because if not, layout breaks, but this situation also handled by
- /// this function, and returns true in that case too.
- static std::optional<bool> isAnchorTypeDifferent(const SwFrameFormat* pShape);
-
/// Sets the correct size of textframe depending on the given SdrObject.
static bool syncTextBoxSize(SwFrameFormat* pShape, SdrObject* pObj);
- /// Returns true if the given shape has a valid textframe.
- static bool isTextBoxShapeHasValidTextFrame(const SwFrameFormat* pShape);
-
// Returns true on success. Synchronize z-order of the text frame of the given textbox
// by setting it one level higher than the z-order of the shape of the textbox.
static bool DoTextBoxZOrderCorrection(SwFrameFormat* pShape, const SdrObject* pObj);
@@ -188,6 +174,7 @@ public:
/// Calls the method given by pFunc with every textboxes of the group given by pFormat.
static void synchronizeGroupTextBoxProperty(bool pFunc(SwFrameFormat*, SdrObject*),
SwFrameFormat* pFormat, SdrObject* pObj);
+
/// Collect all textboxes of the group given by the pGroupObj Parameter. Returns with a
/// vector filled with the textboxes.
static std::vector<SwFrameFormat*> CollectTextBoxes(SdrObject* pGroupObject,