summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/swriter/guide/calculate_intext2.xhp')
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/calculate_intext2.xhp5
1 files changed, 1 insertions, 4 deletions
diff --git a/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp b/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp
index 333ad1ebef..0f03ffaa39 100755
--- a/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
generated by cgit (git 2.34.1) at 2024-08-04 05:17:17 +0000
ue='feature/vlc'>feature/vlc LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-06-23 09:03:10 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-06-23 09:04:11 +0200
commit2fe248f2b36d541c0d243a620c217058a50a9d5d (patch)
treeab04e6537619b7060d1a7f8ed7437a7723817283
parent187445b2d2885ced92be37ffb11cd2a9bb11f8d6 (diff)
tdf#87460 DOCX import: fix missing endnote in floattable
Writer doesn't support foot or endnotes in TextFrames, so they are not supported in OOXML floattables, either. In the past, floattables were imported as normal tables, that's how this worked. Restore the old situation till the core limitation is there, so we at least don't regress. Change-Id: I4eb62617e3131176f7371e9ca69f11bc9e948a0b
Diffstat
-rw-r--r--sw/qa/extras/ooxmlimport/data/tdf87460.docxbin0 -> 17343 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx9
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx12
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.hxx4
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx8
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx3
6 files changed, 33 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf87460.docx b/sw/qa/extras/ooxmlimport/data/tdf87460.docx
new file mode 100644
index 000000000000..c443dbe4563e
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/tdf87460.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index b16877dae49d..59950273ee18 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2716,6 +2716,15 @@ DECLARE_OOXMLIMPORT_TEST(testTdf8255, "tdf8255.docx")
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), xDrawPage->getCount());
}
+DECLARE_OOXMLIMPORT_TEST(testTdf87460, "tdf87460.docx")
+{
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
+ uno::Reference<text::XEndnotesSupplier> xEndnotesSupplier(xTextDocument, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess> xEndnotes = xEndnotesSupplier->getEndnotes();
+ // This was 0: endnote was lost on import.
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), xEndnotes->getCount());