mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#136861 ODT export: fix writing resolved state for non-ranged comments

Browse Source 
It was probably not intentional to write the resolved state only in case
the annotation has a name.

Change-Id: Ia3a6b2320e2288528c43c832211ebfcde492881e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109354
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna
2021-01-15 11:57:50 +01:00
parent 79bfb54665
commit f3b5356bdc
3 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xmloff/CppunitTest_xmloff_text.mk
View File

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,xmloff_text, \
sal \
test \
unotest \
utl \
))
$(eval $(call gb_CppunitTest_use_sdk_api,xmloff_text))

48
xmloff/qa/unit/text.cxx
View File

@@ -10,7 +10,13 @@
#include <test/bootstrapfixture.hxx>
#include <unotest/macros_test.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/text/XTextDocument.hpp>
#include <comphelper/propertysequence.hxx>
#include <unotools/tempfile.hxx>
using namespace ::com::sun::star;
@@ -52,6 +58,48 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMailMergeInEditeng)
CPPUNIT_ASSERT(getComponent().is());
}
CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCommentResolved)
{
getComponent() = loadFromDesktop("private:factory/swriter");
uno::Sequence<beans::PropertyValue> aCommentProps = comphelper::InitPropertySequence({
{ "Text", uno::makeAny(OUString("comment")) },
});
dispatchCommand(getComponent(), ".uno:InsertAnnotation", aCommentProps);
uno::Reference<text::XTextDocument> xTextDocument(getComponent(), uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess> xParaEnumAccess(xTextDocument->getText(),
uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xParaEnum = xParaEnumAccess->createEnumeration();
uno::Reference<container::XEnumerationAccess> xPara(xParaEnum->nextElement(), uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xPortionEnum = xPara->createEnumeration();
uno::Reference<beans::XPropertySet> xPortion(xPortionEnum->nextElement(), uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xField(xPortion->getPropertyValue("TextField"),
uno::UNO_QUERY);
xField->setPropertyValue("Resolved", uno::makeAny(true));
uno::Reference<frame::XStorable> xStorable(getComponent(), uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({
{ "FilterName", uno::makeAny(OUString("writer8")) },
});
utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aStoreProps);
getComponent()->dispose();
getComponent() = loadFromDesktop(aTempFile.GetURL());
xTextDocument.set(getComponent(), uno::UNO_QUERY);
xParaEnumAccess.set(xTextDocument->getText(), uno::UNO_QUERY);
xParaEnum = xParaEnumAccess->createEnumeration();
xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
xPortionEnum = xPara->createEnumeration();
xPortion.set(xPortionEnum->nextElement(), uno::UNO_QUERY);
xField.set(xPortion->getPropertyValue("TextField"), uno::UNO_QUERY);
bool bResolved = false;
xField->getPropertyValue("Resolved") >>= bResolved;
// Without the accompanying fix in place, this test would have failed, as the resolved state was
// not saved for non-range comments.
CPPUNIT_ASSERT(bResolved);
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

21
xmloff/source/text/txtflde.cxx
View File

@@ -1752,18 +1752,17 @@ void XMLTextFieldExport::ExportFieldHelper(
if (!aName.isEmpty())
{
GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, aName);
SvtSaveOptions::ODFSaneDefaultVersion eVersion = rExport.getSaneDefaultVersion();
if (eVersion & SvtSaveOptions::ODFSVER_EXTENDED)
{
bool b = GetBoolProperty("Resolved", rPropSet);
OUString aResolvedText;
OUStringBuffer aResolvedTextBuffer;
::sax::Converter::convertBool(aResolvedTextBuffer, b);
aResolvedText = aResolvedTextBuffer.makeStringAndClear();
}
SvtSaveOptions::ODFSaneDefaultVersion eVersion = rExport.getSaneDefaultVersion();
if (eVersion & SvtSaveOptions::ODFSVER_EXTENDED)
{
bool b = GetBoolProperty("Resolved", rPropSet);
OUString aResolvedText;
OUStringBuffer aResolvedTextBuffer;
::sax::Converter::convertBool(aResolvedTextBuffer, b);
aResolvedText = aResolvedTextBuffer.makeStringAndClear();
GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_RESOLVED,
aResolvedText);
}
GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_RESOLVED, aResolvedText);
}
SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_OFFICE,
XML_ANNOTATION, false, true);