summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-05-25 14:58:11 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-05-29 16:00:05 +0200
commit4f0fee308da574634cd9f9181cc8dda2afdf73b3 (patch)
tree2e0d0372cd6d365267c2a901365351b0017fc92e
parent2a7ab376ffeeed07a2ae282033c65b568c56a08a (diff)
tdf#35798: use separate paragraphs for Label elements
Since commit db04be037b611e296ef9f2542322c52ed82d7a2b, empty Database fields are hidden. But since Labels wizard generates a single paragraph with line breaks for the label's text, the hiding feature cannot be used efficiently. Let the individual lines be in individual paragraphs. Change-Id: I27430d54baea88461c2ea9de38baa95d6b7e9e62 Reviewed-on: https://gerrit.libreoffice.org/54800 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 2f11ce0670749b9da20dfb29269b176cb09fb01e) Reviewed-on: https://gerrit.libreoffice.org/54960 Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r--sw/source/uibase/app/appenv.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index 286ddc49ed42..b33f62c60bd3 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -125,7 +125,7 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFieldMgr& rFieldMgr, const OUStrin
if ( !bField )
rSh.Insert( sTmpText );
}
- rSh.InsertLineBreak();
+ rSh.SplitNode();
}
rSh.DelLeft(); // Again remove last linebreak