dev/null |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 17 -----------------
sw/source/core/fields/fldbas.cxx | 2 +-
3 files changed, 1 insertion(+), 18 deletions(-)
New commits:
commit 1d6429fb86d0ba8c03da8621512f3b675d1bcb81
Author: Xisco Faulí <xiscofa...@libreoffice.org>
AuthorDate: Tue Sep 24 16:15:54 2019 +0200
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Tue Sep 24 18:00:26 2019 +0200
Revert "tdf#107784: DOCX Import: Show citation's title in fields"
This reverts commit fadce0c9a7ccbd7222df90e41d8fc16d9d67045f.
it needs more work. better not to have it in 6.3
Change-Id: Ia6e0d90cf5e56d87aa83903fd787d548c0514ecd
Reviewed-on: https://gerrit.libreoffice.org/79459
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/ooxmlimport/data/tdf107784.docx
b/sw/qa/extras/ooxmlimport/data/tdf107784.docx
deleted file mode 100644
index 2dc868246ac0..000000000000
Binary files a/sw/qa/extras/ooxmlimport/data/tdf107784.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4ee66606b7a6..b49583b3b4d0 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -687,23 +687,6 @@ DECLARE_OOXMLIMPORT_TEST(testTdf105975formula,
"tdf105975.docx")
CPPUNIT_ASSERT_EQUAL(OUString("25"),
xEnumerationAccess->getPresentation(false).trim());
}
-DECLARE_OOXMLIMPORT_TEST(testTdf107784, "tdf107784.docx")
-{
- // Make sure the field displays the citation's title and not the identifier
- uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xFieldsAccess(xTextFieldsSupplier->getTextFields());
- uno::Reference<container::XEnumeration>
xFields(xFieldsAccess->createEnumeration());
-
- if( !xFields->hasMoreElements() ) {
- CPPUNIT_ASSERT(false);
- return;
- }
-
- uno::Reference<text::XTextField>
xEnumerationAccess(xFields->nextElement(), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(OUString("Bibliography entry"),
xEnumerationAccess->getPresentation(true).trim());
- CPPUNIT_ASSERT_EQUAL(OUString("(Smith, 1950)"),
xEnumerationAccess->getPresentation(false).trim());
-}
-
DECLARE_OOXMLIMPORT_TEST(testTdf115883, "tdf115883.docx")
{
// Import failed due to an unhandled exception when getting the Surround
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index f24542012707..a5008b4c4e3a 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -418,7 +418,7 @@ SwField::ExpandField(bool const bCached, SwRootFrame
const*const pLayout) const
if (GetTypeId() == TYP_AUTHORITY)
{
const SwAuthorityField* pAuthorityField = static_cast<const
SwAuthorityField*>(this);
- m_Cache = pAuthorityField->ExpandCitation(AUTH_FIELD_TITLE,
pLayout);
+ m_Cache =
pAuthorityField->ConditionalExpandAuthIdentifier(pLayout);
}
else
m_Cache = ExpandImpl(pLayout);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
