[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 4 commits - editeng/source include/drawinglayer officecfg/registry sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Sat Nov 11 22:21:06 UTC 2017
Rebased ref, commits from common ancestor:
commit cf7bb9ba2cc9dca60afdc8f00557575714be9fa4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Sat Nov 11 22:19:20 2017 +0100
loplugin:unnecessaryvirtual
Reviewed-on: https://gerrit.libreoffice.org/40865
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit 40ea896e5c378c36ab41dbbbb06b43b8ec2c231f)
Change-Id: I7aa23e56f2c126bf505262454408340b557f13cf
diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 9455c57bb3d5..09407755a150 100644
--- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -57,7 +57,7 @@ namespace drawinglayer
bool mbIsGap;
// not implemented
- virtual bool operator!=(const BorderLine& rBorderLine) const = delete;
+ bool operator!=(const BorderLine& rBorderLine) const = delete;
public:
// Constructor for visible BorderLine segments
@@ -88,7 +88,7 @@ namespace drawinglayer
double getEndAverage() const { return 0.5 * (mfEndLeft + mfEndRight); }
/// compare operator
- virtual bool operator==(const BorderLine& rBorderLine) const;
+ bool operator==(const BorderLine& rBorderLine) const;
};
/// helper to try to merge two instances of BorderLinePrimitive2D. If it was possible,
commit dbc0737b20023f5456ec44eee20b91ab1d7fa8ef
Author: Manfred Blume <manfred.blume at cib.de>
Date: Fri Nov 10 10:53:01 2017 +0100
tdf#95635 use different font size keyboard shortcuts
Decrease is Ctrl-8, increase isCTRL-9. German-only, to prevent
issues with inaccessible combinations.
Change-Id: I8e009a9827265f49948464cc5356680c141663e6
Reviewed-on: https://gerrit.libreoffice.org/44584
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 4c9349aef26499b9d80a4d6354680b688a95fb0b)
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index d4d9582c1a10..2f6a4dcaccae 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -590,12 +590,14 @@
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Shrink</value>
+ <value xml:lang="de">.uno:Shrink</value>
</prop>
</node>
<node oor:name="9_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Grow</value>
+ <value xml:lang="de">.uno:Grow</value>
</prop>
</node>
<node oor:name="ADD_MOD1" oor:op="replace">
@@ -1435,12 +1437,14 @@
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Shrink</value>
+ <value xml:lang="de">.uno:Shrink</value>
</prop>
</node>
<node oor:name="9_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Grow</value>
+ <value xml:lang="de">.uno:Grow</value>
</prop>
</node>
<node oor:name="9_SHIFT_MOD1_MOD2" oor:op="replace">
@@ -1897,12 +1901,14 @@
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Shrink</value>
+ <value xml:lang="de">.uno:Shrink</value>
</prop>
</node>
<node oor:name="9_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Grow</value>
+ <value xml:lang="de">.uno:Grow</value>
</prop>
</node>
<node oor:name="ADD_MOD1" oor:op="replace">
@@ -2683,12 +2689,14 @@
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Shrink</value>
+ <value xml:lang="de">.uno:Shrink</value>
</prop>
</node>
<node oor:name="9_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Grow</value>
+ <value xml:lang="de">.uno:Grow</value>
</prop>
</node>
<node oor:name="9_SHIFT_MOD1_MOD2" oor:op="replace">
@@ -3291,12 +3299,14 @@
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Shrink</value>
+ <value xml:lang="de">.uno:Shrink</value>
</prop>
</node>
<node oor:name="9_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Grow</value>
+ <value xml:lang="de">.uno:Grow</value>
</prop>
</node>
<node oor:name="ADD_MOD1" oor:op="replace">
@@ -5625,12 +5635,14 @@
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Shrink</value>
+ <value xml:lang="de">.uno:Shrink</value>
</prop>
</node>
<node oor:name="9_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Grow</value>
+ <value xml:lang="de">.uno:Grow</value>
</prop>
</node>
<node oor:name="ADD_MOD1" oor:op="replace">
@@ -6417,12 +6429,14 @@
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Shrink</value>
+ <value xml:lang="de">.uno:Shrink</value>
</prop>
</node>
<node oor:name="9_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="sv">.uno:Grow</value>
+ <value xml:lang="de">.uno:Grow</value>
</prop>
</node>
<node oor:name="ADD_MOD1" oor:op="replace">
commit 90d3529629d2bf7313d3397c8d36d220712602ff
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Fri Nov 10 11:06:46 2017 +0100
tdf#113591 Fix crash when switching between Calc and other LO window
Need to get the ContentNode from EditDoc, as the selection might
have a pointer to an already deleted ContentNode.
Reviewed-on: https://gerrit.libreoffice.org/44583
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit e4d1551697406bab0e9973bfa8ac012c48ff8eea)
Conflicts:
editeng/source/editeng/editview.cxx
Change-Id: I5c17be8ec2cbc57686eaf90e8b03c026aea7f28f
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 108a0875886d..9f14da4b02bd 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -232,11 +232,14 @@ bool EditView::IsReadOnly() const
void EditView::SetSelection( const ESelection& rESel )
{
- // If someone has just left an empty attribute, and then the outliner
- // manipulates the selection:
+ // If someone has just left an empty attribute, and then the
+ // outliner manipulates the selection, call the CursorMoved method
+ // so that empty attributes get cleaned up.
if ( !pImpEditView->GetEditSelection().HasRange() )
{
- const ContentNode* pNode = pImpEditView->GetEditSelection().Max().GetNode();
+ // tdf#113591 Get node from EditDoc, as the selection might
+ // have a pointer to an already deleted node.
+ const ContentNode* pNode = pImpEditView->pEditEngine->GetEditDoc().GetEndPaM().GetNode();
pImpEditView->pEditEngine->CursorMoved( pNode );
}
EditSelection aNewSelection( pImpEditView->pEditEngine->pImpEditEngine->ConvertSelection(
commit e399696bd0b996bee572b9dc6bc56b04b34dc777
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 8 14:02:11 2017 +0000
crashtesting: assert on re-export of fdo55459-1.docx to docx
since...
commit 3f2e84b4bd0bbd936e0af845ba7cbf68cb2803d6
Date: Tue Oct 31 23:39:26 2017 +0100
tdf#38778 Fix output of the font in DOC run
The font information should be output before field declaration.
Added unit test.
tdf#38778 DOCX output: no double output of the font info
need to also not double output the complex script font info as well
as the western and asian info
Change-Id: I7de098dff0b787b9825a509cec19d0161a3a0d8a
Reviewed-on: https://gerrit.libreoffice.org/44465
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/44580
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 76de5cabb222..0ffdd716b88c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6754,6 +6754,14 @@ void DocxAttributeOutput::CharWeightCJK( const SvxWeightItem& rWeight )
void DocxAttributeOutput::CharFontCTL( const SvxFontItem& rFont )
{
+ if (m_pFontsAttrList.is() && m_pFontsAttrList->hasAttribute(FSNS(XML_w, XML_cs)))
+ {
+ // tdf#38778: do to fields output into DOC the font could be added before and after field declaration
+ // that all sub runs of the field will have correct font inside.
+ // For DOCX we should do not add the same font information twice in the same node
+ return;
+ }
+
const OUString& sFontName(rFont.GetFamilyName());
OString sFontNameUtf8 = OUStringToOString(sFontName, RTL_TEXTENCODING_UTF8);
AddToAttrList( m_pFontsAttrList, FSNS( XML_w, XML_cs ), sFontNameUtf8.getStr() );
More information about the Libreoffice-commits
mailing list