[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/qa xmloff/source
sw/qa/extras/odfimport/data/tdf113289.odt |binary
sw/qa/extras/odfimport/odfimport.cxx |9 +
xmloff/source/style/XMLFootnoteSeparatorImport.cxx |5 -
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit a601e0867d0ac2c80342308622bfcc3546fce746
Author: David Vogt
AuthorDate: Wed Mar 13 13:11:39 2019 +0100
Commit: Xisco Faulí
CommitDate: Thu Apr 18 12:17:44 2019 +0200
tdf#113289: Default value for footnote separator
In old versions of LO/AOO, separator style was defaulting to a solid
line. When you have an old document that doesn't have the style set
explicitly, the line would disappear.
Since newer versions explicitly set the style, we should set the default
to what it was before.
Change-Id: I8dacea75fcf2f95f9bc145442b22ab0d173e7c5a
Reviewed-on: https://gerrit.libreoffice.org/69167
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit 4aa8a6ab08b755e3d82860e8dbc294f854336477)
Reviewed-on: https://gerrit.libreoffice.org/70892
Reviewed-by: Xisco Faulí
diff --git a/sw/qa/extras/odfimport/data/tdf113289.odt
b/sw/qa/extras/odfimport/data/tdf113289.odt
new file mode 100644
index ..01aa5700c6d5
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf113289.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index 0d71f95cb8e1..4df20d9e42a8 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -926,5 +927,13 @@ DECLARE_ODFIMPORT_TEST(testTdf123829, "tdf123829.odt")
pDoc->getIDocumentSettingAccess().get(DocumentSettingId::COLLAPSE_EMPTY_CELL_PARA));
}
+DECLARE_ODFIMPORT_TEST(testTdf113289, "tdf113289.odt")
+{
+uno::Any aPageStyle = getStyles("PageStyles")->getByName("Standard");
+
CPPUNIT_ASSERT_EQUAL(static_cast(style::FootnoteLineStyle::SOLID),
+ getProperty(aPageStyle,
"FootnoteLineStyle"));
+}
+
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index a41a31d725f9..bfc57f62b27a 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -80,7 +80,10 @@ void XMLFootnoteSeparatorImport::StartElement(
text::HorizontalAdjust eLineAdjust = text::HorizontalAdjust_LEFT;
sal_Int32 nLineTextDistance = 0;
sal_Int32 nLineDistance = 0;
-sal_Int8 nLineStyle = 0;
+
+// Default separator line style should be SOLID (used to be default before
+// the choice selector was available)
+sal_Int8 nLineStyle = 1;
// iterate over xattribute list and fill values
sal_Int16 nLength = xAttrList->getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Translated source comments from german
Hi everyone
Here's another patch that translates the german code comments to english
in sw/source/core/layout/flowfrm.cxx.
Cheers,
-- Dave
--
Adfinis SyGroup AG
David Vogt, Software Engineer / Project Manager
Keltenstrasse 98 | CH-3018 Bern
Tel. 031 381 70 47 | Direct 031 550 31 12
From a2ae4369f6b1dd315a9489e1d110aacbe844cf6e Mon Sep 17 00:00:00 2001
From: David Vogt
Date: Wed, 4 Apr 2012 09:42:32 +0200
Subject: [PATCH] Translated source comments from german
---
sw/source/core/layout/flowfrm.cxx | 455 ++---
1 file changed, 225 insertions(+), 230 deletions(-)
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 1aacdbc..d846600 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -145,9 +145,9 @@ sal_Bool SwFlowFrm::HasLockedFollow() const
sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
{
-//Wenn der Vorgaenger das KeepAttribut traegt und auch dessen
-//Vorgaenger usw. bis zum ersten der Kette und fuer diesen das
-//IsFwdMoveAllowed ein sal_False liefert, so ist das Moven eben nicht erlaubt.
+// If all the predecessors up to the first of the chain have
+// the 'keep' attribute set, and the first of the chain's
+// IsFwdMoveAllowed returns sal_False, then we're not allowed to move.
SwFrm *pFrm = &rThis;
if ( !pFrm->IsInFtn() )
do
@@ -157,7 +157,7 @@ sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
return sal_True;
} while ( pFrm );
- //Siehe IsFwdMoveAllowed()
+ //See IsFwdMoveAllowed()
sal_Bool bRet = sal_False;
if ( pFrm && pFrm->GetIndPrev() )
bRet = sal_True;
@@ -173,8 +173,8 @@ sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
void SwFlowFrm::CheckKeep()
{
-//Den 'letzten' Vorgaenger mit KeepAttribut anstossen, denn
-//die ganze Truppe koennte zuruckrutschen.
+// Kick off the "last" predecessor with a 'keep' attribute, because
+// it's possible for the whole troop to move back.
SwFrm *pPre = rThis.GetIndPrev();
if( pPre->IsSctFrm() )
{
@@ -308,31 +308,33 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect )
{
-// Der return-Wert entscheidet mit,
-// ob auf Zurueckgeflossen werden muss, (3)
-// ob das gute alte WouldFit gerufen werden kann (0, 1)
-// oder ob ein Umhaengen und eine Probeformatierung sinnvoll ist (2)
-// dabei bedeutet Bit 1, dass Objekte an mir selbst verankert sind
-// und Bit 2, dass ich anderen Objekten ausweichen muss.
-
-//Wenn ein SurroundObj, dass einen Umfluss wuenscht mit dem Rect ueberlappt
-//ist der Fluss notwendig (weil die Verhaeltnisse nicht geschaetzt werden
-//koennen), es kann allerdings ggf. eine TestFormatierung stattfinden.
-//Wenn das SurroundObj ein Fly ist und ich selbst ein Lower bin oder der Fly
-//Lower von mir ist, so spielt er keine Rolle.
-//Wenn das SurroundObj in einem zeichengebunden Fly verankert ist, und ich
-//selbst nicht Lower dieses Zeichengebundenen Flys bin, so spielt der Fly
-//keine Rolle.
-//#32639# Wenn das Objekt bei mir verankert ist kann ich es
-//vernachlaessigen, weil es hoechstwahrscheinlich (!?) mitfliesst,
-//eine TestFormatierung ist dann allerdings nicht erlaubt!
+// The return value helps deciding whether we need to flow back (3),
+// or whether we can use the good old WouldFit (0, 1), or if
+// it's reasonable to relocate and test-format (2).
+//
+// Bit 1 in this case means that there are objects anchored to myself,
+// bit 2 means that I have to avoid other objects.
+
+// If a SurroundObj that desires to be wrapped around overlaps with the Rect,
+// it's required to float (because we can't guess the relationships).
+// However it's possible for a test formatting to happen.
+//
+// If the SurroundObj is a Fly and I'm a Lower, or the Fly is a lower of
+// mine, then it doesn't matter.
+//
+// If the SurroundObj is anchored in a character bound Fly, and I'm not
+// a Lower of that character bound Fly myself, then the Fly doesn't matter.
+
+//#32639# If the object is anchored with me, i can neglect it, because
+//it's likely that it will follow the flow. A test formatting is not
+//allowed in that case, however!
sal_uInt8 nRet = 0;
SwFlowFrm *pTmp = this;
do
-{ // Wenn an uns oder einem Follow Objekte haengen, so
-// kann keine ProbeFormatierung stattfinden, da absatzgebundene
-// nicht richtig beruecksichtigt wuerden und zeichengebundene sollten
-// gar nicht zur Probe formatiert werden.
+{ // If there are objects hanging either on me or on
Re: [PATCH] Translated german comments in sw/source/core/layout/
On 28/02/12 14:46, Philipp Weissenbacher wrote: > So what's the status of these patches? > > Have all been reviewed and pushed by now? Yes :) Look here: http://lists.freedesktop.org/archives/libreoffice/2012-February/027098.html -- Dave -- Adfinis SyGroup AG David Vogt, Software Engineer / Project Manager Keltenstrasse 98 | CH-3018 Bern Tel. 031 381 70 47 | Direct 031 550 31 12 signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translated german comments in sw/source/core/layout/
On 21/02/12 16:09, Philipp Weissenbacher wrote: >> Started from the other end, patch 22 and 21 are pushed to master. > Nice! > > Attached are my reviewed patches (don't have commit access :-( ). > It's my first review, hopefully I did everything right. > > I also replaced the bits that seemed like too literal translation with. > > And an extra kudos for translating "spaltiger > Bereichsfrischling". That's just unfathomable to me ^^. Yeah, there were quite a few interesting words around :) > > Just asking: Is there a specific reason to highlight negations with > capital letters (e.g. NOT)? Not really. It is mainly a habit of mine because I sometimes overread such things when tired or in a hurry and thus interpret them totally wrong. You may of course use "normal case" if you think it's better that way :) -- Dave -- Adfinis SyGroup AG David Vogt, Software Engineer / Project Manager Keltenstrasse 98 | CH-3018 Bern Tel. 031 381 70 47 | Direct 031 550 31 12 signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translated german comments in sw/source/core/layout/
Hi Philipp Thanks for your response and your hints on how to contribute - I'll keep that in mind for future contributions :) And also thanks for the review! -- Dave On 17/02/12 18:02, Philipp Weissenbacher wrote: > Hello you two! > > Thanks for the big amount of work. I know how tiresome it is to > translate this oververbose German to something that makes sense in > English. That and the technical jargon make translating it quite time > intensive. So kudos for that much work! > > I think that it'd be much easier to review your patches and get them > integrated quicker if you post fewer of them and at an earlier stage. > Every little step counts and is appreciated :). I usually try to keep > under 50 K per patch - which makes for quite a few small files or one > large one with some smaller ones. > > I saw that you also added TODO comments about the translation. That's > not very handy, as I cannot communicate with you about it :-). > It'd be nicer to either include the comment in the patch email or ask on IRC. > > I noticed a lot of trailing whitespace errors. I had the same problem > in the beginning too, just find a plugin for your editor that removes > them for you or (if you use vim) you can add > autocmd BufWritePre * :%s/\s\+$//e > to your ~/.vimrc file (see http://vim.wikia.com/wiki/Remove_unwanted_spaces). > > I would greatly appreciate it if you could do that for any future > work. Then I don't have to fix them when reviewing. :-). > > BTW: I'm reviewing the first five patches. > > Cheers, > Philipp > > 2012/2/16 David Vogt : >> Hi everybody >> >> As Nicolas Christener and I promised to Cedric at FOSDEM, we set sail to >> translate the german comments in the sw/source/core/layout/ directory. >> >> We're still not quite done, but here's what we have so far. >> >> This, and any future contributions to LibreOffice are available >> under the MPL / LGPLv3+ unless stated otherwise. >> >> As far as I know, Nicolas has already sent his license statement, Stefan >> will follow soon. >> >> Since we're not very familiar with the code, it may well be that there >> are conceptual mistakes in our translation, so read with care ;) >> >> >> -- Dave >> >> -- >> Adfinis SyGroup AG >> David Vogt, Software Engineer / Project Manager >> Keltenstrasse 98 | CH-3018 Bern >> Tel. 031 381 70 47 | Direct 031 550 31 12 >> >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/libreoffice >> -- Adfinis SyGroup AG David Vogt, Software Engineer / Project Manager Keltenstrasse 98 | CH-3018 Bern Tel. 031 381 70 47 | Direct 031 550 31 12 signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
