diff options
| author | Justin Luth <jluth@mail.com> | 2024-05-22 12:22:07 -0400 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2024-05-22 23:22:17 +0200 |
| commit | fe5b4257d852b937652d55f2272ed535835d85c5 (patch) | |
| tree | 2aa02a24b00bceec0660a4ca828b7d6f709f49d9 | |
| parent | 80f7f3e8099e05632201d7b18de0112153ebc1ba (diff) | |
NFC IsInline includes GetAnchorId() == RndStdIds::FLY_AS_CHAR
m_bIsInline is either forced true,
or is set by GetAnchorId() == RndStdIds::FLY_AS_CHAR.
Nothing sets it to false, but it can become true with
ForceTreatAsInline.
So, no need to check for FLY_AS_CHAR if we also allow IsInline.
Change-Id: I5f7a158962dcde1fd2d642ffd54e0995a69ad841
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167966
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 20ce68a5b08c..682959b33f33 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6409,8 +6409,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Po /// support that feature, instead it postponed and exported /// later when the original shape closed. - if (rFrame.GetFrameFormat().GetAnchor().GetAnchorId() == RndStdIds::FLY_AS_CHAR - || rFrame.IsInline()) + if (rFrame.IsInline()) { m_nEmbedFlyLevel++; WriteFlyFrame(rFrame); |