sw/source/core/docnode/ndtbl.cxx | 5 -----
sw/source/uibase/shells/basesh.cxx | 3 ---
sw/source/uibase/shells/textsh1.cxx | 3 +--
3 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 75680dd751062b7ca34ff91e03de3add3fc973c6
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Dec 20 22:50:59 2023 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jan 7 11:44:55 2024 +0100
Related tdf#76007: Make it possible to insert a Table in a Footnote or
Endnote
There's still layout refresh pb.
Change-Id: I613cbf77a32452fdc42501e2eaf8450b7dedf327
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161085
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sw/qa/core/data/html/fail/ofz5909-1.html
b/sw/qa/core/data/html/pass/ofz5909-1.html
similarity index 100%
rename from sw/qa/core/data/html/fail/ofz5909-1.html
rename to sw/qa/core/data/html/pass/ofz5909-1.html
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index a7a2bee478da..c6aa9ddb67c5 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -347,11 +347,6 @@ const SwTable* SwDoc::InsertTable( const
SwInsertTableOptions& rInsTableOpts,
assert(nCols && "Table without rows?");
{
- // Do not copy into Footnotes!
- if( rPos.GetNode() < GetNodes().GetEndOfInserts() &&
- rPos.GetNode().GetIndex() >=
GetNodes().GetEndOfInserts().StartOfSectionIndex() )
- return nullptr;
-
// If the ColumnArray has a wrong count, ignore it!
if( pColArr &&
static_cast<size_t>(nCols + ( text::HoriOrientation::NONE ==
eAdjust ? 2 : 1 )) != pColArr->size() )
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index c96945ccdf30..7ab234a80044 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -3066,9 +3066,6 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
const SfxItemSet* pArgs = _rRequest.GetArgs();
SwWrtShell& rSh = GetShell();
- if ( rSh.GetFrameType( nullptr, true ) & FrameTypeFlags::FOOTNOTE )
- return;
-
SwView &rTempView = GetView(); // Because GetView() does not work after
the shell exchange
bool bHTMLMode = 0 != (::GetHtmlMode(rTempView.GetDocShell())&HTMLMODE_ON);
bool bCallEndUndo = false;
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index f23d5a229ec9..c8c83fc29115 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -2337,8 +2337,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
case FN_INSERT_TABLE:
if ( rSh.CursorInsideInputField()
- || rSh.GetTableFormat()
- || (rSh.GetFrameType(nullptr,true) &
FrameTypeFlags::FOOTNOTE) )
+ || rSh.GetTableFormat() )
{
rSet.DisableItem( nWhich );
}
