[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/frmtool.hxx | 16
sw/source/core/layout/flycnt.cxx | 70 ++---
sw/source/core/layout/frmtool.cxx | 40 +++--
sw/source/core/layout/laycache.cxx | 10 ++---
sw/source/core/layout/layhelp.hxx | 16
5 files changed, 78 insertions(+), 74 deletions(-)
New commits:
commit 78e0da267774a35f4abfef52f0ce74b1972128a4
Author: Miklos Vajna
AuthorDate: Mon Nov 9 08:59:09 2020 +0100
Commit: Miklos Vajna
CommitDate: Mon Nov 9 09:38:04 2020 +0100
sw: prefix members of StackHack, SwActualSection, SwFrameHolder and ...
... SwOszControl
See tdf#94879 for motivation.
Change-Id: If36742218a4deca1b688ef8996702c5985310110
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105472
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index c525f59be56e..cdbc4dbbd420 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -449,23 +449,23 @@ public:
class StackHack
{
-static sal_uInt8 nCnt;
-static bool bLocked;
+static sal_uInt8 s_nCnt;
+static bool s_bLocked;
public:
StackHack()
{
-if ( ++StackHack::nCnt > 50 )
-StackHack::bLocked = true;
+if ( ++StackHack::s_nCnt > 50 )
+StackHack::s_bLocked = true;
}
~StackHack()
{
-if ( --StackHack::nCnt < 5 )
-StackHack::bLocked = false;
+if ( --StackHack::s_nCnt < 5 )
+StackHack::s_bLocked = false;
}
-static bool IsLocked() { return StackHack::bLocked; }
-static sal_uInt8 Count(){ return StackHack::nCnt; }
+static bool IsLocked() { return StackHack::s_bLocked; }
+static sal_uInt8 Count(){ return StackHack::s_nCnt; }
};
// Should upper (or lower) border be evaluated for this frame?
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index c19794e98e28..4dc2db5921d7 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -206,11 +206,11 @@ namespace {
// #i3317# - re-factoring of the position stack
class SwOszControl
{
-static const SwFlyFrame* m_pStack1;
-static const SwFlyFrame* m_pStack2;
-static const SwFlyFrame* m_pStack3;
-static const SwFlyFrame* m_pStack4;
-static const SwFlyFrame* m_pStack5;
+static const SwFlyFrame* s_pStack1;
+static const SwFlyFrame* s_pStack2;
+static const SwFlyFrame* s_pStack3;
+static const SwFlyFrame* s_pStack4;
+static const SwFlyFrame* s_pStack5;
const SwFlyFrame* m_pFly;
std::vector maObjPositions;
@@ -224,54 +224,54 @@ public:
}
-const SwFlyFrame* SwOszControl::m_pStack1 = nullptr;
-const SwFlyFrame* SwOszControl::m_pStack2 = nullptr;
-const SwFlyFrame* SwOszControl::m_pStack3 = nullptr;
-const SwFlyFrame* SwOszControl::m_pStack4 = nullptr;
-const SwFlyFrame* SwOszControl::m_pStack5 = nullptr;
+const SwFlyFrame* SwOszControl::s_pStack1 = nullptr;
+const SwFlyFrame* SwOszControl::s_pStack2 = nullptr;
+const SwFlyFrame* SwOszControl::s_pStack3 = nullptr;
+const SwFlyFrame* SwOszControl::s_pStack4 = nullptr;
+const SwFlyFrame* SwOszControl::s_pStack5 = nullptr;
SwOszControl::SwOszControl(const SwFlyFrame* pFrame)
: m_pFly(pFrame)
{
-if (!SwOszControl::m_pStack1)
-SwOszControl::m_pStack1 = m_pFly;
-else if (!SwOszControl::m_pStack2)
-SwOszControl::m_pStack2 = m_pFly;
-else if (!SwOszControl::m_pStack3)
-SwOszControl::m_pStack3 = m_pFly;
-else if (!SwOszControl::m_pStack4)
-SwOszControl::m_pStack4 = m_pFly;
-else if (!SwOszControl::m_pStack5)
-SwOszControl::m_pStack5 = m_pFly;
+if (!SwOszControl::s_pStack1)
+SwOszControl::s_pStack1 = m_pFly;
+else if (!SwOszControl::s_pStack2)
+SwOszControl::s_pStack2 = m_pFly;
+else if (!SwOszControl::s_pStack3)
+SwOszControl::s_pStack3 = m_pFly;
+else if (!SwOszControl::s_pStack4)
+SwOszControl::s_pStack4 = m_pFly;
+else if (!SwOszControl::s_pStack5)
+SwOszControl::s_pStack5 = m_pFly;
}
SwOszControl::~SwOszControl()
{
-if (SwOszControl::m_pStack1 == m_pFly)
-SwOszControl::m_pStack1 = nullptr;
-else if (SwOszControl::m_pStack2 == m_pFly)
-SwOszControl::m_pStack2 = nullptr;
-else if (SwOszControl::m_pStack3 == m_pFly)
-SwOszControl::m_pStack3 = nullptr;
-else if (SwOszControl::m_pStack4 == m_pFly)
-SwOszControl::m_pStack4 = nullptr;
-else if (SwOszControl::m_pStack5 == m_pFly)
-SwOszControl::m_pStack5 = nullptr;
+if (SwOszControl::s_pStack1 == m_pFly)
+SwOszControl::s_pStack1 = nullptr;
+else if (SwOszControl::s_pStack2 == m_pFly)
+SwOszControl::s_pStack2 = nullptr;
+else if (SwOszControl::s_pStack3 == m_pFly)
+SwOszControl::s_pStack3 = nullptr;
+else if (Sw
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/CppunitTest_sw_core_docnode.mk sw/Module_sw.mk sw/qa sw/source
sw/CppunitTest_sw_core_docnode.mk| 73 +++ sw/Module_sw.mk |1 sw/qa/core/docnode/data/redline-ends-before-toc.docx |binary sw/qa/core/docnode/docnode.cxx | 50 + sw/source/core/docnode/ndsect.cxx| 23 + 5 files changed, 147 insertions(+) New commits: commit a0359bd07b2f4063378f5d052994b2dcbe4aaae2 Author: Miklos Vajna AuthorDate: Fri Nov 6 16:33:10 2020 +0100 Commit: Miklos Vajna CommitDate: Mon Nov 9 09:58:32 2020 +0100 DOCX import: fix assertion failure when redline ends right before a ToC This was always a problem, but now more visible since commit 8b3c861c46ae12d21b7b3a550e2daa21d2006b77 (tdf#89991 DOCX: import Show changes from older formats, 2019-06-13), as it now affects more documents: tracked changes can be hidden by the time the initial layout is created. With that aside, the immediate problem is an assertion failure in InsertCnt_(), because it assumes that an end node for a section has to have a matching pActualSection, created by start node of the same section. This will fail in case the start node is hidden, but not the end node. The deeper problem is that redlines are not supposed to cross section boundaries: if e.g. multiple cells are selected in a table and the user deletes while tracking changes, then the UI creates multiple redlines instead. The problem here is similar: a delete redline ends right before the section start, so when SwNodes::InsertTextSection() inserts a section node, the end of that redline is automatically moved to the start of the section content (its index increases, the actual SwNode doesn't change). Fix the problem by explicitly checking for a redline end at ToX start and moving it back to the end of last content node. This matches the doc model produced by the WW8 import. (cherry picked from commit 69edfcf789db1920273191d93fae0bc03f385b81) Conflicts: sw/source/core/docnode/ndsect.cxx Change-Id: Ic7b279185a20d2a32abd054d3fc6be530ddde12a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105473 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/sw/CppunitTest_sw_core_docnode.mk b/sw/CppunitTest_sw_core_docnode.mk new file mode 100644 index ..daa9666a99d4 --- /dev/null +++ b/sw/CppunitTest_sw_core_docnode.mk @@ -0,0 +1,73 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#* + +$(eval $(call gb_CppunitTest_CppunitTest,sw_core_docnode)) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_docnode)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_docnode, \ +sw/qa/core/docnode/docnode \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sw_core_docnode, \ +comphelper \ +cppu \ +cppuhelper \ +editeng \ +sal \ +sfx \ +sw \ +test \ +unotest \ +utl \ +vcl \ +svt \ +tl \ +svl \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_core_docnode,\ +boost_headers \ +libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_core_docnode,\ +-I$(SRCDIR)/sw/inc \ +-I$(SRCDIR)/sw/source/core/inc \ +-I$(SRCDIR)/sw/source/uibase/inc \ +-I$(SRCDIR)/sw/qa/inc \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_core_docnode,\ +udkapi \ +offapi \ +oovbaapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_core_docnode)) +$(eval $(call gb_CppunitTest_use_vcl,sw_core_docnode)) + +$(eval $(call gb_CppunitTest_use_rdb,sw_core_docnode,services)) + +$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_docnode,\ +officecfg/registry \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sw_core_docnode)) + +$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_docnode, \ +modules/swriter \ +)) + +$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_docnode)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index a3958d4c4b65..280d7f25627c 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -107,6 +107,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_unowriter \ CppunitTest_sw_core_text \ CppunitTest_sw_core_doc \ +CppunitTest_sw_core_docnode \ CppunitTest_sw_uibase_shells \ CppunitTest_sw_uibase_dochdl \ CppunitTest_sw_core_frmedt \ diff --git a/sw/qa/core/docnode/data/redline-ends-before-toc.do
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/access2base.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1aa5e450f065bfdae8c354344f23b897f48a166f
Author: Caolán McNamara
AuthorDate: Wed Nov 4 09:28:02 2020 +
Commit: Caolán McNamara
CommitDate: Mon Nov 9 10:12:08 2020 +0100
copy_paste_error data1 looks like a copy-paste error
Change-Id: I937743f8d1789c68ed960c6a5aede0508dfa7bcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105282
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/wizards/source/access2base/access2base.py
b/wizards/source/access2base/access2base.py
index 87734ebbb17f..00b9c894488d 100644
--- a/wizards/source/access2base/access2base.py
+++ b/wizards/source/access2base/access2base.py
@@ -900,7 +900,7 @@ class Basic(object, metaclass = _Singleton):
@classmethod
def DateDiff(cls, add, date1, date2, weekstart = 1, yearstart = 1):
if isinstance(date1, datetime.datetime): date1 = date1.isoformat()
-if isinstance(date2, datetime.datetime): date2 = date1.isoformat()
+if isinstance(date2, datetime.datetime): date2 = date2.isoformat()
return cls.M('PyDateDiff', _WRAPPERMODULE, add, date1, date2,
weekstart, yearstart)
@classmethod
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/0214.xhp |2 +- source/text/scalc/01/02140400.xhp |2 +- source/text/scalc/main0202.xhp |2 +- source/text/scalc/main0205.xhp |2 +- source/text/shared/00/00040501.xhp |4 ++-- source/text/shared/00/00040502.xhp |4 ++-- source/text/shared/01/05030700.xhp |2 +- source/text/shared/01/0507.xhp |2 +- source/text/shared/01/05070100.xhp |4 ++-- source/text/shared/01/0508.xhp |2 +- source/text/shared/01/05080100.xhp |4 ++-- source/text/shared/01/05340300.xhp |2 +- source/text/shared/02/0511.xhp |2 +- source/text/simpress/main0203.xhp |4 ++-- source/text/swriter/main0202.xhp |4 ++-- source/text/swriter/main0215.xhp |4 ++-- source/text/swriter/main0216.xhp |4 ++-- source/text/swriter/main0220.xhp |4 ++-- 18 files changed, 27 insertions(+), 27 deletions(-) New commits: commit 9d5fa111ec0ed75cf28719536c98d6e4482d4a03 Author: Johnny_M AuthorDate: Sat Oct 31 17:29:27 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:15:17 2020 +0100 tdf#132643 Translate German section IDs Change-Id: Id742ad4c9850a88d6d8d1925e2d0088f76ec8717 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105108 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/0214.xhp b/source/text/scalc/01/0214.xhp index 5a0c349db..bd8e6b3c7 100644 --- a/source/text/scalc/01/0214.xhp +++ b/source/text/scalc/01/0214.xhp @@ -44,7 +44,7 @@ - + Sheet Series diff --git a/source/text/scalc/01/02140400.xhp b/source/text/scalc/01/02140400.xhp index 5e930927d..a96720e8e 100644 --- a/source/text/scalc/01/02140400.xhp +++ b/source/text/scalc/01/02140400.xhp @@ -32,7 +32,7 @@ - + Left Fills a selected range of at least two columns with the contents of the far right cell. diff --git a/source/text/scalc/main0202.xhp b/source/text/scalc/main0202.xhp index e753907bc..b9d9e366c 100644 --- a/source/text/scalc/main0202.xhp +++ b/source/text/scalc/main0202.xhp @@ -49,7 +49,7 @@ Align Left - + Align Center Horizontally diff --git a/source/text/scalc/main0205.xhp b/source/text/scalc/main0205.xhp index 6e27390da..457fae4bb 100644 --- a/source/text/scalc/main0205.xhp +++ b/source/text/scalc/main0205.xhp @@ -59,7 +59,7 @@ Align Left - + Centered diff --git a/source/text/shared/00/00040501.xhp b/source/text/shared/00/00040501.xhp index e7f2895d3..c54b2c462 100644 --- a/source/text/shared/00/00040501.xhp +++ b/source/text/shared/00/00040501.xhp @@ -315,12 +315,12 @@ Choose Shape - Align (objects selected) ($[officename] Draw). Open context menu - choose Align (objects selected) ($[officename] Impress, $[officename] Draw). - + Choose Format - Align - Left ($[officename] Writer, $[officename] Calc). Choose Shape - Align - Left (selected objects) ($[officename] Draw). Open context menu - choose Align - Left (objects selected) ($[officename] Impress, $[officename] Draw). On Align bar ($[officename] Impress, $[officename] Draw), click - + diff --git a/source/text/shared/00/00040502.xhp b/source/text/shared/00/00040502.xhp index c5eb6b1df..52a102008 100644 --- a/source/text/shared/00/00040502.xhp +++ b/source/text/shared/00/00040502.xhp @@ -345,10 +345,10 @@ Open context menu - choose Line Spacing - Double. - + Choose Format - Align - Left (drawing functions). Open context menu - choose Align - Left. - + diff --git a/source/text/shared/01/05030700.xhp b/source/text/shared/01/05030700.xhp index 8abe0a34f..6c1e249e9 100644 --- a/source/text/shared/01/05030700.xhp +++ b/source/text/shared/01/05030700.xhp @@ -49,7 +49,7 @@ Aligns the paragraph to the left page margin. If Asian language support is enabled, this option is named Left/Top. - + Right Aligns the paragraph to the right page margin. diff --git a/source/text/shared/01/0507.xhp b/source/text/shared/01/0507.xhp index 4f5941739..b60d47364 100644 --- a/source/text/shared/01/0507.xhp +++ b/source/text/shared/01/0507.xhp @@ -41,7 +41,7 @@ Not all types of objects can be selected together. Not all modules (Writer, Calc, Impress, Draw) support all types of alignment. - + diff --git a/source/text/shared/01/05070100.xhp b/source/text/shared/01/05070100.xhp index e5ae43535..781329f52 100644 --- a/source/text/shared/01/05070100.xhp +++ b/source/text/shared/01/05070100.xhp @@ -27,14 +27,14 @@ - + Align Left Aligns the left edges of the selected objects. If only one object is selected in Draw or Impress, the left edge of the object is aligned to the left page margin.UFI: this help id .uno:alignleft is
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 543ee013a8aaa559493dc16a1099badb8885 Author: Johnny_M AuthorDate: Mon Nov 9 10:15:17 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:15:17 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 9d5fa111ec0ed75cf28719536c98d6e4482d4a03 - tdf#132643 Translate German section IDs Change-Id: Id742ad4c9850a88d6d8d1925e2d0088f76ec8717 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105108 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index db325f95386a..9d5fa111ec0e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit db325f95386ada37f4e4de2bc806f27639dda7f8 +Subproject commit 9d5fa111ec0ed75cf28719536c98d6e4482d4a03 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 83a50ca0a6af6204987ba37fea16dd64da6c788d Author: Johnny_M AuthorDate: Mon Nov 9 10:15:57 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:15:57 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to a5fd90151814959383c891edae44603b2a47ec35 - tdf#132643 Translate German section IDs Change-Id: I4abccc3e3d4ed5f0ce7f4861f524e56af1f24d99 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105109 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 9d5fa111ec0e..a5fd90151814 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9d5fa111ec0ed75cf28719536c98d6e4482d4a03 +Subproject commit a5fd90151814959383c891edae44603b2a47ec35 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0527.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a5fd90151814959383c891edae44603b2a47ec35 Author: Johnny_M AuthorDate: Sat Oct 31 17:30:50 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:15:57 2020 +0100 tdf#132643 Translate German section IDs Change-Id: I4abccc3e3d4ed5f0ce7f4861f524e56af1f24d99 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105109 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0527.xhp b/source/text/shared/01/0527.xhp index 29b4ab8d1..d06541aa1 100644 --- a/source/text/shared/01/0527.xhp +++ b/source/text/shared/01/0527.xhp @@ -30,7 +30,7 @@ - + Edit Points Lets you change the shape of the selected drawing object. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/0507.xhp|2 +- source/text/scalc/01/cell_styles.xhp |2 +- source/text/shared/01/05040100.xhp |2 +- source/text/swriter/01/0504.xhp |2 +- source/text/swriter/01/05130002.xhp |2 +- source/text/swriter/01/05130004.xhp |2 +- 6 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 399097db6b4d86d34b9b2c8462bb4000977bf9f9 Author: Johnny_M AuthorDate: Sat Oct 31 17:41:45 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:17:04 2020 +0100 tdf#132643 Translate German section IDs Change-Id: Iedb30a66e63bfde10e3514008aec3763ecaaec2f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105111 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/0507.xhp b/source/text/scalc/01/0507.xhp index 91556b8ff..65fbb8c9c 100644 --- a/source/text/scalc/01/0507.xhp +++ b/source/text/scalc/01/0507.xhp @@ -41,7 +41,7 @@ - + diff --git a/source/text/scalc/01/cell_styles.xhp b/source/text/scalc/01/cell_styles.xhp index 2cdc22340..cdc40cfce 100644 --- a/source/text/scalc/01/cell_styles.xhp +++ b/source/text/scalc/01/cell_styles.xhp @@ -24,7 +24,7 @@ - + diff --git a/source/text/shared/01/05040100.xhp b/source/text/shared/01/05040100.xhp index c2ea98009..d74947fcc 100644 --- a/source/text/shared/01/05040100.xhp +++ b/source/text/shared/01/05040100.xhp @@ -33,7 +33,7 @@ - + Organizer Set the options for the selected style. diff --git a/source/text/swriter/01/0504.xhp b/source/text/swriter/01/0504.xhp index 88d642967..70d5d8248 100644 --- a/source/text/swriter/01/0504.xhp +++ b/source/text/swriter/01/0504.xhp @@ -36,7 +36,7 @@ - + diff --git a/source/text/swriter/01/05130002.xhp b/source/text/swriter/01/05130002.xhp index ea06b0b1c..a9558a96a 100644 --- a/source/text/swriter/01/05130002.xhp +++ b/source/text/swriter/01/05130002.xhp @@ -32,7 +32,7 @@ - + diff --git a/source/text/swriter/01/05130004.xhp b/source/text/swriter/01/05130004.xhp index 4c33a6c6a..c0e05370a 100644 --- a/source/text/swriter/01/05130004.xhp +++ b/source/text/swriter/01/05130004.xhp @@ -36,7 +36,7 @@ When a Numbering Style is created, a name is assigned to the numbering. This is why such templates are also called "named" numberings. Unnamed numberings, which are used for direct formatting, can be created in the Bullets and Numbering dialog or with the icons of the object bar. - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a4f4f28471527046c378652f9c3b94bf458fc9b9 Author: Johnny_M AuthorDate: Mon Nov 9 10:17:04 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:17:04 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 399097db6b4d86d34b9b2c8462bb4000977bf9f9 - tdf#132643 Translate German section IDs Change-Id: Iedb30a66e63bfde10e3514008aec3763ecaaec2f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105111 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index a5fd90151814..399097db6b4d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a5fd90151814959383c891edae44603b2a47ec35 +Subproject commit 399097db6b4d86d34b9b2c8462bb4000977bf9f9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0535.xhp |2 +- source/text/shared/01/05350300.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 83e67ad8636748e764b9d28f0c862d085e2b6dfd Author: Johnny_M AuthorDate: Sat Oct 31 17:38:45 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:18:36 2020 +0100 tdf#132643 Translate German section IDs Change-Id: I4bebdde5b35b27f9d718a2ac4746071142998c2f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105112 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0535.xhp b/source/text/shared/01/0535.xhp index b1ad9f558..223d50d90 100644 --- a/source/text/shared/01/0535.xhp +++ b/source/text/shared/01/0535.xhp @@ -42,7 +42,7 @@ - + diff --git a/source/text/shared/01/05350300.xhp b/source/text/shared/01/05350300.xhp index 75be4bb01..d83dd1698 100644 --- a/source/text/shared/01/05350300.xhp +++ b/source/text/shared/01/05350300.xhp @@ -27,7 +27,7 @@ - + Shading Sets the shading and shadow options for the selected 3D object. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4a192f79a0f6447825e5f3c8354e30c2c49d0b6d Author: Johnny_M AuthorDate: Mon Nov 9 10:18:36 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:18:36 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 83e67ad8636748e764b9d28f0c862d085e2b6dfd - tdf#132643 Translate German section IDs Change-Id: I4bebdde5b35b27f9d718a2ac4746071142998c2f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105112 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 399097db6b4d..83e67ad86367 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 399097db6b4d86d34b9b2c8462bb4000977bf9f9 +Subproject commit 83e67ad8636748e764b9d28f0c862d085e2b6dfd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040502.xhp |2 +- source/text/shared/01/0523.xhp |2 +- source/text/shared/01/05230300.xhp |4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 29bb12580a02e7e5c97676d28d6fb60be589892f Author: Johnny_M AuthorDate: Sat Oct 31 17:34:23 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:20:28 2020 +0100 tdf#132643 Translate German section IDs Change-Id: Id4a67cb716772a7dd595445eaeebc11170fbf6a6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105110 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040502.xhp b/source/text/shared/00/00040502.xhp index 52a102008..2a50c44fb 100644 --- a/source/text/shared/00/00040502.xhp +++ b/source/text/shared/00/00040502.xhp @@ -227,7 +227,7 @@ - + Choose Format - Text Box and Shape - Object - Position and Size - Rotation tab. diff --git a/source/text/shared/01/0523.xhp b/source/text/shared/01/0523.xhp index 8f1b9ecf2..017ebe784 100644 --- a/source/text/shared/01/0523.xhp +++ b/source/text/shared/01/0523.xhp @@ -40,7 +40,7 @@ - + diff --git a/source/text/shared/01/05230300.xhp b/source/text/shared/01/05230300.xhp index 10c2d44d6..8f3720ac1 100644 --- a/source/text/shared/01/05230300.xhp +++ b/source/text/shared/01/05230300.xhp @@ -28,14 +28,14 @@ - + Rotation Rotates the selected object. - + Pivot Point The selected object is rotated around a pivot point that you specify. The default pivot point is at the center of the object. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9c980d5385b3f80a17f7299c128aeaf2767aed51 Author: Johnny_M AuthorDate: Mon Nov 9 10:20:28 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:20:28 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 29bb12580a02e7e5c97676d28d6fb60be589892f - tdf#132643 Translate German section IDs Change-Id: Id4a67cb716772a7dd595445eaeebc11170fbf6a6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105110 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 83e67ad86367..29bb12580a02 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 83e67ad8636748e764b9d28f0c862d085e2b6dfd +Subproject commit 29bb12580a02e7e5c97676d28d6fb60be589892f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05100100.xhp |4 ++-- source/text/shared/main0204.xhp |2 +- source/text/simpress/01/1316.xhp |2 +- source/text/simpress/main0113.xhp|2 +- source/text/swriter/00/0405.xhp |4 ++-- source/text/swriter/01/0510.xhp |2 +- source/text/swriter/main0204.xhp |2 +- 7 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 729a252ee131b6705a98377d55b616d8c562ef00 Author: Johnny_M AuthorDate: Sat Oct 31 17:54:31 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:28:08 2020 +0100 tdf#132643 Translate German section IDs Change-Id: Iadce4d068044b3cd4b88759273c34d324ac454cb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105115 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/05100100.xhp b/source/text/shared/01/05100100.xhp index 5b48f4f91..a8d358a81 100644 --- a/source/text/shared/01/05100100.xhp +++ b/source/text/shared/01/05100100.xhp @@ -27,7 +27,7 @@ - + Merge Combines the contents of the selected table cells into a single cell. @@ -41,7 +41,7 @@ On the Table Bar, click - + diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp index 4ce2785ce..e5ed0e92b 100644 --- a/source/text/shared/main0204.xhp +++ b/source/text/shared/main0204.xhp @@ -44,7 +44,7 @@ Merge Cells - + diff --git a/source/text/simpress/01/1316.xhp b/source/text/simpress/01/1316.xhp index 26cb447ba..8ec9d1aa7 100644 --- a/source/text/simpress/01/1316.xhp +++ b/source/text/simpress/01/1316.xhp @@ -32,7 +32,7 @@ - + Connect Creates a line or Bézier curve by connecting two or more lines, Bézier curves, or other objects with a line. Closed objects containing a fill are converted to lines and lose their fill. diff --git a/source/text/simpress/main0113.xhp b/source/text/simpress/main0113.xhp index ff944e739..dbbaaadd0 100644 --- a/source/text/simpress/main0113.xhp +++ b/source/text/simpress/main0113.xhp @@ -53,7 +53,7 @@ - + diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index e90de68a3..a4c0f2179 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -148,10 +148,10 @@ Choose Table - Properties - Columns tab. Choose Table - Properties - Text Flow tab. Right-click in a table, choose Cell. - + Choose Table - Merge Cells. On the Table bar, click - + diff --git a/source/text/swriter/01/0510.xhp b/source/text/swriter/01/0510.xhp index dcec38b4a..b99cc249a 100644 --- a/source/text/swriter/01/0510.xhp +++ b/source/text/swriter/01/0510.xhp @@ -37,7 +37,7 @@ - + diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp index 9d6bea083..faedb88be 100644 --- a/source/text/swriter/main0204.xhp +++ b/source/text/swriter/main0204.xhp @@ -44,7 +44,7 @@ Merge Cells - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0225.xhp |2 +- source/text/swriter/main0106.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 6bd8efe56caa8392de92856350745b2915feee65 Author: Johnny_M AuthorDate: Sat Oct 31 18:04:47 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:28:50 2020 +0100 tdf#132643 Translate German section IDs Change-Id: I729492f6fcf8eebf4ec0705ba54b2464a0de0499 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105116 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0225.xhp b/source/text/shared/01/0225.xhp index a5cd7c009..7f5ab8924 100644 --- a/source/text/shared/01/0225.xhp +++ b/source/text/shared/01/0225.xhp @@ -25,7 +25,7 @@ - + diff --git a/source/text/swriter/main0106.xhp b/source/text/swriter/main0106.xhp index a9a2a0789..8f71edc99 100644 --- a/source/text/swriter/main0106.xhp +++ b/source/text/swriter/main0106.xhp @@ -46,7 +46,7 @@ Footnotes - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 506ea5a7e80e2746627aeeb128c03d47a5de9850 Author: Johnny_M AuthorDate: Mon Nov 9 10:28:08 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:28:08 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 729a252ee131b6705a98377d55b616d8c562ef00 - tdf#132643 Translate German section IDs Change-Id: Iadce4d068044b3cd4b88759273c34d324ac454cb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105115 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 29bb12580a02..729a252ee131 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 29bb12580a02e7e5c97676d28d6fb60be589892f +Subproject commit 729a252ee131b6705a98377d55b616d8c562ef00 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ece7d0b4b60e55a2f749dbee037792ade256b70b Author: Johnny_M AuthorDate: Mon Nov 9 10:28:50 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:28:50 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 6bd8efe56caa8392de92856350745b2915feee65 - tdf#132643 Translate German section IDs Change-Id: I729492f6fcf8eebf4ec0705ba54b2464a0de0499 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105116 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 729a252ee131..6bd8efe56caa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 729a252ee131b6705a98377d55b616d8c562ef00 +Subproject commit 6bd8efe56caa8392de92856350745b2915feee65 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0532.xhp |2 +- source/text/shared/01/0599.xhp |2 +- source/text/swriter/02/1905.xhp |4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 9c457341b068a3ab782723455988bc0aff1add05 Author: Johnny_M AuthorDate: Sat Oct 31 17:51:56 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:29:42 2020 +0100 tdf#132643 Translate German section IDs Change-Id: Ic768bf13b5444a20004d67c38493184333e2e534 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105114 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0532.xhp b/source/text/shared/01/0532.xhp index bcde69b68..ade7f9e73 100644 --- a/source/text/shared/01/0532.xhp +++ b/source/text/shared/01/0532.xhp @@ -29,7 +29,7 @@ - + Text Animation diff --git a/source/text/shared/01/0599.xhp b/source/text/shared/01/0599.xhp index b56752b9f..90602022c 100644 --- a/source/text/shared/01/0599.xhp +++ b/source/text/shared/01/0599.xhp @@ -38,7 +38,7 @@ This command is only available for drawing objects that can contain text, for example for rectangles, but not for lines. - + diff --git a/source/text/swriter/02/1905.xhp b/source/text/swriter/02/1905.xhp index 1e998f0b9..5333208fc 100644 --- a/source/text/swriter/02/1905.xhp +++ b/source/text/swriter/02/1905.xhp @@ -29,11 +29,11 @@ - + Text Animation - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1196e2b0ba9edd49bcf0082deaaa28eddb3796f9 Author: Johnny_M AuthorDate: Mon Nov 9 10:29:42 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:29:42 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 9c457341b068a3ab782723455988bc0aff1add05 - tdf#132643 Translate German section IDs Change-Id: Ic768bf13b5444a20004d67c38493184333e2e534 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105114 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6bd8efe56caa..9c457341b068 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6bd8efe56caa8392de92856350745b2915feee65 +Subproject commit 9c457341b068a3ab782723455988bc0aff1add05 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8d3034d14cc4e38ed3aee0495bb353fde4421db1 Author: Johnny_M AuthorDate: Mon Nov 9 10:30:51 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:30:51 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 2b15a169f450f4293f4274857eb3506d7e6b13be - tdf#132643 Translate German section IDs Change-Id: Iecf08159e31b821c65b1396592172490d3710b9a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105117 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 9c457341b068..2b15a169f450 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9c457341b068a3ab782723455988bc0aff1add05 +Subproject commit 2b15a169f450f4293f4274857eb3506d7e6b13be ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/main0107.xhp |2 +- source/text/shared/01/0708.xhp |2 +- source/text/simpress/main0107.xhp |2 +- source/text/smath/main0107.xhp |2 +- source/text/swriter/main0107.xhp |2 +- 5 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 2b15a169f450f4293f4274857eb3506d7e6b13be Author: Johnny_M AuthorDate: Sat Oct 31 18:07:01 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:30:51 2020 +0100 tdf#132643 Translate German section IDs Change-Id: Iecf08159e31b821c65b1396592172490d3710b9a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105117 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0107.xhp b/source/text/scalc/main0107.xhp index 2fc04aa12..84ccb5570 100644 --- a/source/text/scalc/main0107.xhp +++ b/source/text/scalc/main0107.xhp @@ -36,7 +36,7 @@ - + \ No newline at end of file diff --git a/source/text/shared/01/0708.xhp b/source/text/shared/01/0708.xhp index fb0435479..384190e1d 100644 --- a/source/text/shared/01/0708.xhp +++ b/source/text/shared/01/0708.xhp @@ -32,7 +32,7 @@ - + Document List Lists the currently open documents. Select the name of a document in the list to switch to that document. diff --git a/source/text/simpress/main0107.xhp b/source/text/simpress/main0107.xhp index ab2b5b5ab..9b26f61f1 100644 --- a/source/text/simpress/main0107.xhp +++ b/source/text/simpress/main0107.xhp @@ -36,7 +36,7 @@ - + \ No newline at end of file diff --git a/source/text/smath/main0107.xhp b/source/text/smath/main0107.xhp index 3ecac547f..ccd8c14da 100644 --- a/source/text/smath/main0107.xhp +++ b/source/text/smath/main0107.xhp @@ -38,6 +38,6 @@ - + diff --git a/source/text/swriter/main0107.xhp b/source/text/swriter/main0107.xhp index ce5992d7c..d7c3c8f94 100644 --- a/source/text/swriter/main0107.xhp +++ b/source/text/swriter/main0107.xhp @@ -39,6 +39,6 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/02100300.xhp |2 +- source/text/shared/01/0503.xhp |2 +- source/text/shared/01/05030100.xhp |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 1712bf37a7a3773bb316a531ac930830d087dc1e Author: Johnny_M AuthorDate: Sat Oct 31 18:09:31 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:31:53 2020 +0100 tdf#132643 Translate German section IDs Change-Id: I58252207ed8546d21e294ce7b795e42017a35ed0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105118 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/02100300.xhp b/source/text/shared/01/02100300.xhp index 7ff733d87..7e49b799d 100644 --- a/source/text/shared/01/02100300.xhp +++ b/source/text/shared/01/02100300.xhp @@ -37,7 +37,7 @@ Use the Text Format (Search) or the Text Format (Replace) to define your formatting search criteria. These dialogs contain the following tab pages: - + diff --git a/source/text/shared/01/0503.xhp b/source/text/shared/01/0503.xhp index 99ef847a9..e76f64a33 100644 --- a/source/text/shared/01/0503.xhp +++ b/source/text/shared/01/0503.xhp @@ -37,7 +37,7 @@ The paragraph style for the current paragraph is displayed at the Formatting toolbar, and is highlighted in the Styles window. UFI: changed name of bar - + diff --git a/source/text/shared/01/05030100.xhp b/source/text/shared/01/05030100.xhp index 54c079fa8..46e212ea6 100644 --- a/source/text/shared/01/05030100.xhp +++ b/source/text/shared/01/05030100.xhp @@ -25,7 +25,7 @@ - + spacing; between paragraphs in footnotes line spacing; paragraph spacing; lines and paragraphs ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b6580af0f2903c2f2d00b805c36b2b0442cb7ff4 Author: Johnny_M AuthorDate: Mon Nov 9 10:31:53 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:31:53 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 1712bf37a7a3773bb316a531ac930830d087dc1e - tdf#132643 Translate German section IDs Change-Id: I58252207ed8546d21e294ce7b795e42017a35ed0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105118 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 2b15a169f450..1712bf37a7a3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2b15a169f450f4293f4274857eb3506d7e6b13be +Subproject commit 1712bf37a7a3773bb316a531ac930830d087dc1e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0511.xhp |2 +- source/text/shared/01/05110500.xhp |2 +- source/text/shared/01/0521.xhp |2 +- source/text/shared/01/05210600.xhp |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit dde4bccaed7353a3fcd0d09068af667c0f77ccf0 Author: Johnny_M AuthorDate: Sat Oct 31 18:12:38 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:33:03 2020 +0100 tdf#132643 Translate German section IDs Change-Id: I15524191afa3da29d2cc2c0361200e75940853ab Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105119 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0511.xhp b/source/text/shared/01/0511.xhp index 4545bf44e..72daef3cf 100644 --- a/source/text/shared/01/0511.xhp +++ b/source/text/shared/01/0511.xhp @@ -47,7 +47,7 @@ - + diff --git a/source/text/shared/01/05110500.xhp b/source/text/shared/01/05110500.xhp index 06fec8cfa..1d58b4bb8 100644 --- a/source/text/shared/01/05110500.xhp +++ b/source/text/shared/01/05110500.xhp @@ -32,7 +32,7 @@ - + text; shadowed characters; shadowed shadows;characters, using context menu diff --git a/source/text/shared/01/0521.xhp b/source/text/shared/01/0521.xhp index 7e0d60a70..ab44fffee 100644 --- a/source/text/shared/01/0521.xhp +++ b/source/text/shared/01/0521.xhp @@ -43,7 +43,7 @@ - + diff --git a/source/text/shared/01/05210600.xhp b/source/text/shared/01/05210600.xhp index 0a0c4fb68..56e864369 100644 --- a/source/text/shared/01/05210600.xhp +++ b/source/text/shared/01/05210600.xhp @@ -27,7 +27,7 @@ - + areas; shadows shadows; areas ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 450974ad8bb8215615f3a4caedd6e9e8a1e7f557 Author: Johnny_M AuthorDate: Mon Nov 9 10:33:03 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:33:03 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to dde4bccaed7353a3fcd0d09068af667c0f77ccf0 - tdf#132643 Translate German section IDs Change-Id: I15524191afa3da29d2cc2c0361200e75940853ab Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105119 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 1712bf37a7a3..dde4bccaed73 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1712bf37a7a3773bb316a531ac930830d087dc1e +Subproject commit dde4bccaed7353a3fcd0d09068af667c0f77ccf0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05210100.xhp |2 +- source/text/shared/01/05210500.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ba38169fc109e528cd79601b7d056434d33f42f9 Author: Johnny_M AuthorDate: Sat Oct 31 18:14:49 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:33:53 2020 +0100 tdf#132643 Translate German section IDs Change-Id: Ib8524c5aab3523d458447d1ba59fb61da6583569 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105120 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/05210100.xhp b/source/text/shared/01/05210100.xhp index de89282e7..f91dc5395 100644 --- a/source/text/shared/01/05210100.xhp +++ b/source/text/shared/01/05210100.xhp @@ -64,7 +64,7 @@ Fills the object with a gradient selected on this page. - + diff --git a/source/text/shared/01/05210500.xhp b/source/text/shared/01/05210500.xhp index 112da20f8..3a87c4f0d 100644 --- a/source/text/shared/01/05210500.xhp +++ b/source/text/shared/01/05210500.xhp @@ -27,7 +27,7 @@ - + bitmaps; areas areas; bitmap ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c02855b9f72696010fa6e4fdfc470ee9a5f0f6a2 Author: Johnny_M AuthorDate: Mon Nov 9 10:33:53 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:33:53 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ba38169fc109e528cd79601b7d056434d33f42f9 - tdf#132643 Translate German section IDs Change-Id: Ib8524c5aab3523d458447d1ba59fb61da6583569 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105120 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index dde4bccaed73..ba38169fc109 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit dde4bccaed7353a3fcd0d09068af667c0f77ccf0 +Subproject commit ba38169fc109e528cd79601b7d056434d33f42f9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 70785f725233c87c914026e4478b97c423fa1095 Author: Johnny_M AuthorDate: Mon Nov 9 10:35:14 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:35:14 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to d5ff3464a9295bdf5cf5ec4f6f786463ebbe964e - tdf#132643 Translate German section IDs Change-Id: I459b5c5aba3512e041bad577b3a578cfb3a711a3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105121 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ba38169fc109..d5ff3464a929 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ba38169fc109e528cd79601b7d056434d33f42f9 +Subproject commit d5ff3464a9295bdf5cf5ec4f6f786463ebbe964e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - wizards/source
wizards/source/access2base/access2base.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4a6ca8920afc0bbb8e36869416745d5b0163313c
Author: Caolán McNamara
AuthorDate: Wed Nov 4 09:28:02 2020 +
Commit: Jean-Pierre Ledure
CommitDate: Mon Nov 9 10:35:11 2020 +0100
copy_paste_error data1 looks like a copy-paste error
Change-Id: I937743f8d1789c68ed960c6a5aede0508dfa7bcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105282
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 1aa5e450f065bfdae8c354344f23b897f48a166f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105457
Tested-by: Jean-Pierre Ledure
Reviewed-by: Jean-Pierre Ledure
diff --git a/wizards/source/access2base/access2base.py
b/wizards/source/access2base/access2base.py
index e84b95983820..d68cd87aaec0 100644
--- a/wizards/source/access2base/access2base.py
+++ b/wizards/source/access2base/access2base.py
@@ -900,7 +900,7 @@ class Basic(object, metaclass = _Singleton):
@classmethod
def DateDiff(cls, add, date1, date2, weekstart = 1, yearstart = 1):
if isinstance(date1, datetime.datetime): date1 = date1.isoformat()
-if isinstance(date2, datetime.datetime): date2 = date1.isoformat()
+if isinstance(date2, datetime.datetime): date2 = date2.isoformat()
return cls.M('PyDateDiff', _WRAPPERMODULE, add, date1, date2,
weekstart, yearstart)
@classmethod
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0401.xhp |2 +- source/text/shared/01/01010200.xhp |2 +- source/text/shared/01/01010203.xhp |2 +- source/text/shared/01/01010300.xhp |2 +- source/text/shared/01/0114.xhp |2 +- source/text/swriter/01/0407.xhp |2 +- source/text/swriter/01/04070300.xhp |2 +- 7 files changed, 7 insertions(+), 7 deletions(-) New commits: commit d5ff3464a9295bdf5cf5ec4f6f786463ebbe964e Author: Johnny_M AuthorDate: Sat Oct 31 18:19:25 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:35:14 2020 +0100 tdf#132643 Translate German section IDs Change-Id: I459b5c5aba3512e041bad577b3a578cfb3a711a3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105121 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0401.xhp b/source/text/shared/00/0401.xhp index 07ba7f9d5..7a882a17d 100644 --- a/source/text/shared/00/0401.xhp +++ b/source/text/shared/00/0401.xhp @@ -216,7 +216,7 @@ - + Choose File - Printer Settings. Menu File - Send. diff --git a/source/text/shared/01/01010200.xhp b/source/text/shared/01/01010200.xhp index 00a58f177..460914a6e 100644 --- a/source/text/shared/01/01010200.xhp +++ b/source/text/shared/01/01010200.xhp @@ -39,7 +39,7 @@ - + New Document Creates a new document for editing. diff --git a/source/text/shared/01/01010203.xhp b/source/text/shared/01/01010203.xhp index bb68150f2..da3df738a 100644 --- a/source/text/shared/01/01010203.xhp +++ b/source/text/shared/01/01010203.xhp @@ -28,7 +28,7 @@ - + Options diff --git a/source/text/shared/01/01010300.xhp b/source/text/shared/01/01010300.xhp index 02870cd04..a25456ed5 100644 --- a/source/text/shared/01/01010300.xhp +++ b/source/text/shared/01/01010300.xhp @@ -41,7 +41,7 @@ - + diff --git a/source/text/shared/01/0114.xhp b/source/text/shared/01/0114.xhp index 99d1895d9..73eab3b5b 100644 --- a/source/text/shared/01/0114.xhp +++ b/source/text/shared/01/0114.xhp @@ -41,7 +41,7 @@ Select the default printer for the current document. - + You might experience a slight delay when you change the default printer for a document that contains embedded $[officename] OLE objects. Printer diff --git a/source/text/swriter/01/0407.xhp b/source/text/swriter/01/0407.xhp index a8919ba7e..c98c32d7b 100644 --- a/source/text/swriter/01/0407.xhp +++ b/source/text/swriter/01/0407.xhp @@ -40,7 +40,7 @@ - + New doc. Creates a new document and inserts the envelope. diff --git a/source/text/swriter/01/04070300.xhp b/source/text/swriter/01/04070300.xhp index 67d0836ef..dbc3e3124 100644 --- a/source/text/swriter/01/04070300.xhp +++ b/source/text/swriter/01/04070300.xhp @@ -30,7 +30,7 @@ - + Printer ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 362826589ff21319e9477aca69056aaa13744ce9 Author: Johnny_M AuthorDate: Mon Nov 9 10:36:22 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 9 10:36:22 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to af183028b1e33e59b936159b47ad4531fb8dcf2e - tdf#132643 Translate German section IDs Change-Id: I11a669088a038d1ee9cb1107b267343703fb9ecd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105122 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d5ff3464a929..af183028b1e3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d5ff3464a9295bdf5cf5ec4f6f786463ebbe964e +Subproject commit af183028b1e33e59b936159b47ad4531fb8dcf2e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sdraw/main_edit.xhp |2 +- source/text/shared/00/0010.xhp |2 +- source/text/shared/00/edit_menu.xhp |2 +- source/text/shared/01/0205.xhp |2 -- source/text/shared/main0201.xhp |4 ++-- source/text/smath/main0102.xhp |2 +- 6 files changed, 6 insertions(+), 8 deletions(-) New commits: commit af183028b1e33e59b936159b47ad4531fb8dcf2e Author: Johnny_M AuthorDate: Sat Oct 31 18:23:22 2020 +0100 Commit: Olivier Hallot CommitDate: Mon Nov 9 10:36:22 2020 +0100 tdf#132643 Translate German section IDs Change-Id: I11a669088a038d1ee9cb1107b267343703fb9ecd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105122 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdraw/main_edit.xhp b/source/text/sdraw/main_edit.xhp index 45a5216e4..97b5d86f7 100644 --- a/source/text/sdraw/main_edit.xhp +++ b/source/text/sdraw/main_edit.xhp @@ -33,7 +33,7 @@ - + diff --git a/source/text/shared/00/0010.xhp b/source/text/shared/00/0010.xhp index aa0891a3a..22824ddc8 100644 --- a/source/text/shared/00/0010.xhp +++ b/source/text/shared/00/0010.xhp @@ -45,7 +45,7 @@ Background Inserts the selected picture as a background graphic. Use the submenu commands Page or Paragraph to define whether the graphic should cover the entire page or only the current paragraph. - + Copy Copies the selected element to the clipboard. diff --git a/source/text/shared/00/edit_menu.xhp b/source/text/shared/00/edit_menu.xhp index eba2b1b08..beca4b580 100644 --- a/source/text/shared/00/edit_menu.xhp +++ b/source/text/shared/00/edit_menu.xhp @@ -87,7 +87,7 @@ Choose Edit - Copy. CommandCtrl+C On the Standard bar, click - + diff --git a/source/text/shared/01/0205.xhp b/source/text/shared/01/0205.xhp index 670738e9d..da25d06a1 100644 --- a/source/text/shared/01/0205.xhp +++ b/source/text/shared/01/0205.xhp @@ -29,7 +29,6 @@ - clipboard; Unix copying; in Unix @@ -37,7 +36,6 @@ Copy Copies the selection to the clipboard. - Each time you copy, the existing content of the clipboard is overwritten. diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp index 0d074e2a6..32d79e154 100644 --- a/source/text/shared/main0201.xhp +++ b/source/text/shared/main0201.xhp @@ -63,8 +63,8 @@ - - + + diff --git a/source/text/smath/main0102.xhp b/source/text/smath/main0102.xhp index bdc2e3b6e..41822b037 100644 --- a/source/text/smath/main0102.xhp +++ b/source/text/smath/main0102.xhp @@ -42,7 +42,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/inc xmloff/source
xmloff/inc/txtfldi.hxx | 122 +- xmloff/inc/txtvfldi.hxx | 24 -- xmloff/source/text/txtfldi.cxx | 452 +--- xmloff/source/text/txtvfldi.cxx | 129 +-- 4 files changed, 380 insertions(+), 347 deletions(-) New commits: commit 75b55ec26586b80aa851a9491e93a9e13eb012fc Author: Noel AuthorDate: Thu Nov 5 15:16:55 2020 +0200 Commit: Noel Grandin CommitDate: Mon Nov 9 11:23:26 2020 +0100 StartElement->startFastElement in text fields Change-Id: I455599516814866ecd076d5d56e8682956f93004 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105370 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 34d1a863d4c0..f19a34480c04 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -134,8 +134,9 @@ public: virtual void SAL_CALL characters( const OUString& sContent ) override; /// parses attributes and calls ProcessAttribute -virtual void StartElement( -const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override; +virtual void SAL_CALL startFastElement( +sal_Int32 nElement, +const css::uno::Reference & xAttrList) override; /// create XTextField and insert into document; calls PrepareTextField virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; @@ -159,7 +160,7 @@ protected: OUString const & GetContent(); /// process attribute values -virtual void ProcessAttribute( sal_uInt16 nAttrToken, +virtual void ProcessAttribute( sal_Int32 nAttrToken, const OUString& sAttrValue ) = 0; /// prepare XTextField for insertion into document @@ -187,7 +188,6 @@ class XMLSenderFieldImportContext : public XMLTextFieldImportContext protected: // variables for access in subclass bool bFixed; -sal_uInt16 nElementToken; /// token for this element field public: @@ -195,16 +195,16 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix -const OUString& sLocalName, /// element name w/o prefix -sal_uInt16 nToken); /// element token +const OUString& sLocalName); /// element name w/o prefix protected: /// start element -virtual void StartElement( -const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override; +virtual void SAL_CALL startFastElement( +sal_Int32 nElement, +const css::uno::Reference & xAttrList) override; /// process attribute values -virtual void ProcessAttribute( sal_uInt16 nAttrToken, +virtual void ProcessAttribute( sal_Int32 nAttrToken, const OUString& sAttrValue ) override; /// prepare XTextField for insertion into document @@ -225,16 +225,16 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix -const OUString& sLocalName, /// element name w/o prefix -sal_uInt16 nToken); /// element token +const OUString& sLocalName); /// element name w/o prefix private: /// start element -virtual void StartElement( -const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override; +virtual void SAL_CALL startFastElement( +sal_Int32 nElement, +const css::uno::Reference & xAttrList) override; /// process attribute values -virtual void ProcessAttribute( sal_uInt16 nAttrToken, +virtual void ProcessAttribute( sal_Int32 nAttrToken, const OUString& sAttrValue ) override; /// prepare XTextField for insertion into document @@ -260,7 +260,7 @@ public: private: /// process attribute values -virtual void ProcessAttribute( sal_uInt16 nAttrToken, +virtual void ProcessAttribute( sal_Int32 nAttrToken, const OUString& sAttrValue ) override; /// prepare XTextField for insertion into document @@ -297,7 +297,7 @@ public: const OUString& sLocalName); /// element name w/o prefix /// process attribute values -virtual void ProcessAttribute( sal_uInt16 nAttrToken, +virtual void ProcessAttribute( sal_Int32 nAttrToken, const OUString& sAttrValue ) override; /// prepare XTextField for insertion into document @@ -318,7 +318,7 @@ public: const OUString& sLocalName); /// element name w/o prefix /// process attribute values -virtual void ProcessAttribute( sal_uInt16 nAttrToken, +virtual void ProcessAttribute( sa
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx | 24 +
1 file changed, 24 insertions(+)
New commits:
commit a5f5a404caa813a1748df5d2372fb1659fcaf3a9
Author: Julien Nabet
AuthorDate: Sat Nov 7 16:09:31 2020 +0100
Commit: Michael Stahl
CommitDate: Mon Nov 9 12:00:39 2020 +0100
tdf#130596 FIREBIRD error in query input param when referred field is
SQL_LONG
In addition, deal too with:
- SQL_INT64
- SQL_FLOAT
- SQL_BOOLEAN
Change-Id: I542fbedcb01f1967a4d5d482cbb2edf7ed3bf757
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105434
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 344e26ace0a65c23cb1020b5907639fa9a67255e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105459
Reviewed-by: Michael Stahl
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index e86f8cf80982..e4510b758055 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -240,6 +240,30 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32
nParameterIndex,
setShort(nParameterIndex, int32Value);
break;
}
+case SQL_LONG:
+{
+sal_Int32 int32Value = sInput.toInt32();
+setInt(nParameterIndex, int32Value);
+break;
+}
+case SQL_INT64:
+{
+sal_Int64 int64Value = sInput.toInt64();
+setLong(nParameterIndex, int64Value);
+break;
+}
+case SQL_FLOAT:
+{
+float floatValue = sInput.toFloat();
+setFloat(nParameterIndex, floatValue);
+break;
+}
+case SQL_BOOLEAN:
+{
+bool boolValue = sInput.toBoolean();
+setBoolean(nParameterIndex, boolValue);
+break;
+}
default:
::dbtools::throwSQLException(
"Incorrect type for setString",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/icgm/actimpr.cxx |4 -
filter/source/graphicfilter/icgm/bundles.cxx | 105 ++-
filter/source/graphicfilter/icgm/bundles.hxx | 26 ++
3 files changed, 38 insertions(+), 97 deletions(-)
New commits:
commit e5a14bf90bad0696478bbc1504680aae1af7c2e2
Author: Caolán McNamara
AuthorDate: Mon Nov 9 09:35:25 2020 +
Commit: Caolán McNamara
CommitDate: Mon Nov 9 12:00:49 2020 +0100
ofz#26973 shave some time off timeout
36s -> 23s
Change-Id: I28451aa17cc724910f93fe53ee1247044a7c2f5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105474
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx
b/filter/source/graphicfilter/icgm/actimpr.cxx
index 728c74b44c03..48a71609519e 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -363,7 +363,9 @@ void CGMImpressOutAct::ImplSetTextBundle( const
uno::Reference< beans::XProperty
if ( pFontEntry )
{
nFontType = pFontEntry->nFontType;
-aFontDescriptor.Name = OUString::createFromAscii(
reinterpret_cast(pFontEntry->pFontName.get()) );
+aFontDescriptor.Name =
OUString(reinterpret_cast(pFontEntry->aFontName.data()),
+pFontEntry->aFontName.size(),
+RTL_TEXTENCODING_ASCII_US);
}
aFontDescriptor.Height = sal_Int16( mpCGM->pElement->nCharacterHeight *
1.50 );
if ( nFontType & 1 )
diff --git a/filter/source/graphicfilter/icgm/bundles.cxx
b/filter/source/graphicfilter/icgm/bundles.cxx
index 357901ad1048..89ce93e31bcf 100644
--- a/filter/source/graphicfilter/icgm/bundles.cxx
+++ b/filter/source/graphicfilter/icgm/bundles.cxx
@@ -28,67 +28,20 @@ void Bundle::SetColor( sal_uInt32 nColor )
mnColor = nColor;
}
-FontEntry::FontEntry() :
-nFontType ( 0 )
+CGMFList::CGMFList()
+: nFontNameCount(0)
+, nCharSetCount(0)
{
}
-FontEntry::~FontEntry()
-{
-}
-
-CGMFList::CGMFList() :
-nFontNameCount ( 0 ),
-nCharSetCount ( 0 ),
-nFontsAvailable ( 0 )
-{
-aFontEntryList.clear();
-}
-
-CGMFList::~CGMFList()
-{
-ImplDeleteList();
-}
-
-CGMFList& CGMFList::operator=( const CGMFList& rSource )
-{
-if (this != &rSource)
-{
-ImplDeleteList();
-nFontsAvailable = rSource.nFontsAvailable;
-nFontNameCount = rSource.nFontNameCount;
-nCharSetCount = rSource.nCharSetCount;
-for (auto const & pPtr : rSource.aFontEntryList)
-{
-std::unique_ptr pCFontEntry(new FontEntry);
-if ( pPtr->pFontName )
-{
-sal_uInt32 nSize = strlen(
reinterpret_cast(pPtr->pFontName.get()) ) + 1;
-pCFontEntry->pFontName.reset( new sal_Int8[ nSize ] );
-memcpy( pCFontEntry->pFontName.get(), pPtr->pFontName.get(),
nSize );
-}
-if ( pPtr->pCharSetValue )
-{
-sal_uInt32 nSize = strlen(
reinterpret_cast(pPtr->pCharSetValue.get()) ) + 1;
-pCFontEntry->pCharSetValue.reset( new sal_Int8[ nSize ] );
-memcpy( pCFontEntry->pCharSetValue.get(),
pPtr->pCharSetValue.get(), nSize );
-}
-pCFontEntry->nFontType = pPtr->nFontType;
-aFontEntryList.push_back( std::move(pCFontEntry) );
-}
-}
-return *this;
-}
-
FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex )
{
sal_uInt32 nInd = nIndex;
if ( nInd )
nInd--;
-return ( nInd < aFontEntryList.size() ) ? aFontEntryList[ nInd ].get() :
nullptr;
+return ( nInd < aFontEntryList.size() ) ? &aFontEntryList[nInd] : nullptr;
}
-
static sal_Int8* ImplSearchEntry( sal_Int8* pSource, sal_Int8 const * pDest,
sal_uInt32 nComp, sal_uInt32 nSize )
{
while ( nComp-- >= nSize )
@@ -109,24 +62,26 @@ static sal_Int8* ImplSearchEntry( sal_Int8* pSource,
sal_Int8 const * pDest, sal
void CGMFList::InsertName( sal_uInt8 const * pSource, sal_uInt32 nSize )
{
FontEntry* pFontEntry;
-if ( nFontsAvailable == nFontNameCount )
+if (nFontNameCount == aFontEntryList.size())
{
-nFontsAvailable++;
-pFontEntry = new FontEntry;
-aFontEntryList.push_back( std::unique_ptr(pFontEntry) );
+aFontEntryList.push_back(FontEntry());
+pFontEntry = &aFontEntryList.back();
}
else
{
-pFontEntry = aFontEntryList[ nFontNameCount ].get();
+pFontEntry = &aFontEntryList[nFontNameCount];
}
nFontNameCount++;
-std::unique_ptr pBuf(new sal_Int8[ nSize ]);
-memcpy( pBuf.get(), pSource, nSize );
-sal_Int8* pFound = ImplSearchEntry( pBuf.get(), reinterpret_cast("ITALIC"), nSize, 6 );
-if ( pFound )
+
+if (nSize == 0)
+return;
+
+std::vector aBuf(pSource, pSource + nSize);
+sal_Int8* pFound = ImplSear
[Libreoffice-commits] core.git: 2 commits - configure.ac reportdesign/inc
configure.ac|2 +- reportdesign/inc/RptDef.hxx |5 + 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 6e7d4c1185a9a70ea795b6959fbd87ac8e84480c Author: Henry Castro AuthorDate: Fri Nov 6 07:50:27 2020 -0400 Commit: Henry Castro CommitDate: Mon Nov 9 12:03:33 2020 +0100 lok:configure: replace obsolete configuration links The "AC_LINK_FILES" is replaced by "AC_CONFIG_LINKS" Change-Id: I9c82d3f54cf78f08489453389d4e5070529a4f69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105423 Tested-by: Jenkins Reviewed-by: Henry Castro diff --git a/configure.ac b/configure.ac index cd7af465d660..34d116db105e 100644 --- a/configure.ac +++ b/configure.ac @@ -14057,7 +14057,7 @@ CFLAGS=$my_original_CFLAGS CXXFLAGS=$my_original_CXXFLAGS CPPFLAGS=$my_original_CPPFLAGS -AC_LINK_FILES([include], [include]) +AC_CONFIG_LINKS([include:include]) # Keep in sync with list of files far up, at AC_MSG_CHECKING([for # BUILD platform configuration] - otherwise breaks cross building commit 9a2d8d30ac2e525963c764794bd3d6bd3462f64b Author: shubham656 AuthorDate: Sat Nov 7 17:47:18 2020 +0530 Commit: Michael Stahl CommitDate: Mon Nov 9 12:03:24 2020 +0100 tdf#124176 Use pragma once instead of inclusive guards Change-Id: I1eafb1e903d44f52eac8a506e6123c0978f00394 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105431 Reviewed-by: Michael Stahl Tested-by: Jenkins diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index f2dd5952684a..91fff4ae2342 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX -#define INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX +#pragma once #include #include @@ -88,6 +87,4 @@ template < typename T> T getStyleProperty(const css::uno::Reference< css::report } -#endif // INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d28e83bbf0f3dc1c7ddf63d04a2a9b65279bae45 Author: Henry Castro AuthorDate: Fri Nov 6 07:50:27 2020 -0400 Commit: Henry Castro CommitDate: Mon Nov 9 12:04:51 2020 +0100 lok:configure: replace obsolete configuration links The "AC_LINK_FILES" is replaced by "AC_CONFIG_LINKS" Change-Id: I9c82d3f54cf78f08489453389d4e5070529a4f69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105404 Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/configure.ac b/configure.ac index cd83fc5b111b..22b0905e9ca4 100644 --- a/configure.ac +++ b/configure.ac @@ -12980,7 +12980,7 @@ CFLAGS=$my_original_CFLAGS CXXFLAGS=$my_original_CXXFLAGS CPPFLAGS=$my_original_CPPFLAGS -AC_LINK_FILES([include], [include]) +AC_CONFIG_LINKS([include:include]) AC_CONFIG_FILES([config_host.mk config_host_lang.mk Makefile ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 41a3d6ee341d1d0c16d5548a687b73cb8cbf16b8 Author: Henry Castro AuthorDate: Fri Nov 6 07:50:27 2020 -0400 Commit: Henry Castro CommitDate: Mon Nov 9 12:23:32 2020 +0100 lok:configure: replace obsolete configuration links The "AC_LINK_FILES" is replaced by "AC_CONFIG_LINKS" Change-Id: I9c82d3f54cf78f08489453389d4e5070529a4f69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105421 Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/configure.ac b/configure.ac index 66b2d930a3ac..c079302a6df2 100644 --- a/configure.ac +++ b/configure.ac @@ -12980,7 +12980,7 @@ CFLAGS=$my_original_CFLAGS CXXFLAGS=$my_original_CXXFLAGS CPPFLAGS=$my_original_CPPFLAGS -AC_LINK_FILES([include], [include]) +AC_CONFIG_LINKS([include:include]) AC_CONFIG_FILES([config_host.mk config_host_lang.mk Makefile ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/qa
sd/qa/uitest/impress_tests/tdf91762.py | 36 +
1 file changed, 36 insertions(+)
New commits:
commit e259c659c4d3e27524c1aa76d61c7e4735e764c7
Author: Xisco Fauli
AuthorDate: Tue Nov 3 12:44:29 2020 +0100
Commit: Xisco Fauli
CommitDate: Mon Nov 9 12:30:51 2020 +0100
tdf#91762: sd: Add UItest
Change-Id: Ia3c75206a5207a95162970ac6607be96dac9fcb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105243
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit cd142f2ab2e165b13c5ab14728b70bdd40d8517a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105460
diff --git a/sd/qa/uitest/impress_tests/tdf91762.py
b/sd/qa/uitest/impress_tests/tdf91762.py
new file mode 100644
index ..36ac3566ee10
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/tdf91762.py
@@ -0,0 +1,36 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+
+class tdf91762(UITestCase):
+
+ def test_tdf91762(self):
+self.ui_test.create_doc_in_start_center("impress")
+xTemplateDlg = self.xUITest.getTopFocusWindow()
+xCancelBtn = xTemplateDlg.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+self.xUITest.executeCommand(".uno:AssignLayout?WhatLayout:long=1")
+
+self.ui_test.execute_dialog_through_command(".uno:InsertTable")
+xDialog = self.xUITest.getTopFocusWindow()
+self.assertEqual('5',
get_state_as_dict(xDialog.getChild('columns'))['Text'])
+self.assertEqual('2',
get_state_as_dict(xDialog.getChild('rows'))['Text'])
+xOkBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkBtn)
+
+document = self.ui_test.get_component()
+self.assertEqual(25198, document.DrawPages[0].getByIndex(1).Size.Width)
+self.assertEqual(1923, document.DrawPages[0].getByIndex(1).Size.Height)
+
+self.assertEqual(1400, document.DrawPages[0].getByIndex(1).Position.X)
+self.assertEqual(3685, document.DrawPages[0].getByIndex(1).Position.Y)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa svx/source
sd/qa/uitest/impress_tests/tdf91762.py |3 +--
sd/qa/unit/data/pptx/tablescale.pptx |binary
sd/qa/unit/import-tests.cxx| 20 +++-
svx/source/table/tablelayouter.cxx | 26 --
4 files changed, 44 insertions(+), 5 deletions(-)
New commits:
commit b7b05dd36403af50b20fe06cbf8a10d8defb28a9
Author: Gülşah Köse
AuthorDate: Fri Nov 6 21:18:24 2020 +0300
Commit: Gülşah Köse
CommitDate: Mon Nov 9 12:36:07 2020 +0100
tdf#137949 Fix table row heigths.
Consider "Height" property of the the table while calculating
the minimum row height.
Change-Id: I4dbb0f7f87517423fd3075515b4b9817d6a9a71a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105422
Tested-by: Jenkins
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
Reviewed-by: Gülşah Köse
diff --git a/sd/qa/uitest/impress_tests/tdf91762.py
b/sd/qa/uitest/impress_tests/tdf91762.py
index 66e650b0bb2a..3c52b4ff9cf9 100644
--- a/sd/qa/uitest/impress_tests/tdf91762.py
+++ b/sd/qa/uitest/impress_tests/tdf91762.py
@@ -41,8 +41,7 @@ class tdf91762(UITestCase):
xEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"RETURN"}))
# tdf#138011: Without the fix in place, this test would have failed
with
-# AssertionError: 5504 != 3559
-self.assertEqual(5504,
document.DrawPages[0].getByIndex(1).BoundRect.Height)
+self.assertEqual(5494,
document.DrawPages[0].getByIndex(1).BoundRect.Height)
self.ui_test.close_doc()
diff --git a/sd/qa/unit/data/pptx/tablescale.pptx
b/sd/qa/unit/data/pptx/tablescale.pptx
new file mode 100644
index ..c4d946e5c619
Binary files /dev/null and b/sd/qa/unit/data/pptx/tablescale.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 11cbbb4f98b7..6e6b08d2bad2 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -1482,9 +1482,27 @@ void SdImportTest::testRowHeight()
uno::Reference< css::table::XTableRows > xRows( xTable->getRows(),
uno::UNO_SET_THROW);
uno::Reference< beans::XPropertySet > xRefRow( xRows->getByIndex(0),
uno::UNO_QUERY_THROW );
xRefRow->getPropertyValue( "Height" ) >>= nHeight;
-CPPUNIT_ASSERT_EQUAL( sal_Int32(507), nHeight);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(508), nHeight);
xDocShRef->DoClose();
+
+sd::DrawDocShellRef xDocShRef2 = loadURL(
m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tablescale.pptx"), PPTX );
+const SdrPage *pPage2 = GetPage( 1, xDocShRef2 );
+
+sdr::table::SdrTableObj *pTableObj2 =
dynamic_cast(pPage2->GetObj(0));
+CPPUNIT_ASSERT( pTableObj2 );
+
+uno::Reference< css::table::XTable > xTable2(pTableObj2->getTable(),
uno::UNO_SET_THROW);
+uno::Reference< css::table::XTableRows > xRows2( xTable2->getRows(),
uno::UNO_SET_THROW);
+
+for(sal_Int32 nRow = 0; nRow < 7; ++nRow)
+{
+uno::Reference< beans::XPropertySet > xRefRow2(
xRows2->getByIndex(nRow), uno::UNO_QUERY_THROW );
+xRefRow2->getPropertyValue( "Height" ) >>= nHeight;
+CPPUNIT_ASSERT_EQUAL( sal_Int32(800), nHeight);
+}
+
+xDocShRef2->DoClose();
}
void SdImportTest::testTdf93830()
diff --git a/svx/source/table/tablelayouter.cxx
b/svx/source/table/tablelayouter.cxx
index 1c369e6d08b4..6859d0a2eee8 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -725,6 +725,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle&
rArea, bool bFit )
{
const sal_Int32 nColCount = getColumnCount();
const sal_Int32 nRowCount = getRowCount();
+
if( nRowCount == 0 )
return;
@@ -741,10 +742,14 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle&
rArea, bool bFit )
sal_Int32 nCol, nRow;
for( nRow = 0; nRow < nRowCount; ++nRow )
{
+Reference< XPropertySet > xRowSet( xRows->getByIndex(nRow),
UNO_QUERY_THROW );
+sal_Int32 nRowPropHeight = 0;
+xRowSet->getPropertyValue( gsSize ) >>= nRowPropHeight;
sal_Int32 nMinHeight = 0;
bool bIsEmpty = true; // check if all cells in this row are merged
bool bRowHasText = false;
+bool bRowHasCellInEditMode = false;
for( nCol = 0; nCol < nColCount; ++nCol )
{
@@ -762,7 +767,12 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle&
rArea, bool bFit )
else
{
bool bCellHasText = xCell->hasText();
-if (bRowHasText == bCellHasText)
+bool bCellInEditMode = xCell->IsTextEditActive();
+
+if (!bRowHasCellInEditMode && bCellInEditMode)
+bRowHasCellInEditMode = true;
+
+if ((bRowHasText == bCellHasText) || (bRowHasText &&
bCellInEditMode))
{
nMinHeight = std::max( nMinHeight,
xCell->getMinimumHeight() );
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/core/xmlimp.cxx |1
xmloff/source/text/txtparai.cxx | 98
2 files changed, 42 insertions(+), 57 deletions(-)
New commits:
commit cf0673db88e65564b88424a10ecddbff3d627b50
Author: Noel
AuthorDate: Thu Nov 5 14:35:48 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Nov 9 13:36:57 2020 +0100
StartElement->startFastElement in XMLMetaFieldImportContext
Needed to register the implicit XML namespace in
SvXMLImport::initializeNamespaceMaps
as is done in the equivalent for the slow-parser path at
SvXMLImport::InitCtor_
Change-Id: Ib7fc2c7a77400b7688be7b2f98564b5d3096d3c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105369
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 71060b42f648..c47ad94ceffa 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -2059,6 +2059,7 @@ void SvXMLImport::initializeNamespaceMaps()
}
};
+mapTokenToNamespace( XML_NAMESPACE_XML, XML_XML,
XML_N_XML ); // implicit "xml" namespace prefix
mapTokenToNamespace( XML_NAMESPACE_OFFICE, XML_NP_OFFICE,
XML_N_OFFICE );
mapTokenToNamespace( XML_NAMESPACE_OFFICE_SO52, XML_NP_OFFICE,
XML_N_OFFICE_OLD );
mapTokenToNamespace( XML_NAMESPACE_OFFICE_OOO, XML_NP_OFFICE,
XML_N_OFFICE_OOO );
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 006e3ded38c9..7546d4b40eb2 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -767,8 +767,9 @@ public:
XMLHints_Impl& i_rHints,
bool & i_rIgnoreLeadingSpace );
-virtual void StartElement(
-const Reference & i_xAttrList) override;
+virtual void SAL_CALL startFastElement(
+sal_Int32 nElement,
+const Reference & i_xAttrList)
override;
virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
@@ -778,8 +779,7 @@ public:
virtual void SAL_CALL characters( const OUString& i_rChars ) override;
-virtual void ProcessAttribute(sal_uInt16 const i_nPrefix,
-OUString const & i_rLocalName, OUString const & i_rValue);
+virtual void ProcessAttribute(sal_Int32 nAttributeToken, OUString const &
i_rValue);
virtual void InsertMeta(const Reference & i_xInsertionRange)
= 0;
@@ -800,21 +800,12 @@ XMLMetaImportContextBase::XMLMetaImportContextBase(
{
}
-void XMLMetaImportContextBase::StartElement(
-const Reference & i_xAttrList)
+void XMLMetaImportContextBase::startFastElement(
+sal_Int32 /*nElement*/,
+const Reference & xAttrList)
{
-const sal_Int16 nAttrCount(i_xAttrList.is() ? i_xAttrList->getLength() :
0);
-for ( sal_Int16 i = 0; i < nAttrCount; ++i )
-{
-const OUString& rAttrName( i_xAttrList->getNameByIndex( i ) );
-const OUString& rValue( i_xAttrList->getValueByIndex( i ) );
-
-OUString sLocalName;
-const sal_uInt16 nPrefix(
-GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
-&sLocalName ));
-ProcessAttribute(nPrefix, sLocalName, rValue);
-}
+for (auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ))
+ProcessAttribute(aIter.getToken(), aIter.toString());
}
void XMLMetaImportContextBase::endFastElement(sal_Int32 )
@@ -851,13 +842,13 @@ void XMLMetaImportContextBase::characters( const
OUString& i_rChars )
GetImport().GetTextImport()->InsertString(i_rChars, m_rIgnoreLeadingSpace);
}
-void XMLMetaImportContextBase::ProcessAttribute(sal_uInt16 const i_nPrefix,
-OUString const & i_rLocalName, OUString const & i_rValue)
+void XMLMetaImportContextBase::ProcessAttribute(sal_Int32 nAttributeToken,
+OUString const & i_rValue)
{
-if ( (XML_NAMESPACE_XML == i_nPrefix) && IsXMLToken(i_rLocalName, XML_ID) )
-{
+if ( nAttributeToken == XML_ELEMENT(XML, XML_ID) )
m_XmlId = i_rValue;
-}
+else
+XMLOFF_WARN_UNKNOWN_ATTR("xmloff", nAttributeToken, i_rValue);
}
namespace {
@@ -881,8 +872,8 @@ public:
XMLHints_Impl& i_rHints,
bool & i_rIgnoreLeadingSpace );
-virtual void ProcessAttribute(sal_uInt16 const i_nPrefix,
-OUString const & i_rLocalName, OUString const & i_rValue) override;
+virtual void ProcessAttribute(sal_Int32 nAttributeToken,
+OUString const & i_rValue) override;
virtual void InsertMeta(const Reference & i_xInsertionRange)
override;
};
@@ -901,34 +892,28 @@ XMLMetaImportContext::XMLMetaImportContext(
{
}
-void XMLMetaImportContext::ProcessAttribute(sal_uInt16 const i_nPrefix,
-OUString const & i_rLocalName, OUString const & i_rValue)
+void XMLMetaImportContext::ProcessA
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/qa
sd/qa/uitest/impress_tests/tdf91762.py | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 6dee385e10c859928e5d6406d002983529eff9f9
Author: Xisco Fauli
AuthorDate: Thu Nov 5 14:30:37 2020 +0100
Commit: Xisco Fauli
CommitDate: Mon Nov 9 14:05:39 2020 +0100
tdf#138011: sd: Add UItest
Change-Id: I121e8951807404c9aead36f199340a3b10031595
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105371
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit ac6df04b5c5a7c227fec3b8897c79be5e99cbe01)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105461
diff --git a/sd/qa/uitest/impress_tests/tdf91762.py
b/sd/qa/uitest/impress_tests/tdf91762.py
index 36ac3566ee10..66e650b0bb2a 100644
--- a/sd/qa/uitest/impress_tests/tdf91762.py
+++ b/sd/qa/uitest/impress_tests/tdf91762.py
@@ -6,6 +6,7 @@
from uitest.framework import UITestCase
from uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
class tdf91762(UITestCase):
@@ -25,12 +26,24 @@ class tdf91762(UITestCase):
self.ui_test.close_dialog_through_button(xOkBtn)
document = self.ui_test.get_component()
+self.assertEqual(1929,
document.DrawPages[0].getByIndex(1).BoundRect.Height)
self.assertEqual(25198, document.DrawPages[0].getByIndex(1).Size.Width)
self.assertEqual(1923, document.DrawPages[0].getByIndex(1).Size.Height)
self.assertEqual(1400, document.DrawPages[0].getByIndex(1).Position.X)
self.assertEqual(3685, document.DrawPages[0].getByIndex(1).Position.Y)
+#The table is selected, use esc to start editing
+xDoc = self.xUITest.getTopFocusWindow()
+xEdit = xDoc.getChild("impress_win")
+for i in range(5):
+xEdit.executeAction("TYPE", mkPropertyValues({"TEXT":"test"}))
+xEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"RETURN"}))
+
+# tdf#138011: Without the fix in place, this test would have failed
with
+# AssertionError: 5504 != 3559
+self.assertEqual(5504,
document.DrawPages[0].getByIndex(1).BoundRect.Height)
+
self.ui_test.close_doc()
# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/forms/formlayerimport.cxx |4 1 file changed, 4 insertions(+) New commits: commit 8ba9ecaaad1090dafa2e3040e03e532923fd38a4 Author: Mike Kaganski AuthorDate: Mon Nov 9 14:51:40 2020 +0300 Commit: Mike Kaganski CommitDate: Mon Nov 9 14:28:05 2020 +0100 Fix Windows build with --disable-pch [build CXX] xmloff/source/forms/formlayerimport.cxx C:\lo\src\core\include\cppu/unotype.hxx(296): error C2665: 'com::sun::star::beans::cppu_detail_getUnoType': none of the 28 overloads could convert all the argum ent types C:\lo\src\build\workdir\UnoApiHeadersTarget\udkapi\normal\com/sun/star/beans/XVetoableChangeListener.hpp(56): note: could be 'const com::sun::star::uno::Type &c om::sun::star::beans::cppu_detail_getUnoType(const com::sun::star::beans::XVetoableChangeListener *)' [found using argument-dependent lookup] C:\lo\src\build\workdir\UnoApiHeadersTarget\udkapi\normal\com/sun/star/beans/XPropertySetInfo.hpp(69): note: or 'const com::sun::star::uno::Type &com::sun ::star::beans::cppu_detail_getUnoType(const com::sun::star::beans::XPropertySetInfo *)' [found using argument-dependent lookup] C:\lo\src\build\workdir\UnoApiHeadersTarget\udkapi\normal\com/sun/star/beans/Property.hpp(81): note: or 'const com::sun::star::uno::Type &com::sun::star:: beans::cppu_detail_getUnoType(const com::sun::star::beans::Property *)' [found using argument-dependent lookup] C:\lo\src\build\workdir\UnoApiHeadersTarget\udkapi\normal\com/sun/star/beans/XPropertyChangeListener.hpp(55): note: or 'const com::sun::star::uno::Type &c om::sun::star::beans::cppu_detail_getUnoType(const com::sun::star::beans::XPropertyChangeListener *)' [found using argument-dependent lookup] C:\lo\src\build\workdir\UnoApiHeadersTarget\udkapi\normal\com/sun/star/beans/PropertyChangeEvent.hpp(92): note: or 'const com::sun::star::uno::Type &com:: sun::star::beans::cppu_detail_getUnoType(const com::sun::star::beans::PropertyChangeEvent *)' [found using argument-dependent lookup] C:\lo\src\build\workdir\UnoApiHeadersTarget\udkapi\normal\com/sun/star/beans/UnknownPropertyException.hpp(54): note: or 'const com::sun::star::uno::Type & com::sun::star::beans::cppu_detail_getUnoType(const com::sun::star::beans::UnknownPropertyException *)' [found using argument-dependent lookup] C:\lo\src\build\workdir\UnoApiHeadersTarget\udkapi\normal\com/sun/star/beans/PropertyVetoException.hpp(54): note: or 'const com::sun::star::uno::Type &com ::sun::star::beans::cppu_detail_getUnoType(const com::sun::star::beans::PropertyVetoException *)' [found using argument-dependent lookup] C:\lo\src\build\workdir\UnoApiHeadersTarget\udkapi\normal\com/sun/star/beans/XPropertySet.hpp(93): note: or 'const com::sun::star::uno::Type &com::sun::st ar::beans::cppu_detail_getUnoType(const com::sun::star::beans::XPropertySet *)' [found using argument-dependent lookup] C:\lo\src\core\include\cppu/unotype.hxx(249): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const com::sun::star::uno::X Interface *)' C:\lo\src\core\include\cppu/unotype.hxx(243): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const com::sun::star::uno::E xception *)' C:\lo\src\core\include\cppu/unotype.hxx(217): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const com::sun::star::uno::A ny *)' C:\lo\src\core\include\cppu/unotype.hxx(211): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const com::sun::star::uno::T ype *)' C:\lo\src\core\include\cppu/unotype.hxx(206): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const rtl::OUString *)' C:\lo\src\core\include\cppu/unotype.hxx(200): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const sal_Unicode *)' C:\lo\src\core\include\cppu/unotype.hxx(193): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const cppu::UnoCharType *)' C:\lo\src\core\include\cppu/unotype.hxx(188): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const double *)' C:\lo\src\core\include\cppu/unotype.hxx(183): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const float *)' C:\lo\src\core\include\cppu/unotype.hxx(177): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const sal_uInt64 *)' C:\lo\src\core\include\cppu/unotype.hxx(172): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const sal_Int64 *)' C:\lo\src\core\include\cppu/unotype.hxx(166): note: or 'const com::sun::star::uno::Type &cppu::detail::cppu_detail_getUnoType(const sal_u
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/qa svx/source
sd/qa/uitest/impress_tests/tdf91762.py |3 +--
sd/qa/unit/data/pptx/tablescale.pptx |binary
sd/qa/unit/import-tests.cxx| 20 +++-
svx/source/table/tablelayouter.cxx | 26 --
4 files changed, 44 insertions(+), 5 deletions(-)
New commits:
commit 5c37f0c0347d8cccda6fc6a2ca4dd28bb36823a9
Author: Gülşah Köse
AuthorDate: Fri Nov 6 21:18:24 2020 +0300
Commit: Xisco Fauli
CommitDate: Mon Nov 9 15:35:24 2020 +0100
tdf#137949 Fix table row heigths.
Consider "Height" property of the the table while calculating
the minimum row height.
Change-Id: I4dbb0f7f87517423fd3075515b4b9817d6a9a71a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105422
Tested-by: Jenkins
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
Reviewed-by: Gülşah Köse
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105480
diff --git a/sd/qa/uitest/impress_tests/tdf91762.py
b/sd/qa/uitest/impress_tests/tdf91762.py
index 66e650b0bb2a..3c52b4ff9cf9 100644
--- a/sd/qa/uitest/impress_tests/tdf91762.py
+++ b/sd/qa/uitest/impress_tests/tdf91762.py
@@ -41,8 +41,7 @@ class tdf91762(UITestCase):
xEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"RETURN"}))
# tdf#138011: Without the fix in place, this test would have failed
with
-# AssertionError: 5504 != 3559
-self.assertEqual(5504,
document.DrawPages[0].getByIndex(1).BoundRect.Height)
+self.assertEqual(5494,
document.DrawPages[0].getByIndex(1).BoundRect.Height)
self.ui_test.close_doc()
diff --git a/sd/qa/unit/data/pptx/tablescale.pptx
b/sd/qa/unit/data/pptx/tablescale.pptx
new file mode 100644
index ..c4d946e5c619
Binary files /dev/null and b/sd/qa/unit/data/pptx/tablescale.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index b285b490894b..5d6157aa4051 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -1484,9 +1484,27 @@ void SdImportTest::testRowHeight()
uno::Reference< css::table::XTableRows > xRows( xTable->getRows(),
uno::UNO_SET_THROW);
uno::Reference< beans::XPropertySet > xRefRow( xRows->getByIndex(0),
uno::UNO_QUERY_THROW );
xRefRow->getPropertyValue( sHeight ) >>= nHeight;
-CPPUNIT_ASSERT_EQUAL( sal_Int32(507), nHeight);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(508), nHeight);
xDocShRef->DoClose();
+
+sd::DrawDocShellRef xDocShRef2 = loadURL(
m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tablescale.pptx"), PPTX );
+const SdrPage *pPage2 = GetPage( 1, xDocShRef2 );
+
+sdr::table::SdrTableObj *pTableObj2 =
dynamic_cast(pPage2->GetObj(0));
+CPPUNIT_ASSERT( pTableObj2 );
+
+uno::Reference< css::table::XTable > xTable2(pTableObj2->getTable(),
uno::UNO_SET_THROW);
+uno::Reference< css::table::XTableRows > xRows2( xTable2->getRows(),
uno::UNO_SET_THROW);
+
+for(sal_Int32 nRow = 0; nRow < 7; ++nRow)
+{
+uno::Reference< beans::XPropertySet > xRefRow2(
xRows2->getByIndex(nRow), uno::UNO_QUERY_THROW );
+xRefRow2->getPropertyValue( "Height" ) >>= nHeight;
+CPPUNIT_ASSERT_EQUAL( sal_Int32(800), nHeight);
+}
+
+xDocShRef2->DoClose();
}
void SdImportTest::testTdf93830()
diff --git a/svx/source/table/tablelayouter.cxx
b/svx/source/table/tablelayouter.cxx
index b5dddef4ddd1..2d0fc0f22a3f 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -724,6 +724,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle&
rArea, bool bFit )
{
const sal_Int32 nColCount = getColumnCount();
const sal_Int32 nRowCount = getRowCount();
+
if( nRowCount == 0 )
return;
@@ -740,10 +741,14 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle&
rArea, bool bFit )
sal_Int32 nCol, nRow;
for( nRow = 0; nRow < nRowCount; ++nRow )
{
+Reference< XPropertySet > xRowSet( xRows->getByIndex(nRow),
UNO_QUERY_THROW );
+sal_Int32 nRowPropHeight = 0;
+xRowSet->getPropertyValue( gsSize ) >>= nRowPropHeight;
sal_Int32 nMinHeight = 0;
bool bIsEmpty = true; // check if all cells in this row are merged
bool bRowHasText = false;
+bool bRowHasCellInEditMode = false;
for( nCol = 0; nCol < nColCount; ++nCol )
{
@@ -761,7 +766,12 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle&
rArea, bool bFit )
else
{
bool bCellHasText = xCell->hasText();
-if (bRowHasText == bCellHasText)
+bool bCellInEditMode = xCell->IsTextEditActive();
+
+if (!bRowHasCellInEditMode && bCellInEditMode)
+bRowHasCellInEditMode = true;
+
+if ((bRowHasText == bCellHasText) || (bRowHasText &&
bCellInEditMode))
{
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit e1e662065c911e55aeb85a67664dea9d5ed12313
Author: Caolán McNamara
AuthorDate: Mon Nov 9 10:19:21 2020 +
Commit: Caolán McNamara
CommitDate: Mon Nov 9 15:36:32 2020 +0100
Resolves: tdf#137786 allow 'toggling' GtkToolButtons
even if they are not GtkToggleToolButtons
We already allow this for GtkMenuToolButton, we shouldn't need to allow
it for a GtkToolButton because a GtkToggleToolButton should be used. But
we have inconsistency where some of these 'align' features are
considered toggleable by some apps or modes within an app and not by
others.
So when this inconsistency arises reuse the pseudo-toggle support
for GtkMenuToolButton for GtkToolButton.
Change-Id: I78b625b206bf6187e36fc39f876d4828ada10a7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105476
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index cede2908dbc4..6a82aa32eae5 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -8449,8 +8449,9 @@ public:
GtkToolItem* pToolButton = m_aMap.find(rIdent)->second;
-assert(GTK_IS_TOGGLE_TOOL_BUTTON(pToolButton) ||
GTK_IS_MENU_TOOL_BUTTON(pToolButton) || !bActive);
-if (GTK_IS_MENU_TOOL_BUTTON(pToolButton))
+if (GTK_IS_TOGGLE_TOOL_BUTTON(pToolButton))
+
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(pToolButton), bActive);
+else
{
GtkButton* pButton = nullptr;
// there is no GtkMenuToggleToolButton so abuse the CHECKED state
of the GtkMenuToolButton button
@@ -8464,8 +8465,6 @@ public:
gtk_widget_set_state_flags(GTK_WIDGET(pButton),
static_cast(eState), true);
}
}
-else if (GTK_IS_TOGGLE_TOOL_BUTTON(pToolButton))
-
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(pToolButton), bActive);
enable_item_notify_events();
}
@@ -8474,8 +8473,9 @@ public:
{
GtkToolItem* pToolButton = m_aMap.find(rIdent)->second;
-assert(GTK_IS_TOGGLE_TOOL_BUTTON(pToolButton) ||
GTK_IS_MENU_TOOL_BUTTON(pToolButton));
-if (GTK_IS_MENU_TOOL_BUTTON(pToolButton))
+if (GTK_IS_TOGGLE_TOOL_BUTTON(pToolButton))
+return
gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(pToolButton));
+else
{
GtkButton* pButton = nullptr;
// there is no GtkMenuToggleToolButton so abuse the CHECKED state
of the GtkMenuToolButton button
@@ -8486,8 +8486,6 @@ public:
return gtk_widget_get_state_flags(GTK_WIDGET(pButton)) &
GTK_STATE_FLAG_CHECKED;
}
}
-else if (GTK_IS_TOGGLE_TOOL_BUTTON(pToolButton))
-return
gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(pToolButton));
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/IDocumentRedlineAccess.hxx |5 ++
sw/qa/extras/uiwriter/uiwriter.cxx|9 -
sw/source/core/doc/DocumentRedlineManager.cxx | 29
sw/source/core/edit/acorrect.cxx | 45 +++---
sw/source/core/inc/DocumentRedlineManager.hxx |5 ++
5 files changed, 53 insertions(+), 40 deletions(-)
New commits:
commit 2951c96bcb673a260a09e2c6eb92ca0f99bf0c18
Author: László Németh
AuthorDate: Mon Nov 9 11:36:57 2020 +0100
Commit: László Németh
CommitDate: Mon Nov 9 15:59:00 2020 +0100
tdf#83419 sw change tracking: clean-up autocorrect
fix of commit ac84cf7dda4a5150ff23e112ee16f00b8de8ec7c
(tdf#83419 sw change tracking: fix bad autocorrect).
Now automatic sentence capitalization and
correction of two initial capitals are allowed
again, if there is a tracked deletion in the same
paragraph before the modified word.
Change-Id: I8c583df2f14468b47079019009e7937f559b652b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105477
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/inc/IDocumentRedlineAccess.hxx
b/sw/inc/IDocumentRedlineAccess.hxx
index 395fae8d47e2..0e4c9e33fb52 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -170,6 +170,11 @@ public:
/*[in]*/const SwNode& rNode,
/*[in]*/RedlineType nType) const = 0;
+virtual bool HasRedline(
+/*[in]*/const SwPaM& rPam,
+/*[in]*/RedlineType nType,
+/*[in]*/bool bStartOrEndInRange) const = 0;
+
virtual void CompressRedlines() = 0;
virtual const SwRangeRedline* GetRedline(
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 2acfc17b7082..f1bb78af34cb 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -7652,11 +7652,18 @@ void SwUiWriterTest::testRedlineAutoCorrect()
nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(sReplaced,
static_cast(pDoc->GetNodes()[nIndex])->GetText());
+// Including capitalization
+pWrtShell->Insert("end. word");
+pWrtShell->AutoCorrect(corr, ' ');
+sReplaced = "tset test end. Word ";
+nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+CPPUNIT_ASSERT_EQUAL(sReplaced,
static_cast(pDoc->GetNodes()[nIndex])->GetText());
+
// tracked deletions after the correction point doesn't affect autocorrect
dispatchCommand(mxComponent, ".uno:GoToStartOfDoc", {});
pWrtShell->Insert("a");
pWrtShell->AutoCorrect(corr, ' ');
-sReplaced = "A tset test ";
+sReplaced = "A tset test end. Word ";
nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(sReplaced,
static_cast(pDoc->GetNodes()[nIndex])->GetText());
}
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 22893963b5b1..17419eda39ba 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -2523,6 +2523,35 @@ SwRedlineTable::size_type
DocumentRedlineManager::GetRedlinePos( const SwNode& r
// #TODO - add 'SwExtraRedlineTable' also ?
}
+bool DocumentRedlineManager::HasRedline( const SwPaM& rPam, RedlineType nType,
bool bStartOrEndInRange ) const // xxx
+{
+SwPosition currentStart(*rPam.Start());
+SwPosition currentEnd(*rPam.End());
+SwNodeIndex pEndNodeIndex(currentEnd.nNode.GetNode());
+
+for( SwRedlineTable::size_type n = GetRedlinePos(
rPam.Start()->nNode.GetNode(), nType );
+n < mpRedlineTable->size(); ++n )
+{
+const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
+
+if ( pTmp->Start()->nNode > pEndNodeIndex )
+break;
+
+if( RedlineType::Any != nType && nType != pTmp->GetType() )
+continue;
+
+// redline over the range
+if ( currentStart < *pTmp->End() && *pTmp->Start() <= currentEnd &&
+ // starting or ending within the range
+ ( !bStartOrEndInRange ||
+ ( currentStart <= *pTmp->Start() || *pTmp->End() <=
currentEnd ) ) )
+{
+return true;
+}
+}
+return false;
+}
+
const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition&
rPos,
SwRedlineTable::size_type* pFndPos ) const
{
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index d7003ccfbaed..a1c06e0442d1 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
@@ -231,31 +232,10 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos,
sal_Int32 nSourceLength, const
// tdf#83419 avoid bad autocorrect with visible redlines
// e.g. replacing the first letter of t
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/qa writerfilter/Library_writerfilter.mk writerfilter/source
sw/qa/extras/ooxmlimport/data/tdf123386.docx |binary
sw/qa/extras/ooxmlimport/data/tdf123389.docx |binary
sw/qa/extras/ooxmlimport/data/tdf133647.docx |binary
sw/qa/extras/ooxmlimport/data/tdf133647_unicode.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 155 +++
writerfilter/Library_writerfilter.mk |4
writerfilter/source/dmapper/DomainMapper_Impl.cxx| 70
writerfilter/source/dmapper/DomainMapper_Impl.hxx|3
writerfilter/source/dmapper/SettingsTable.cxx| 17 ++
writerfilter/source/dmapper/SettingsTable.hxx|3
10 files changed, 249 insertions(+), 3 deletions(-)
New commits:
commit b4716b277268a4a24b1a83b81b0255b852072c6a
Author: Michael Warner
AuthorDate: Fri Jul 3 10:18:33 2020 -0400
Commit: Miklos Vajna
CommitDate: Mon Nov 9 16:02:50 2020 +0100
tdf133647 tdf123386 tdf123389 Improved .docx table formula import
Converts table formula syntax from MS Word to LibreOffice.
This version uses the list separator of the document for the
formula regexen; however, it does not convert the decimal or
list separators in the case where the person opening the document
is using a different locale from the author.
(cherry picked from commit 68e74bdf63e992666016c790e8e4cfd5b28d6abe)
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/SettingsTable.cxx
Change-Id: I9600a0bea060a76705a7ad6b051ed4fdd50b9d40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105483
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlimport/data/tdf123386.docx
b/sw/qa/extras/ooxmlimport/data/tdf123386.docx
new file mode 100644
index ..1278068ddedf
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf123386.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/tdf123389.docx
b/sw/qa/extras/ooxmlimport/data/tdf123389.docx
new file mode 100644
index ..4245464b820d
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf123389.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/tdf133647.docx
b/sw/qa/extras/ooxmlimport/data/tdf133647.docx
new file mode 100644
index ..fb525446c7fc
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf133647.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/tdf133647_unicode.docx
b/sw/qa/extras/ooxmlimport/data/tdf133647_unicode.docx
new file mode 100644
index ..d5749f89de53
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/tdf133647_unicode.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4b2c4cc814bf..24a8a21263a2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -746,6 +746,161 @@ DECLARE_OOXMLIMPORT_TEST(testTdf105975formula,
"tdf105975.docx")
CPPUNIT_ASSERT_EQUAL(OUString("25"),
xEnumerationAccess->getPresentation(false).trim());
}
+DECLARE_OOXMLIMPORT_TEST(testTdf133647, "tdf133647.docx")
+{
+/* Tests that argument lists, cell references, and cell ranges are
translated correctly
+ * when importing table formulae from MS Word */
+uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference
xFields(xFieldsAccess->createEnumeration());
+
+if( !xFields->hasMoreElements() ) {
+CPPUNIT_ASSERT(false);
+return;
+}
+
+uno::Reference
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("SUM(1|2|3)"),
xEnumerationAccess1->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("6"),
xEnumerationAccess1->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("sum(|)"),
xEnumerationAccess2->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("3"),
xEnumerationAccess2->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("(SUM(|5)*(2+7))*(3+SUM(1|))"),
xEnumerationAccess3->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("432"),
xEnumerationAccess3->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess4(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1+(SUM(1|2))"),
xEnumerationAccess4->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("4"),
xEnumerationAccess4->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess5(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("3*(2+SUM()+7)"),
xEnumerationAccess5->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUS
[Libreoffice-commits] core.git: dbaccess/IwyuFilter_dbaccess.yaml dbaccess/source desktop/IwyuFilter_desktop.yaml desktop/source drawinglayer/inc drawinglayer/IwyuFilter_drawinglayer.yaml drawinglayer
dbaccess/IwyuFilter_dbaccess.yaml | 15 + dbaccess/source/core/api/KeySet.cxx|1 dbaccess/source/core/api/tablecontainer.cxx|1 dbaccess/source/core/dataaccess/ModelImpl.cxx |1 dbaccess/source/core/dataaccess/databasedocument.cxx |5 dbaccess/source/filter/xml/dbloader2.cxx |2 - dbaccess/source/filter/xml/xmlComponent.cxx|1 dbaccess/source/filter/xml/xmlExport.cxx |2 - dbaccess/source/filter/xml/xmlExport.hxx |1 dbaccess/source/filter/xml/xmlHierarchyCollection.cxx |1 dbaccess/source/filter/xml/xmlfilter.cxx |1 dbaccess/source/filter/xml/xmlfilter.hxx |1 dbaccess/source/ui/app/AppController.cxx |2 - dbaccess/source/ui/app/AppControllerDnD.cxx|2 - dbaccess/source/ui/app/AppDetailPageHelper.cxx |4 --- dbaccess/source/ui/app/AppDetailPageHelper.hxx |1 dbaccess/source/ui/app/AppDetailView.cxx |2 - dbaccess/source/ui/app/AppIconControl.cxx |1 dbaccess/source/ui/app/AppIconControl.hxx |2 - dbaccess/source/ui/app/AppSwapWindow.cxx |2 - dbaccess/source/ui/app/AppTitleWindow.cxx |4 --- dbaccess/source/ui/browser/dbloader.cxx|3 -- dbaccess/source/ui/browser/dsEntriesNoExp.cxx |1 dbaccess/source/ui/browser/exsrcbrw.cxx|1 dbaccess/source/ui/browser/sbagrid.cxx |1 dbaccess/source/ui/browser/unodatbr.cxx|1 dbaccess/source/ui/control/dbtreelistbox.cxx |3 +- dbaccess/source/ui/control/sqledit.cxx |6 - dbaccess/source/ui/control/tabletree.cxx |5 dbaccess/source/ui/dlg/UserAdmin.cxx |2 - dbaccess/source/ui/dlg/directsql.cxx |5 dbaccess/source/ui/inc/RelationController.hxx |1 dbaccess/source/ui/inc/TableController.hxx |1 dbaccess/source/ui/inc/dbtreelistbox.hxx |5 dbaccess/source/ui/inc/directsql.hxx |3 -- dbaccess/source/ui/inc/querycontroller.hxx |1 dbaccess/source/ui/inc/unosqlmessage.hxx |1 dbaccess/source/ui/querydesign/QueryTextView.cxx |3 -- dbaccess/source/ui/querydesign/QueryViewSwitch.cxx |1 dbaccess/source/ui/querydesign/TableWindowListBox.cxx |1 dbaccess/source/ui/querydesign/limitboxcontroller.cxx |1 dbaccess/source/ui/querydesign/limitboxcontroller.hxx |2 - dbaccess/source/ui/querydesign/querycontroller.cxx |1 dbaccess/source/ui/relationdesign/RelationController.cxx |2 - dbaccess/source/ui/tabledesign/TableController.cxx |1 dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx |2 - dbaccess/source/ui/tabledesign/TableDesignView.cxx |1 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx |3 -- dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx |1 dbaccess/source/ui/uno/ColumnControl.cxx |1 dbaccess/source/ui/uno/ColumnControl.hxx |1 dbaccess/source/ui/uno/DBTypeWizDlg.cxx|1 dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx |1 dbaccess/source/ui/uno/TableFilterDlg.cxx |1 dbaccess/source/ui/uno/UserSettingsDlg.cxx |1 dbaccess/source/ui/uno/admindlg.cxx|1 dbaccess/source/ui/uno/composerdialogs.cxx |1 dbaccess/source/ui/uno/dbinteraction.cxx |1 dbaccess/source/ui/uno/dbinteraction.hxx |1 dbaccess/source/ui/uno/textconnectionsettings_uno.cxx |1 dbaccess/source/ui/uno/unoDirectSql.cxx|1 dbaccess/source/ui/uno/unosqlmessage.cxx |1 desktop/IwyuFilter_desktop.yaml|9 +++ desktop/source/deployment/manager/dp_extensionmanager.hxx |1 desktop/source/migration/services/basicmigration.cxx |1 desktop/source/migration/services/basicmigration.hxx |1 desktop/source/migration/services/wordbookmigration.cxx|1 desktop/source/migration/services/wordbookmigration.hxx|1 desktop/source/offacc/acceptor.hxx |1 desktop/source/splash/unxsplash.cxx|2 - desktop/source/splash/unxsplash.hxx|3 -- drawinglayer/IwyuFilter_drawinglayer.yaml |9 +-- drawinglayer/inc/convert
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.2-26'
Tag 'cp-6.2-26' created by Andras Timar at 2020-11-09 15:11 + cp-6.2-26 Changes since CODE-4.2.2-2: Andras Timar (1): [cp] add info about xapian omega search and the cp-query template --- xapian/cp-query | 141 ++ xapian/xapian.txt | 109 + 2 files changed, 250 insertions(+) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.2-26'
Tag 'cp-6.2-26' created by Andras Timar at 2020-11-09 15:11 + cp-6.2-26 Changes since cp-6.2-23: Andras Timar (1): Update mobile Word Count dialog translations and some more --- source/ar/sw/messages.po | 1364 +++- source/as/sw/messages.po | 1364 +++- source/ast/sw/messages.po | 1426 -- source/bg/sw/messages.po | 1374 +++-- source/bn-IN/sw/messages.po | 1364 +++- source/br/sw/messages.po | 1364 +++- source/ca-valencia/sw/messages.po | 1794 -- source/ca/sw/messages.po | 1374 +++-- source/cs/sw/messages.po | 1374 +++-- source/cy/sw/messages.po | 1374 +++-- source/da/sw/messages.po | 1374 +++-- source/de/sw/messages.po | 1370 +++-- source/el/sw/messages.po | 1374 +++-- source/es/sw/messages.po | 113 +- source/et/sw/messages.po | 1410 +++-- source/eu/sw/messages.po | 1374 +++-- source/fi/sw/messages.po | 1384 +++-- source/fr/sw/messages.po | 1374 +++-- source/ga/sw/messages.po | 1364 +++- source/gd/sw/messages.po | 1364 +++- source/gl/sw/messages.po | 1374 +++-- source/gu/sw/messages.po | 1364 +++- source/he/sw/messages.po | 1374 +++-- source/hi/sw/messages.po | 1364 +++- source/hr/sw/messages.po | 1374 +++-- source/hu/sw/messages.po | 1364 +++- source/id/sw/messages.po | 1390 +++-- source/is/sw/messages.po | 1368 +++- source/it/sw/messages.po | 1374 +++-- source/ja/sw/messages.po | 1404 +++-- source/km/sw/messages.po | 1364 +++- source/kn/sw/messages.po | 1364 +++- source/ko/sw/messages.po | 1364 +++- source/lt/sw/messages.po | 1388 +++-- source/lv/sw/messages.po | 1374 +++-- source/ml/sw/messages.po | 1364 +++- source/mr/sw/messages.po | 1364 +++- source/nb/sw/messages.po | 1374 +++-- source/nl/sw/messages.po | 1374 +++-- source/nn/sw/messages.po | 1374 +++-- source/oc/sw/messages.po | 1364 +++- source/or/sw/messages.po | 1364 +++- source/pa-IN/sw/messages.po | 1366 +++- source/pl/sw/messages.po | 1400 +++-- source/pt-BR/sw/messages.po | 121 +- source/pt/sw/messages.po | 1374 +++-- source/ro/sw/messages.po | 1364 +++- source/ru/sw/messages.po | 1374 +++-- source/sk/sw/messages.po | 1374 +++-- source/sl/sw/messages.po | 1374 +++-- source/sr-Latn/sw/messages.po | 1363 +++- source/sr/sw/messages.po | 1378 +++-- source/sv/sw/messages.po | 1404 +++-- source/ta/sw/messages.po | 1364 +++- source/te/sw/messages.po | 1364 +++- source/tr/sw/messages.po | 1387 +++-- source/uk/sw/messages.po | 1376 +++-- source/vi/sw/messages.po | 1364 +++- source/zh-CN/sw/messages.po | 1374 +++-- source/zh-TW/sw/messages.po | 1376 +++-- 60 files changed, 43140 insertions(+), 37212 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.2-26'
Tag 'cp-6.2-26' created by Andras Timar at 2020-11-09 15:11 + cp-6.2-26 Changes since cp-6.2-25-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.2-26'
Tag 'cp-6.2-26' created by Andras Timar at 2020-11-09 15:11 + cp-6.2-26 Changes since co-6.2-26-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/uitest/impress_tests/tdf91762.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f4b394b830e38961a221b6bdd9a5aa2271dc9247
Author: Xisco Fauli
AuthorDate: Mon Nov 9 15:18:28 2020 +0100
Commit: Xisco Fauli
CommitDate: Mon Nov 9 16:13:33 2020 +0100
uitest: fix comments
Change-Id: I9c340b0912ffcc5bb4e582cc7fc06eb352d24e3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105482
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sd/qa/uitest/impress_tests/tdf91762.py
b/sd/qa/uitest/impress_tests/tdf91762.py
index 3c52b4ff9cf9..2487bc2a4726 100644
--- a/sd/qa/uitest/impress_tests/tdf91762.py
+++ b/sd/qa/uitest/impress_tests/tdf91762.py
@@ -33,7 +33,6 @@ class tdf91762(UITestCase):
self.assertEqual(1400, document.DrawPages[0].getByIndex(1).Position.X)
self.assertEqual(3685, document.DrawPages[0].getByIndex(1).Position.Y)
-#The table is selected, use esc to start editing
xDoc = self.xUITest.getTopFocusWindow()
xEdit = xDoc.getChild("impress_win")
for i in range(5):
@@ -41,6 +40,7 @@ class tdf91762(UITestCase):
xEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"RETURN"}))
# tdf#138011: Without the fix in place, this test would have failed
with
+# AssertionError: 5494 != 3559
self.assertEqual(5494,
document.DrawPages[0].getByIndex(1).BoundRect.Height)
self.ui_test.close_doc()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/toolbarmodedialog.ui | 39 ++- 1 file changed, 25 insertions(+), 14 deletions(-) New commits: commit 88a66f73f0182baffded6190f969bf7088236949 Author: Heiko Tietze AuthorDate: Mon Nov 9 15:13:58 2020 +0100 Commit: Heiko Tietze CommitDate: Mon Nov 9 17:16:28 2020 +0100 Resolves tdf#138051 - Text expands beyond dialog height GtkScrollWindow added to allow verbose descriptions Change-Id: Ifb3de54dece47646718d386566c6f2d2faf7b1ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105481 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/toolbarmodedialog.ui b/cui/uiconfig/ui/toolbarmodedialog.ui index 3ff3632a4740..b823d77c47a6 100644 --- a/cui/uiconfig/ui/toolbarmodedialog.ui +++ b/cui/uiconfig/ui/toolbarmodedialog.ui @@ -1,5 +1,5 @@ - + @@ -11,6 +11,7 @@ False 6 Select Your Preferred User Interface +False True center-on-parent dialog @@ -320,20 +321,33 @@ False True -1 +0 - + +100 True -False -start -True -Information: -True -word-char -50 -0 +True + + +True +False + + +True +False +start +True +Information: +True +word-char +50 +0 + + + + False @@ -376,8 +390,5 @@ btnApply btnClose - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/inc/findtextfield.hxx |1 +
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 20 +---
2 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 36d14442b25bd3d700d95879e5775cce6ed0836d
Author: Caolán McNamara
AuthorDate: Mon Nov 9 15:14:12 2020 +
Commit: Caolán McNamara
CommitDate: Mon Nov 9 17:29:27 2020 +0100
tdf#137993 ensure the toplevel vcl::Window is activated
when the search entry gains focus so that SfxViewFrame::Current is valid
Change-Id: Ibb21db12688a7d44758cf607da618035c22a062a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105484
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/source/inc/findtextfield.hxx b/svx/source/inc/findtextfield.hxx
index 1ac5519a2dcd..3e5de483c91a 100644
--- a/svx/source/inc/findtextfield.hxx
+++ b/svx/source/inc/findtextfield.hxx
@@ -63,6 +63,7 @@ private:
DECL_LINK(ActivateHdl, weld::ComboBox&, bool);
DECL_LINK(OnAsyncGetFocus, void*, void);
+void FocusIn();
void ActivateFind(bool bShift);
};
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 812d0bef4361..9d389139f18f 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -200,6 +200,8 @@ FindTextFieldControl::FindTextFieldControl( vcl::Window*
pParent,
m_xContext(xContext),
m_pAcc(svt::AcceleratorExecute::createAcceleratorHelper())
{
+InitControlBase(m_xWidget.get());
+
m_xWidget->set_entry_placeholder_text(SvxResId(RID_SVXSTR_FINDBAR_FIND));
m_xWidget->set_entry_completion(true, true);
m_pAcc->init(m_xContext, m_xFrame);
@@ -340,12 +342,20 @@ IMPL_LINK_NOARG(FindTextFieldControl, OnAsyncGetFocus,
void*, void)
m_xWidget->select_entry_region(0, -1);
}
-IMPL_LINK_NOARG(FindTextFieldControl, FocusInHdl, weld::Widget&, void)
+void FindTextFieldControl::FocusIn()
{
-if (m_nAsyncGetFocusId)
+if (m_nAsyncGetFocusId || !m_xWidget)
return;
+
// do it async to defeat entry in combobox having its own ideas about the
focus
m_nAsyncGetFocusId = Application::PostUserEvent(LINK(this,
FindTextFieldControl, OnAsyncGetFocus));
+
+GrabFocus(); // tdf#137993 ensure the toplevel vcl::Window is activated so
SfxViewFrame::Current is valid
+}
+
+IMPL_LINK_NOARG(FindTextFieldControl, FocusInHdl, weld::Widget&, void)
+{
+FocusIn();
}
void FindTextFieldControl::dispose()
@@ -397,12 +407,8 @@ void
FindTextFieldControl::set_entry_message_type(weld::EntryMessageType eType)
void FindTextFieldControl::GetFocus()
{
-if (m_xWidget)
-{
-m_xWidget->grab_focus();
-FocusInHdl(*m_xWidget);
-}
InterimItemWindow::GetFocus();
+FocusIn();
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - svx/source
svx/source/inc/findtextfield.hxx |1 +
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 13 +++--
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 08b8908468d81713213be4271b64e1cb6981
Author: Caolán McNamara
AuthorDate: Mon Nov 9 15:14:12 2020 +
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Nov 9 18:07:38 2020 +0100
tdf#137993 ensure the toplevel vcl::Window is activated
when the search entry gains focus so that SfxViewFrame::Current is valid
Change-Id: Ibb21db12688a7d44758cf607da618035c22a062a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105485
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/svx/source/inc/findtextfield.hxx b/svx/source/inc/findtextfield.hxx
index 1ac5519a2dcd..3e5de483c91a 100644
--- a/svx/source/inc/findtextfield.hxx
+++ b/svx/source/inc/findtextfield.hxx
@@ -63,6 +63,7 @@ private:
DECL_LINK(ActivateHdl, weld::ComboBox&, bool);
DECL_LINK(OnAsyncGetFocus, void*, void);
+void FocusIn();
void ActivateFind(bool bShift);
};
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index f7c0d2a9fc7b..716e7cb9e227 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -340,12 +340,20 @@ IMPL_LINK_NOARG(FindTextFieldControl, OnAsyncGetFocus,
void*, void)
m_xWidget->select_entry_region(0, -1);
}
-IMPL_LINK_NOARG(FindTextFieldControl, FocusInHdl, weld::Widget&, void)
+void FindTextFieldControl::FocusIn()
{
-if (m_nAsyncGetFocusId)
+if (m_nAsyncGetFocusId || !m_xWidget)
return;
+
// do it async to defeat entry in combobox having its own ideas about the
focus
m_nAsyncGetFocusId = Application::PostUserEvent(LINK(this,
FindTextFieldControl, OnAsyncGetFocus));
+
+GrabFocus(); // tdf#137993 ensure the toplevel vcl::Window is activated so
SfxViewFrame::Current is valid
+}
+
+IMPL_LINK_NOARG(FindTextFieldControl, FocusInHdl, weld::Widget&, void)
+{
+FocusIn();
}
void FindTextFieldControl::dispose()
@@ -400,6 +408,7 @@ void FindTextFieldControl::GetFocus()
if (m_xWidget)
m_xWidget->grab_focus();
InterimItemWindow::GetFocus();
+FocusIn();
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/layout/data/bottom-textbox-size.docx |binary
sw/qa/core/layout/layout.cxx| 15
sw/qa/extras/ooxmlimport/ooxmlimport.cxx|3 --
sw/source/core/layout/objectformattertxtfrm.cxx | 29 ++--
4 files changed, 33 insertions(+), 14 deletions(-)
New commits:
commit f2eef84ff03660cbb46a76c317e640e054ed0a56
Author: Daniel Arato (NISZ)
AuthorDate: Tue Nov 3 11:22:40 2020 +0100
Commit: László Németh
CommitDate: Mon Nov 9 19:05:20 2020 +0100
tdf#137881 sw: fix text box size regression
from commit c9eb53f200225f2ee6ca695e1326843a487aee51
(tdf#135198 sw editing: text box fell out of its shape).
The height of the bottom text box frame from the tdf#117921 sample
file grew unreasonably large. This is countered by only activating
the previous fix if it is strictly needed, i.e. when a shape and
its text box drift apart from each other.
The test file is derived from the one used for tdf#117921.
Change-Id: Ied01c6089efe586b73de559f89f08b958f4b62d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105238
Tested-by: László Németh
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/core/layout/data/bottom-textbox-size.docx
b/sw/qa/core/layout/data/bottom-textbox-size.docx
new file mode 100644
index ..a1c700f28ae9
Binary files /dev/null and b/sw/qa/core/layout/data/bottom-textbox-size.docx
differ
diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index a992a32ae7d4..ff339322fe70 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -196,6 +196,21 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest,
testTextBoxStaysInsideShape)
nTextBoxTopAfter < nTextBoxTopBefore);
}
+CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTextBoxSizeAtBottomOfPage)
+{
+// tdf#137881: check whether text box at the bottom of the page stays the
right size
+load(DATA_DIRECTORY, "bottom-textbox-size.docx");
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+SdrPage* pPage =
pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+SdrObject* pTextBoxObj = pPage->GetObj(0);
+
+uno::Reference xShape(pTextBoxObj->getUnoShape(),
uno::UNO_QUERY_THROW);
+const sal_Int32 nHeight = xShape->getSize().Height;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("text box was not supposed to be resized on
fileopen",
+ static_cast(2200), nHeight);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ec680a69a6ad..5919d1a6f76d 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1065,8 +1065,7 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpsOnly,
"textbox-wps-only.docx")
if ( nsScreen.frame.size.width * scaleFactor > 4000 )
return;
#endif
-// Vertically oriented to page due to tdf#135198
-CPPUNIT_ASSERT_EQUAL(sal_Int32(5304), getProperty(xFrame,
"VertOrientPosition"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2805), getProperty(xFrame,
"VertOrientPosition"));
}
DECLARE_OOXMLIMPORT_TEST(testGroupshapeRelsize, "groupshape-relsize.docx")
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx
b/sw/source/core/layout/objectformattertxtfrm.cxx
index 2109835ba841..6b0e910fb113 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -355,23 +355,28 @@ bool SwObjectFormatterTextFrame::DoFormatObjs()
SwFrameFormat& rFormat = pObj->GetFrameFormat();
if (SwTextBoxHelper::isTextBox(&rFormat, RES_DRAWFRMFMT))
{
-if (const SwPageFrame* pPageFrame = pObj->GetPageFrame())
+const SwFrameFormat* pOtherFormat =
SwTextBoxHelper::getOtherTextBoxFormat(&rFormat, RES_DRAWFRMFMT);
+if (rFormat.GetVertOrient().GetPos() !=
pOtherFormat->GetVertOrient().GetPos() ||
+rFormat.GetAnchor().GetAnchorId() !=
pOtherFormat->GetAnchor().GetAnchorId())
{
-SwDoc* pDoc = rFormat.GetDoc();
+if (const SwPageFrame* pPageFrame =
pObj->GetPageFrame())
+{
+SwDoc* pDoc = rFormat.GetDoc();
-// avoid Undo creation,
-::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
+// avoid Undo creation,
+::sw::UndoGuard const
ug(pDoc->GetIDocumentUndoRedo());
-SfxItemSet aSet(pDoc->GetAttrPool(),
-svl::Items{});
+SfxItemSet aSet(pDoc
[Libreoffice-commits] core.git: svx/source
svx/source/table/tablelayouter.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 563f3e31268b1540a7b76889e8c558de87e5bc95 Author: Andrea Gelmini AuthorDate: Mon Nov 9 18:43:47 2020 +0100 Commit: Julien Nabet CommitDate: Mon Nov 9 19:40:08 2020 +0100 Fix typo Change-Id: If69267e6ef9cc73842a6aee805d3c07b088aa9bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105488 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 6859d0a2eee8..80d0a52f4db2 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -782,12 +782,12 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) nMinHeight = xCell->getMinimumHeight(); } -// tdf#137949 We should consider "Heigth" property while calculating minimum height. -// This control decides when we use "Heigth" property value instead of calculated minimum height -// Case 1: * Row has "Heigth" property -// * Calculated minimum heigth is smaller than Height propery value. -// Case 2: * Row has "Heigth" property -// * Calculated minimum heigth is bigger than Height propery value and +// tdf#137949 We should consider "Height" property while calculating minimum height. +// This control decides when we use "Height" property value instead of calculated minimum height +// Case 1: * Row has "Height" property +// * Calculated minimum height is smaller than Height property value. +// Case 2: * Row has "Height" property +// * Calculated minimum height is bigger than Height property value and // * Row has not any text of any cell in edit mode in the row (means completely empty) if ((nMinHeight < nRowPropHeight && nRowPropHeight > 0 ) || (nMinHeight > nRowPropHeight && nRowPropHeight > 0 && (!bRowHasText && !bRowHasCellInEditMode))) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/salvtables.cxx | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 0f2bddacae89a50c1349e2511c3b60c7c7120aad
Author: Caolán McNamara
AuthorDate: Mon Nov 9 16:05:43 2020 +
Commit: Caolán McNamara
CommitDate: Mon Nov 9 21:19:45 2020 +0100
tdf#136962 only do implicit SetUpdateMode optimization if the widget is
hidden
callers can always opt-in with freeze/thaw for the lesser optimization
available if shown
Change-Id: Ib9317451a3059cc33f70d0c23543d8024bd21ede
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105487
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 61a1e52211c3..fd9b2777db41 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3336,7 +3336,9 @@ static SalInstanceTreeView* g_DragSource;
namespace
{
-class UpdateGuard
+// tdf#131581 if the TreeView is hidden then there are possibly additional
+// optimizations available
+class UpdateGuardIfHidden
{
private:
SvTabListBox& m_rTreeView;
@@ -3344,10 +3346,11 @@ namespace
bool m_bOrigEnableInvalidate;
public:
-UpdateGuard(SvTabListBox& rTreeView)
+UpdateGuardIfHidden(SvTabListBox& rTreeView)
: m_rTreeView(rTreeView)
-, m_bOrigUpdate(m_rTreeView.IsUpdateMode())
-// tdf#137432 only do the EnableInvalidate(false) optimization if
the widget is currently hidden
+// tdf#136962 only do SetUpdateMode(false) optimization if the
widget is currently hidden
+, m_bOrigUpdate(!m_rTreeView.IsVisible() &&
m_rTreeView.IsUpdateMode())
+// tdf#137432 only do EnableInvalidate(false) optimization if the
widget is currently hidden
, m_bOrigEnableInvalidate(!m_rTreeView.IsVisible() &&
m_rTreeView.GetModel()->IsEnableInvalidate())
{
if (m_bOrigUpdate)
@@ -3356,7 +3359,7 @@ namespace
m_rTreeView.GetModel()->EnableInvalidate(false);
}
-~UpdateGuard()
+~UpdateGuardIfHidden()
{
if (m_bOrigEnableInvalidate)
m_rTreeView.GetModel()->EnableInvalidate(true);
@@ -4594,7 +4597,7 @@ public:
virtual void all_foreach(const std::function& func)
override
{
-UpdateGuard aGuard(*m_xTreeView);
+UpdateGuardIfHidden aGuard(*m_xTreeView);
SalInstanceTreeIter aVclIter(m_xTreeView->First());
while (aVclIter.iter)
@@ -4607,7 +4610,7 @@ public:
virtual void selected_foreach(const std::function&
func) override
{
-UpdateGuard aGuard(*m_xTreeView);
+UpdateGuardIfHidden aGuard(*m_xTreeView);
SalInstanceTreeIter aVclIter(m_xTreeView->FirstSelected());
while (aVclIter.iter)
@@ -4620,7 +4623,7 @@ public:
virtual void visible_foreach(const std::function&
func) override
{
-UpdateGuard aGuard(*m_xTreeView);
+UpdateGuardIfHidden aGuard(*m_xTreeView);
SalInstanceTreeIter aVclIter(m_xTreeView->GetFirstEntryInView());
while (aVclIter.iter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/inc vcl/quartz
vcl/inc/quartz/salgdi.h |2 +
vcl/quartz/salgdicommon.cxx |3 ++
vcl/quartz/salgdiutils.cxx | 52 ++--
3 files changed, 46 insertions(+), 11 deletions(-)
New commits:
commit ab436ca98b11a6c72e695169662ad3b5a314fa9c
Author: 191919
AuthorDate: Tue Oct 27 15:38:39 2020 +0800
Commit: Noel Grandin
CommitDate: Tue Nov 10 07:59:44 2020 +0100
Speed improments
Improve drawing performance on 10-bit displays by avoiding multiple color
space conversions.
Make all drawing context bitmaps have the colour space and byte order of
the host window.
Fix serious CoreGraphics-related memory leak (existed no later than
version 7.0) when changing the window size.
Change-Id: Ia7b7e88d47b728bd1d10dedc1ca15de41e73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104858
Tested-by: Jenkins
Reviewed-by: Noel Grandin
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105497
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index a5c74c17705c..2ac33fdbdcf7 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -134,6 +134,8 @@ class AquaSalGraphics : public SalGraphics
{
CGLayerHolder maLayer; // Quartz graphics layer
CGContextHolder maContextHolder; // Quartz drawing context
+CGContextHolder maBGContextHolder; // Quartz drawing context for CGLayer
+CGContextHolder maCSContextHolder; // Quartz drawing context considering
the color space
XorEmulation* mpXorEmulation;
int mnXorMode; // 0: off 1: on 2:
invert only
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 3126400709f2..8b51e91c6d54 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -521,11 +521,14 @@ void AquaSalGraphics::copyArea( long nDstX, long
nDstY,long nSrcX, long nSrcY,
CGContextScaleCTM( xSrcContext, +1, -1 );
aSrcPoint.y = (nScaledSourceY + nScaledSourceHeight) - (mnHeight *
fScale);
}
+CGContextSetBlendMode(xSrcContext, kCGBlendModeCopy);
+
CGContextDrawLayerAtPoint(xSrcContext, aSrcPoint, maLayer.get());
}
// draw at new destination
const CGRect aTargetRect = CGRectMake(nScaledTargetX, nScaledTargetY,
nScaledSourceWidth, nScaledSourceHeight);
+CGContextSetBlendMode(xCopyContext, kCGBlendModeCopy);
CGContextDrawLayerInRect(xCopyContext, aTargetRect,
sSourceLayerHolder.get());
maContextHolder.restoreState();
diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx
index 589bd2ae22e5..57953e536796 100644
--- a/vcl/quartz/salgdiutils.cxx
+++ b/vcl/quartz/salgdiutils.cxx
@@ -69,11 +69,28 @@ void AquaSalGraphics::SetPrinterGraphics( CGContextRef
xContext, long nDPIX, lon
void AquaSalGraphics::InvalidateContext()
{
UnsetState();
+
+CGContextRelease(maContextHolder.get());
+CGContextRelease(maBGContextHolder.get());
+CGContextRelease(maCSContextHolder.get());
+
maContextHolder.set(nullptr);
+maCSContextHolder.set(nullptr);
+maBGContextHolder.set(nullptr);
}
void AquaSalGraphics::UnsetState()
{
+if (maBGContextHolder.isSet())
+{
+CGContextRelease(maBGContextHolder.get());
+maBGContextHolder.set(nullptr);
+}
+if (maCSContextHolder.isSet())
+{
+CGContextRelease(maCSContextHolder.get());
+maBGContextHolder.set(nullptr);
+}
if (maContextHolder.isSet())
{
maContextHolder.restoreState();
@@ -119,7 +136,12 @@ bool AquaSalGraphics::CheckContext()
{
CGContextRelease(maContextHolder.get());
}
+CGContextRelease(maBGContextHolder.get());
+CGContextRelease(maCSContextHolder.get());
+
maContextHolder.set(nullptr);
+maBGContextHolder.set(nullptr);
+maCSContextHolder.set(nullptr);
maLayer.set(nullptr);
}
@@ -133,18 +155,17 @@ bool AquaSalGraphics::CheckContext()
const CGSize aLayerSize = { static_cast(nScaledWidth),
static_cast(nScaledHeight) };
const int nBytesPerRow = (nBitmapDepth * nScaledWidth) / 8;
-void* pRawData = std::malloc(nBytesPerRow * nScaledHeight);
-#ifdef MACOSX
-const int nFlags = kCGImageAlphaNoneSkipFirst;
-#else
-const int nFlags = kCGImageAlphaNoneSkipFirst |
kCGImageByteOrder32Little;
-#endif
-CGContextHolder aContextHolder(CGBitmapContextCreate(
-pRawData, nScaledWidth, nScaledHeight, 8, nBytesPerRow,
GetSalData()->mxRGBSpace, nFlags));
-
-maLayer.set(CGLayerCreateWithContext(aContextHolder.get(),
aLayerSize, nullptr));
+int nFlags = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host;
+maBGContextHolder.set(CGBitmapContextCreate(
+NULL, nScal
[Libreoffice-commits] core.git: compilerplugins/clang include/xmloff starmath/inc starmath/Library_sm.mk starmath/source xmloff/source
compilerplugins/clang/sequentialassign.cxx |1
include/xmloff/xmltoken.hxx|2
starmath/Library_sm.mk |1
starmath/inc/parse.hxx |2
starmath/inc/starmathdatabase.hxx | 56 +++
starmath/inc/strings.hrc |4
starmath/inc/strings.hxx |4
starmath/inc/token.hxx | 25 +
starmath/inc/types.hxx |1
starmath/source/ElementsDockingWindow.cxx |4
starmath/source/mathmlexport.cxx |2
starmath/source/mathmlimport.cxx | 61 +++-
starmath/source/parse.cxx | 122 ++--
starmath/source/starmathdatabase.cxx | 358
starmath/source/visitors.cxx | 422 +++--
xmloff/source/core/xmltoken.cxx|2
xmloff/source/token/tokens.txt |2
17 files changed, 711 insertions(+), 358 deletions(-)
New commits:
commit 7e2c35324c54646f53f0fa14b7bce07e1da73c0b
Author: dante
AuthorDate: Tue Nov 3 18:51:19 2020 +0100
Commit: Noel Grandin
CommitDate: Tue Nov 10 07:59:14 2020 +0100
Evaluate command: tdf#109338
Adds evaluate command.
It's visible from UI as a bracket.
Example: evaluate { {1} over {%sigma sqrt{2%pi} }func e^-{{(x-%mu)^2} over
{2%sigma^2}} } from { -infinity } to { +infinity } = 0
In order to make the mathml part, several changes had to be mad:
- Allow mathml to correctly identify the math token for opperators
- Allow mathml to correctly identify the math token for fences
- Since improvements where made on token recognision, visitors to string
can now be lighter ( removing long long switch )
- Improving the import / export to mathm
- LO says it mathml 2, but actually is something between 2 and 3
- Allowing mfenced ( mathml 2.0 ) to stayl 3 adding the missing data (
prefix and postfix )
- Be able to know if we are opening or closing brackets
- lrline and lrdline commands hidden on UI.
- They are they own open close
- If prefix and postfix are missing meaning of the expression may
change, however that's the user problem.
- The problem resides in the fact that MS_VERTLINE is uses for lline
and rline.
- The problem resides in the fact that MS_DVERTLINE is uses for ldline
and rdline.
- Changing frac priority from 0 to 5, if not { frac 1 2 frac 1 2 } fails (
found while testing )
- The mathml testing was made with highter standars than qa tests, however
there are no guarantees.
- Added xml tokens needed for math
- Added starmathdatabase. Will grow in the future.
The point is avoiding long lists and swtches inside code.
Added it command for hidden or implicit product ( like in mathml ).
Oppens path for tdf#66200. Note that about this issue there is only one line on
the parser. The mathml implementation will be made later when LO will allow
chars with &charname;.
Change-Id: If24b40c2420d39498693944f13a02985f997dd23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105267
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/sequentialassign.cxx
b/compilerplugins/clang/sequentialassign.cxx
index 33b1afa6852a..a89afea43438 100644
--- a/compilerplugins/clang/sequentialassign.cxx
+++ b/compilerplugins/clang/sequentialassign.cxx
@@ -118,6 +118,7 @@ public:
|| fn == SRCDIR "/starmath/source/cfgitem.cxx"
|| fn == SRCDIR "/ucb/source/ucp/ftp/ftpurl.cxx"
|| fn == SRCDIR "/starmath/source/node.cxx"
+|| fn == SRCDIR "/starmath/source/starmathdatabase.cxx"
|| fn == SRCDIR "/ucb/source/ucp/cmis/certvalidation_handler.cxx"
|| fn == SRCDIR
"/reportdesign/source/ui/inspection/GeometryHandler.cxx"
|| fn == SRCDIR
"/reportdesign/source/core/api/ReportDefinition.cxx"
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 99b94be7e2cc..6b2fed011a39 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1477,6 +1477,8 @@ namespace xmloff::token {
XML_POWER,
XML_PRECISION_AS_SHOWN,
XML_PREFIX,
+XML_INFIX,
+XML_POSTFIX,
XML_PRESENTATION,
XML_PRESENTATION_ORGCHART,
XML_PRESENTATION_OUTLINE,
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 5d75c87eb58f..a63b506783e1 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
starmath/source/view \
starmath/source/visitors \
starmath/source/wordexportbase \
+starmath/source/starmathdatabase \
))
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index f0783835fe21..020d22fb37b4 100644
--- a/starmath/inc/parse.hxx
+++
