612629f4a8
The document had overlapping text on load since commit05425f73bf(sw floatable: teach the RTF import about SwFormatFlySplit, 2023-04-21). Interestingly the DOCX equivalent was fine, there the inline table is shifted down, below the floating table, so the overlap doesn't happen. Fix the problem by moving the AddVerticalFrameOffsets=true code from the DOCX filter to the shared dmapper, because RTF needs the same. See commit50223ea6e2(tdf#98987 sw: add AddVerticalFrameOffsets compat mode, 2016-03-31) for more details about this compat flag. It was already enabled for DOC, too. Change-Id: I948b179c9ec5fa24377014b0e86826568c417b6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158372 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
42 lines
1.1 KiB
C++
42 lines
1.1 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <libxml/tree.h>
|
|
#include <libxml/xmlwriter.h>
|
|
|
|
#include <new>
|
|
|
|
namespace comphelper
|
|
{
|
|
template <typename F> OUString dumpXmlToString(F f)
|
|
{
|
|
auto const buf = xmlBufferCreate();
|
|
if (buf == nullptr)
|
|
{
|
|
throw std::bad_alloc();
|
|
}
|
|
auto const writer = xmlNewTextWriterMemory(buf, 0);
|
|
if (writer == nullptr)
|
|
{
|
|
throw std::bad_alloc();
|
|
}
|
|
f(writer);
|
|
xmlFreeTextWriter(writer);
|
|
std::string_view s(reinterpret_cast<char const*>(xmlBufferContent(buf)), xmlBufferLength(buf));
|
|
OUString rv = OStringToOUString(s, RTL_TEXTENCODING_ISO_8859_1); //TODO
|
|
xmlBufferFree(buf);
|
|
return rv;
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|