[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa sw/source

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/rtfexport/data/tdf133437.rtf |  571 ++
 sw/qa/extras/rtfexport/rtfexport5.cxx |   39 ++
 sw/source/core/unocore/unodraw.cxx|   15 
 3 files changed, 617 insertions(+), 8 deletions(-)

New commits:
commit 136c466fa9caa7f9b4d8870d704e41da832e522b
Author: Vasily Melenchuk 
AuthorDate: Wed Jul 8 08:49:04 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Aug 21 08:42:13 2020 +0200

tdf#133437: sw: set generated shape name if it is missing

Shape names are required for seting format name and undo/redo
and correct displaying of objects in Navigator pane

Change-Id: I43caf6a4d5f054283d48c46b081d43b743bd4433
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98312
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 0c53a58b2dd9bee3d4de6843966486428fdaa78f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100942

diff --git a/sw/qa/extras/rtfexport/data/tdf133437.rtf 
b/sw/qa/extras/rtfexport/data/tdf133437.rtf
new file mode 100644
index ..4cd6ef182e06
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf133437.rtf
@@ -0,0 +1,571 @@
+{\rtf1\ansi\deff0
+{\fonttbl
+{\f0\fnil\fcharset204\fprq0\cpg1251 Arial;}
+{\f1\fnil\fcharset204\fprq0\cpg1251 Times New Roman;}
+{\f2\fnil\fcharset204\fprq0\cpg1251 Courier New;}
+}
+{\*\viewkind1}{\*\viewscale100}\margl0\margr0\margt0\margb0
+\paperw11905\paperh16837{\pard\plain\qc\sl-200\sb40\phmrg\pvmrg\posx840\posy1120\absw10200\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
  ��� (���), �.��}\par}
+{\pard\plain\qc\sl-200\sb40\phmrg\pvmrg\posx840\posy1400\absw10200\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
 ��� "� ���"}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx2540\posy1680\absw3680\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
 ��� ��� �� � N}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx6060\posy1680\absw2200\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
 4070281040001109}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx8160\posy1680\absw300\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
 c}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx8300\posy1680\absw1100\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
 01.05.2012}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx9260\posy1680\absw420\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
 ��}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx9580\posy1680\absw1100\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
 17.05.2012}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx840\posy1960\absw1520\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
 �� �:}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx2200\posy1960\absw620\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
 RUR}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx7640\posy1960\absw2600\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
  � :}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx10080\posy1960\absw1100\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
 28.04.2012}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx840\posy2240\absw1960\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
  ���:}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx2700\posy2240\absw1100\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
 146 678.74}\par}
+{\pard\plain\qr\sl-200\sb40\phmrg\pvmrg\posx840\posy2440\absw10200\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
  1 �� 3}\par}
+{\shp{\*\shpinst\shpleft840\shptop2720\shpright11220\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 1}}{\sp{\sn fFilled}{\sv 0
+{\shp{\*\shpinst\shpleft1840\shptop2720\shpright1840\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 20
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx880\posy2880\absw1160\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
  .}\par}
+{\shp{\*\shpinst\shpleft2180\shptop2720\shpright2180\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 20
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx1860\posy2880\absw520\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
 ��}\par}
+{\shp{\*\shpinst\shpleft2860\shptop2720\shpright2860\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 20
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx2220\posy2760\absw800\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
 �}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx2220\posy3000\absw820\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
 �.}\par}
+{\shp{\*\shpinst\shpleft4200\shptop2720\shpright4200\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 20
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx3240\posy2880\absw720\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
 �}\par}
+{\shp{\*\shpinst\shpleft5540

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/uibase/lingu/olmenu.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 23ae9e8b907d224f51b5af24c79e31f5a9c18d25
Author: Michael Stahl 
AuthorDate: Wed Aug 19 18:55:27 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Aug 21 08:40:21 2020 +0200

tdf#135721 sw: fix spell check context menu deleting flys

Kind of similar to e1629c210ad78310e3d48c0756723134a27b89df
but the problem is at a higher level: SwTextShell::Execute() with
SID_SPELLCHECK_APPLY_SUGGESTION should not DelLeft() + Insert() but
just Replace().

(regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)

Change-Id: I78487c7841ba22ccc6751240a8e55e08a86fba32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101014
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit ec579354af954867b829e7d08e4d752518c83728)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101072
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/uibase/lingu/olmenu.cxx 
b/sw/source/uibase/lingu/olmenu.cxx
index 902974516fd9..40585351333e 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -675,9 +675,8 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
 
 m_pSh->StartUndo(SwUndoId::UI_REPLACE, &aRewriter);
 m_pSh->StartAction();
-m_pSh->DelLeft();
 
-m_pSh->Insert( aTmp );
+m_pSh->Replace(aTmp, false);
 
 /* #102505# EndAction/EndUndo moved down since insertion
of temporary auto correction is now undoable two and
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk

[Stephan Bergmann (via logerrit)]

 bridges/Library_cpp_uno.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7b0ab85b4042cb38221ca5c9794b70c87443181f
Author: Stephan Bergmann 
AuthorDate: Thu Aug 20 14:54:31 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 21 08:39:43 2020 +0200

Pass -fno-lto unconditionally

At least when building the libreoffice rpm on Fedora 33, the relevant 
-flto...
flags are passed in via the global CFLAGS/CXXFLAGS, and no --enable-lto
configure option is given.  That caused this library to be built with LTO 
there,
which in turn caused at least aarch64 to fail the %check step with

> ### unexpected exception content! failed
> ### unexpected exception content! failed
> ### unexpected exception content! failed
> exception test failed
> oneway exception test failed
> exception occurred: error: test failed! 
testtools/source/bridgetest/bridgetest.cxx:1176
>
> > error: error: test failed! 
testtools/source/bridgetest/bridgetest.cxx:1176
> > dying...make[1]: *** [testtools/CustomTarget_uno_test.mk:25: 
workdir/CustomTarget/testtools/uno_test.done] Error 1
> make: *** [Makefile:166: CustomTarget_testtools/uno_test] Error 2

The easiest fix appears to pass -fno-lto unconditionally:  For one, both 
GCC and
Clang appear to support it since before our baseline versions (GCC: baseline
7.0.0, presumably supported since 
 "Merge lto branch into trunk" in
releases/gcc-4.5; Clang: baseline 5.0.2 (at least on Linux), presumably
supported since  "Driver: Support -fno-lto" in
releases/3.0.x).  For another, the other (few) places in the code that check
ENABLE_LTO appear not to be relevant at least for that Fedora 33 rpm build, 
so
there appears to be no incentive to make that build configure --enable-lto 
as an
alternative to this fix.

Change-Id: I4735403660e57ef73b99d6a8cc5945c6d8e2af73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101129
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 5e78bcb676a6..0c6b255f52ad 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -212,7 +212,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
$(if $(filter 
armeabi-v7a,$(ANDROID_APP_ABI)),-I$(ANDROID_BINUTILS_PREBUILT_ROOT)/lib/gcc/arm-linux-androideabi/4.9.x/include)
 \
-fno-omit-frame-pointer \
-fno-strict-aliasing \
-   $(if $(filter TRUE,$(ENABLE_LTO)),-fno-lto) \
+   -fno-lto \
$(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl

[Stephan Bergmann (via logerrit)]

 include/vcl/mnemonic.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6543ffeaf468d5c5b631c4cce9f5a228d13e757c
Author: Stephan Bergmann 
AuthorDate: Thu Aug 20 22:55:49 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 21 08:29:31 2020 +0200

Use [[nodiscard]] directly in LIBO_INTERNAL_ONLY code

Change-Id: I31df55c7869fc4f0d37a4189d4b2f10e0a4f2bc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101095
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index 0d62a95eb053..3ee12c20cc33 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -63,7 +63,7 @@ public:
 MnemonicGenerator(sal_Unicode cMnemonic = 
MNEMONIC_CHAR);
 
 voidRegisterMnemonic( const OUString& rKey );
-SAL_WARN_UNUSED_RESULT OUString CreateMnemonic(const OUString& rKey);
+[[nodiscard]] OUString CreateMnemonic(const OUString& rKey);
 css::uno::Reference< css::i18n::XCharacterClassification > const & 
GetCharClass();
 
 // returns a string where all '~'-characters and CJK mnemonics of the form 
(~A) are completely removed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sw/source xmloff/source

[Noel Grandin (via logerrit)]

 sw/source/filter/xml/xmlfmt.cxx |4 ++--
 xmloff/source/draw/ximpstyl.cxx |2 +-
 xmloff/source/draw/ximpstyl.hxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit af068c36c65f8ed482e774fcf5346704ae7a2717
Author: Noel Grandin 
AuthorDate: Thu Aug 20 21:37:56 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 21 08:13:27 2020 +0200

use fastparser in SdXMLStylesContext

Change-Id: Idd15d117d71e607691bec9911ff0cc194ca5ce01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101093
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 51058a1f36d1..6aee9df7f8ac 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1076,7 +1076,7 @@ rtl::Reference< SvXMLImportPropertyMapper > 
SdXMLStylesContext::GetImportPropert
 
 // Process all style and object info
 
-void SdXMLStylesContext::EndElement()
+void SdXMLStylesContext::endFastElement(sal_Int32 )
 {
 if(mbIsAutoStyle)
 {
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 3885d405141b..d3922a8eb326 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -210,7 +210,7 @@ public:
 SdXMLImport& rImport,
 bool bIsAutoStyle);
 
-virtual void EndElement() override;
+virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 virtual rtl::Reference< SvXMLImportPropertyMapper > 
GetImportPropertyMapper(XmlStyleFamily nFamily) const override;
 
 void SetMasterPageStyles(SdXMLMasterPageContext const & rMaster) const;
commit 8d3ccf54fe47be0167505afb11159fd2e1fa1d9f
Author: Noel Grandin 
AuthorDate: Thu Aug 20 21:34:54 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 21 08:13:16 2020 +0200

use fastparser in SwXMLMasterStylesContext_Impl

Change-Id: I420312d8f58a42999c7d6c3048c391ff1f44a039
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101092
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 559984a60ff2..5bd4debc2d27 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -993,7 +993,7 @@ public:
 
 SwXMLMasterStylesContext_Impl( SwXMLImport& rImport );
 
-virtual void EndElement() override;
+virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 };
 
 }
@@ -1018,7 +1018,7 @@ bool SwXMLMasterStylesContext_Impl::InsertStyleFamily( 
XmlStyleFamily nFamily )
 return bIns;
 }
 
-void SwXMLMasterStylesContext_Impl::EndElement()
+void SwXMLMasterStylesContext_Impl::endFastElement(sal_Int32 )
 {
 FinishStyles( !GetSwImport().IsInsertMode() );
 GetSwImport().FinishStyles();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sukapura/cmd/32/color.png|binary
 icon-themes/sukapura/cmd/32/extrusion3dcolor.png |binary
 icon-themes/sukapura/cmd/32/ko/color.png |binary
 icon-themes/sukapura/cmd/ko/lc_color.png |binary
 icon-themes/sukapura/cmd/ko/sc_color.png |binary
 icon-themes/sukapura/cmd/lc_color.png|binary
 icon-themes/sukapura/cmd/lc_extrusion3dcolor.png |binary
 icon-themes/sukapura/cmd/sc_color.png|binary
 icon-themes/sukapura/cmd/sc_extrusion3dcolor.png |binary
 icon-themes/sukapura/sw/res/sc20248.png  |binary
 icon-themes/sukapura_svg/cmd/32/color.svg|2 +-
 icon-themes/sukapura_svg/cmd/32/extrusion3dcolor.svg |2 +-
 icon-themes/sukapura_svg/cmd/32/ko/color.svg |2 +-
 icon-themes/sukapura_svg/cmd/ko/lc_color.svg |2 +-
 icon-themes/sukapura_svg/cmd/ko/sc_color.svg |2 +-
 icon-themes/sukapura_svg/cmd/lc_color.svg|2 +-
 icon-themes/sukapura_svg/cmd/lc_extrusion3dcolor.svg |2 +-
 icon-themes/sukapura_svg/cmd/sc_color.svg|2 +-
 icon-themes/sukapura_svg/cmd/sc_extrusion3dcolor.svg |2 +-
 icon-themes/sukapura_svg/sw/res/sc20248.svg  |5 +++--
 20 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit fa122a6e79ef273aab2fb74c3c63741c87985f8e
Author: Rizal Muttaqin 
AuthorDate: Fri Aug 21 08:51:42 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Fri Aug 21 07:36:01 2020 +0200

Sukapura: update font color & 3d Shape color icons

Change-Id: If791dadbdbc423390b4add6086cf1fe12cd80339
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101126
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sukapura/cmd/32/color.png 
b/icon-themes/sukapura/cmd/32/color.png
index 420f38508d4f..bd0553ebd02c 100644
Binary files a/icon-themes/sukapura/cmd/32/color.png and 
b/icon-themes/sukapura/cmd/32/color.png differ
diff --git a/icon-themes/sukapura/cmd/32/extrusion3dcolor.png 
b/icon-themes/sukapura/cmd/32/extrusion3dcolor.png
index 14a66d4d37af..30591a82b966 100644
Binary files a/icon-themes/sukapura/cmd/32/extrusion3dcolor.png and 
b/icon-themes/sukapura/cmd/32/extrusion3dcolor.png differ
diff --git a/icon-themes/sukapura/cmd/32/ko/color.png 
b/icon-themes/sukapura/cmd/32/ko/color.png
index 38a65844efcf..5e2e8cd91dcd 100644
Binary files a/icon-themes/sukapura/cmd/32/ko/color.png and 
b/icon-themes/sukapura/cmd/32/ko/color.png differ
diff --git a/icon-themes/sukapura/cmd/ko/lc_color.png 
b/icon-themes/sukapura/cmd/ko/lc_color.png
index 6d51da2d3b78..a546ef98da00 100644
Binary files a/icon-themes/sukapura/cmd/ko/lc_color.png and 
b/icon-themes/sukapura/cmd/ko/lc_color.png differ
diff --git a/icon-themes/sukapura/cmd/ko/sc_color.png 
b/icon-themes/sukapura/cmd/ko/sc_color.png
index 49d5421a9c82..391b57fdf5f7 100644
Binary files a/icon-themes/sukapura/cmd/ko/sc_color.png and 
b/icon-themes/sukapura/cmd/ko/sc_color.png differ
diff --git a/icon-themes/sukapura/cmd/lc_color.png 
b/icon-themes/sukapura/cmd/lc_color.png
index 1521a0bd3118..31b792767fab 100644
Binary files a/icon-themes/sukapura/cmd/lc_color.png and 
b/icon-themes/sukapura/cmd/lc_color.png differ
diff --git a/icon-themes/sukapura/cmd/lc_extrusion3dcolor.png 
b/icon-themes/sukapura/cmd/lc_extrusion3dcolor.png
index 7d530556bbed..d4b6c16c6e9b 100644
Binary files a/icon-themes/sukapura/cmd/lc_extrusion3dcolor.png and 
b/icon-themes/sukapura/cmd/lc_extrusion3dcolor.png differ
diff --git a/icon-themes/sukapura/cmd/sc_color.png 
b/icon-themes/sukapura/cmd/sc_color.png
index 4915e8849766..fe183e73bbe9 100644
Binary files a/icon-themes/sukapura/cmd/sc_color.png and 
b/icon-themes/sukapura/cmd/sc_color.png differ
diff --git a/icon-themes/sukapura/cmd/sc_extrusion3dcolor.png 
b/icon-themes/sukapura/cmd/sc_extrusion3dcolor.png
index 3d9b23a016cd..48e0d0585013 100644
Binary files a/icon-themes/sukapura/cmd/sc_extrusion3dcolor.png and 
b/icon-themes/sukapura/cmd/sc_extrusion3dcolor.png differ
diff --git a/icon-themes/sukapura/sw/res/sc20248.png 
b/icon-themes/sukapura/sw/res/sc20248.png
index 4322a3109185..73e665cf9eef 100644
Binary files a/icon-themes/sukapura/sw/res/sc20248.png and 
b/icon-themes/sukapura/sw/res/sc20248.png differ
diff --git a/icon-themes/sukapura_svg/cmd/32/color.svg 
b/icon-themes/sukapura_svg/cmd/32/color.svg
index 5ad7fe124210..f041bd7f63ba 100644
--- a/icon-themes/sukapura_svg/cmd/32/color.svg
+++ b/icon-themes/sukapura_svg/cmd/32/color.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/sukapura_svg/cmd/32/extrusion3dcolor.svg 
b/icon-themes/sukapura_svg/cmd/32/extrusion3dcolor.svg
index 506a28eabeaf..12e0deaef3f6 100644
--- a/icon-themes/sukapura_svg/cmd/32/extrusion3dcolor.svg
+++ b/icon-themes/sukapura_svg/cmd/32/extrusion3dcolor.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No 

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/elementary icon-th

[Rizal Muttaqin (via logerrit)]

 icon-themes/breeze/cmd/32/inspectordeck.png  |binary
 icon-themes/breeze/cmd/lc_inspectordeck.png  |binary
 icon-themes/breeze/cmd/sc_inspectordeck.png  |binary
 icon-themes/breeze_dark/cmd/32/inspectordeck.png |binary
 icon-themes/breeze_dark/cmd/lc_inspectordeck.png |binary
 icon-themes/breeze_dark/cmd/sc_inspectordeck.png |binary
 icon-themes/breeze_dark_svg/cmd/32/inspectordeck.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_inspectordeck.svg |1 +
 icon-themes/breeze_dark_svg/cmd/sc_inspectordeck.svg |1 +
 icon-themes/breeze_svg/cmd/32/inspectordeck.svg  |1 +
 icon-themes/breeze_svg/cmd/lc_inspectordeck.svg  |1 +
 icon-themes/breeze_svg/cmd/sc_inspectordeck.svg  |1 +
 icon-themes/colibre/cmd/32/inspectordeck.png |binary
 icon-themes/colibre/cmd/lc_inspectordeck.png |binary
 icon-themes/colibre/cmd/sc_inspectordeck.png |binary
 icon-themes/colibre_svg/cmd/32/inspectordeck.svg |1 +
 icon-themes/colibre_svg/cmd/lc_inspectordeck.svg |1 +
 icon-themes/colibre_svg/cmd/sc_inspectordeck.svg |1 +
 icon-themes/elementary/cmd/32/inspectordeck.png  |binary
 icon-themes/elementary/cmd/lc_inspectordeck.png  |binary
 icon-themes/elementary/cmd/sc_inspectordeck.png  |binary
 icon-themes/elementary_svg/cmd/32/inspectordeck.svg  |1 +
 icon-themes/elementary_svg/cmd/lc_inspectordeck.svg  |1 +
 icon-themes/elementary_svg/cmd/sc_inspectordeck.svg  |2 ++
 icon-themes/karasa_jaga/cmd/32/inspectordeck.png |binary
 icon-themes/karasa_jaga/cmd/lc_inspectordeck.png |binary
 icon-themes/karasa_jaga/cmd/sc_inspectordeck.png |binary
 icon-themes/karasa_jaga_svg/cmd/32/inspectordeck.svg |1 +
 icon-themes/karasa_jaga_svg/cmd/lc_inspectordeck.svg |1 +
 icon-themes/karasa_jaga_svg/cmd/sc_inspectordeck.svg |1 +
 icon-themes/sifr/cmd/32/inspectordeck.png|binary
 icon-themes/sifr/cmd/lc_inspectordeck.png|binary
 icon-themes/sifr/cmd/sc_inspectordeck.png|binary
 icon-themes/sifr_dark/cmd/32/inspectordeck.png   |binary
 icon-themes/sifr_dark/cmd/lc_inspectordeck.png   |binary
 icon-themes/sifr_dark/cmd/sc_inspectordeck.png   |binary
 icon-themes/sifr_dark_svg/cmd/32/inspectordeck.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/lc_inspectordeck.svg   |1 +
 icon-themes/sifr_dark_svg/cmd/sc_inspectordeck.svg   |1 +
 icon-themes/sifr_svg/cmd/32/inspectordeck.svg|1 +
 icon-themes/sifr_svg/cmd/lc_inspectordeck.svg|1 +
 icon-themes/sifr_svg/cmd/sc_inspectordeck.svg|1 +
 icon-themes/sukapura/cmd/32/inspectordeck.png|binary
 icon-themes/sukapura/cmd/lc_inspectordeck.png|binary
 icon-themes/sukapura/cmd/sc_inspectordeck.png|binary
 icon-themes/sukapura_svg/cmd/32/inspectordeck.svg|1 +
 icon-themes/sukapura_svg/cmd/lc_inspectordeck.svg|1 +
 icon-themes/sukapura_svg/cmd/sc_inspectordeck.svg|6 ++
 48 files changed, 30 insertions(+)

New commits:
commit 1625e8c4d65c488e0d6388cabeab10b8dc97db79
Author: Rizal Muttaqin 
AuthorDate: Fri Aug 21 08:34:09 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Fri Aug 21 07:35:03 2020 +0200

tdf#135028 icons for Style Inspector

Change-Id: I44bb391d6b2df48bde6df5f5e44fce8a9c48f0a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101124
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/breeze/cmd/32/inspectordeck.png 
b/icon-themes/breeze/cmd/32/inspectordeck.png
new file mode 100644
index ..99e6c63075a2
Binary files /dev/null and b/icon-themes/breeze/cmd/32/inspectordeck.png differ
diff --git a/icon-themes/breeze/cmd/lc_inspectordeck.png 
b/icon-themes/breeze/cmd/lc_inspectordeck.png
new file mode 100644
index ..3a67304dcde0
Binary files /dev/null and b/icon-themes/breeze/cmd/lc_inspectordeck.png differ
diff --git a/icon-themes/breeze/cmd/sc_inspectordeck.png 
b/icon-themes/breeze/cmd/sc_inspectordeck.png
new file mode 100644
index ..6cffa77c3b78
Binary files /dev/null and b/icon-themes/breeze/cmd/sc_inspectordeck.png differ
diff --git a/icon-themes/breeze_dark/cmd/32/inspectordeck.png 
b/icon-themes/breeze_dark/cmd/32/inspectordeck.png
new file mode 100644
index ..e35e62afb02a
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/32/inspectordeck.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/lc_inspectordeck.png 
b/icon-themes/breeze_dark/cmd/lc_inspectordeck.png
new file mode 100644
index ..f35150c39475
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_inspectordeck.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/sc_inspectordeck.png 
b/icon-themes/breeze_dark/cmd/sc_inspectordeck.png
new file mode 100644
index ..2fc538731888
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/sc_inspectordeck.png 
differ
diff --git a/icon-themes/breeze_dark_svg/cmd/32/insp

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8700bace8c0714d853f5df6918ab9c8bb3d81f77
Author: Olivier Hallot 
AuthorDate: Thu Aug 20 19:52:02 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Aug 21 00:52:02 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to d36d5b43e7274f678ce5fad89b42495fa6aed7e7
  - tdf#122148 Clarify master slide objects visibility

Change-Id: I7aeaad92aa6d46e82d83312808b0d9a542b0e76e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/101082
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 98dbecc36765..d36d5b43e727 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 98dbecc36765a4e82574db6e433ece4e8a5008d0
+Subproject commit d36d5b43e7274f678ce5fad89b42495fa6aed7e7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Olivier Hallot (via logerrit)]

 source/text/simpress/guide/footer.xhp |   29 +
 1 file changed, 13 insertions(+), 16 deletions(-)

New commits:
commit d36d5b43e7274f678ce5fad89b42495fa6aed7e7
Author: Olivier Hallot 
AuthorDate: Thu Aug 20 13:25:08 2020 -0300
Commit: Olivier Hallot 
CommitDate: Fri Aug 21 00:52:02 2020 +0200

tdf#122148 Clarify master slide objects visibility

Change-Id: I7aeaad92aa6d46e82d83312808b0d9a542b0e76e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/101082
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/simpress/guide/footer.xhp 
b/source/text/simpress/guide/footer.xhp
index 24fdae3bb..6f9e2d6be 100644
--- a/source/text/simpress/guide/footer.xhp
+++ b/source/text/simpress/guide/footer.xhp
@@ -1,7 +1,4 @@
 
-
-
-
 
-
-
-   
+
 
 
 Adding a Header or a Footer to All 
Slides
@@ -29,9 +24,6 @@
 
 
 
-  
-  
-  
 footers;master slides
 master slides; headers and footers
 headers and footers; master slides
@@ -42,8 +34,8 @@
 time and date on all slides
 
   mw changed "adding;" to "inserting;"
-  Adding a Header or a Footer to 
All Slides 
-
+  Adding a Header or a Footer to All Slides
+
   Every slide 
is based on a master slide. The text, pictures, tables, fields or other objects 
that you place on the master slide are visible as a background on all slides 
that are based on that master slide.
   Masters exist 
for slides, notes, and handouts. 
   
@@ -57,16 +49,17 @@
 To edit a 
master handout, click the Handout tab above the slide. Click the Normal tab to 
leave the master handout.

   
-  Adding predefined header or footer objects
+  Adding predefined header or footer objects
   see i53011
   Every type 
of master has some predefined areas to hold the date, footer, and slide 
numbers. 
   When you 
switch to the master view, you can move those areas to any position on the 
master. Also, you can enter additional text into them, resize them, and select 
their contents to apply text formatting. For example, you can change the font 
size or color.
-  A predefined 
Header Area is available only for notes and handouts. If you want a header on 
all slides, you can move the Footer Area on the master slide to the 
top.
+  A predefined Header Area is available only for notes 
and handouts. If you want a header on all slides, you can move the Footer Area 
on the master slide to the top.
   Objects that 
you insert on a master slide are visible on all slides that are based on that 
master slide.
   

 Choose 
Insert - Header and Footer.
 You see a 
dialog with two tab pages: Slides and Notes and 
Handouts where you can enter contents to the predefined 
areas.
+
 By 
default, the Date and Time checkbox is enabled, but the format is 
set to Fixed and the text input box is empty, so no date and time is visible on 
the slides.
 By default, 
the Footer checkbox is enabled, but the text input box is empty, 
so no footer is visible on the slides.
 By 
default, the Slide number checkbox is cleared, so no slide numbers 
are visible.
@@ -81,15 +74,19 @@

 Click the 
Date Area and move the time and date field. Select the  field 
and apply some formatting to change the format for the date and time on all 
slides. The same applies to the Footer Area and the Slide Number 
Area.

+   
+Normally the 
predefined elements of the Master side are set to visible in the presentation. 
You can control the visibility of the predefined elements by choosing 
Slide - Master Elements.
+   
+   
   
-  Adding text objects as header or footer objects
+  Adding text objects as header or footer objects
   You can add 
a text object anywhere on the master slide.
   

 Choose 
View - Master Slide.


-On the 
Drawing bar, select the Text icon 
+On the 
Drawing bar, select the Text icon
 Icon
.

@@ -100,7 +97,7 @@
 Choose 
View - Normal when you are finished.

   
-  You can also add 
fields, such as the date or page number, to a header or footer by choosing 
Insert - Field.
+  You can also add fields, such as the date or page 
number, to a header or footer by choosing Insert - Field.
   


___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

3 new defect(s) introduced to LibreOffice found with Coverity Scan.
9 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 3 of 3 defect(s)


** CID 1466206:  Uninitialized members  (UNINIT_CTOR)
/vcl/source/fontsubset/sft.cxx: 1482 in vcl::TrueTypeFont::TrueTypeFont(const 
char *)()



*** CID 1466206:  Uninitialized members  (UNINIT_CTOR)
/vcl/source/fontsubset/sft.cxx: 1482 in vcl::TrueTypeFont::TrueTypeFont(const 
char *)()
1476 , subfamily(nullptr)
1477 , usubfamily(nullptr)
1478 , ntables(0)
1479 , cmap(nullptr)
1480 , cmapType(0)
1481 {
>>> CID 1466206:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "mapper" is not initialized in this constructor 
>>> nor in any functions that it calls.
1482 }
1483 
1484 TrueTypeFont::~TrueTypeFont()
1485 {
1486 #if !defined(_WIN32)
1487 if (fileName())

** CID 1466205:  Control flow issues  (DEADCODE)
/sc/source/ui/drawfunc/fuins1.cxx: 414 in 
FuInsertMedia::FuInsertMedia(ScTabViewShell &, vcl::Window *, ScDrawView *, 
SdrModel *, const SfxRequest &)()



*** CID 1466205:  Control flow issues  (DEADCODE)
/sc/source/ui/drawfunc/fuins1.cxx: 414 in 
FuInsertMedia::FuInsertMedia(ScTabViewShell &, vcl::Window *, ScDrawView *, 
SdrModel *, const SfxRequest &)()
408 if( !::avmedia::MediaWindow::isMediaURL( aURL, ""/*TODO?*/, true, 
&aPrefSize ) )
409 {
410 if( pWin )
411 pWin->LeaveWait();
412 
413 if( !bAPI )
>>> CID 1466205:  Control flow issues  (DEADCODE)
>>> Execution cannot reach the expression "executeFormatErrorBox" inside 
>>> this statement: "avmedia::MediaWindow::execu...".
414 ::avmedia::MediaWindow::executeFormatErrorBox(pWindow ? 
pWindow->GetFrameWeld() : nullptr);
415 }
416 else
417 #endif
418 {
419 lcl_InsertMedia( aURL, bAPI, &rViewSh, pWindow, pView, 
aPrefSize,

** CID 1466204:  Error handling issues  (CHECKED_RETURN)
/filter/source/msfilter/escherex.cxx: 697 in 
EscherPropertyContainer::CreateTextProperties(const 
com::sun::star::uno::Reference &, unsigned 
int, bool, bool)()



*** CID 1466204:  Error handling issues  (CHECKED_RETURN)
/filter/source/msfilter/escherex.cxx: 697 in 
EscherPropertyContainer::CreateTextProperties(const 
com::sun::star::uno::Reference &, unsigned 
int, bool, bool)()
691 // used with ashapes:
692 bool bWordWrap  ( false );
693 bool bAutoGrowSize  ( false );
694 
695 uno::Any aTextWrap;
696 
>>> CID 1466204:  Error handling issues  (CHECKED_RETURN)
>>> Calling "GetPropertyValue" without checking return value (as is done 
>>> elsewhere 36 out of 37 times).
697 EscherPropertyValueHelper::GetPropertyValue(aTextWrap, rXPropSet, 
"TextWrap", true);
698 
699 if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
"TextWritingMode", true ) )
700 aAny >>= eWM;
701 if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
"TextVerticalAdjust", true ) )
702 aAny >>= eVA;



To view the defects in Coverity Scan visit, 
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3DQJFt_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJitL6hbzJTuudawmxwn8rYJ9nhUe6GxyteRKPfywzEybGxoKlEGgqBLishMpMhTdLDd9B-2BLNZK7NoZKFAjVaKZiwk9HhJOfh2TGm-2BPJnwD50IgFNMxmaosMXl9Ssv0nQ2HscQ-2BtBlQ8vzRhvQGf1QZZzcJvw3a51Y7vIqn-2F3i1Xd9eTh9MCkyG8CqCVccsBbol

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: New build

[anshu khare]

The new changes include simply adding a printf statement and it's not
working.



On Fri, 21 Aug, 2020, 1:10 AM anshu khare,  wrote:

> Hi
>
>
>
> I checked git status and I could clearly see modified files.
>
> So I restored them all.
>
> Then I again went to the build folder in C drive. I saw that the changes
> to the code which I did in the the first build were gone.
>
> Then I again built the debug version on libreoffice.sln in visual Studio.
>
> I saw that though the changes in the code were removed but they were still
> present in the build.
>
> Also the new changes which I am doing now in the code aren't visible in
> the build.
>
> P. S : I was working on master branch.
>  Also, when building libreoffice through cygwin, I didn't gave
> --enable-debug or --enable-debug-util in autogen.sh
>
> Could this be a possible reason?
>
>
> On Thu, 20 Aug, 2020, 11:20 PM Shivam Kumar Singh, <
> shivamhere...@gmail.com> wrote:
>
>>
>>
>> On Thu, 20 Aug 2020 at 22:41, anshu khare  wrote:
>>
>>>
>>> I basically ran autogen.sh , /opt/lo/bin/make gb_color=1,
>>> instdir/program/soffice.exe, and /opt/lo/bin/make vs2019-ide-integration
>>> again on Cygwin.
>>>
>>
>> You don't need to run autogen.sh every time. That is only for the first
>> build. The normal workflow is to make a new branch -> do your required
>> changes -> make
>>
>> Then I went to build folder in C drive of my pc. There I found
>>> Libreoffice.sln
>>>
>>> I opened it and built the debug version.
>>> I found that the changes which were made during first build were
>>> reflected in this built.
>>> The changes which I made earlier in the code during my first build were
>>> present this time as well.
>>>
>> I undid the changes in the code. But that didn't affect the changes in
>>> built.
>>>
>>
>> Are you sure? run "git status" to check if you have some
>> uncommitted changes or
>> perhaps if you are working on a separate branch from master do "git diff
>> master ... your_branch_name". (do not forget the "...")
>>
>> regards,
>> Shivam Kumar Singh
>>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Output of printf

[anshu khare]

Hi

I was having my end term exams. So I couldn't be active at that time.

I added breakpoints but they showing the message "Break point will not be
hit. No symbols loaded for this document in visual studio".

To remove it, I tried to follow this:

https://www.youtube.com/watch?v=h_vk0ZYMBVc

But I it didn't work.

P. S : When I was building libreoffice through Cygwin, I didn't pass the
command --enable-debug or --enable-debugutil in autogen.sh

Could that be a possible reason?


On Wed, 29 Jul, 2020, 1:53 AM Mike Kaganski, 
wrote:

> On 28.07.2020 22:18, anshu khare wrote:
> > I need to print some numerical value whose formula I am working on. I
> need
> > to check if the formula is correct.
> >
> > That's why I asked for printing the output on console.
> >
> > Breakpoints won't serve the purpose, I guess.
>
> I totally don't see why. Breakpoint may allow you to examine values; or
> to print values - as I wrote in my initial answer; without any need to
> modify the code and compile the changes.
>
> See
> https://docs.microsoft.com/en-us/visualstudio/debugger/using-tracepoints
>
> --
> Best regards,
> Mike Kaganski
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - wsd/ProofKey.cpp wsd/ProofKey.hpp

[Michael Meeks (via logerrit)]

 wsd/ProofKey.cpp |3 ++-
 wsd/ProofKey.hpp |5 +
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 417dfd7df14a83358ca0523443d2adcfa81b5d60
Author: Michael Meeks 
AuthorDate: Thu Aug 20 16:46:05 2020 +0100
Commit: Mike Kaganski 
CommitDate: Thu Aug 20 23:03:28 2020 +0200

Avoid contention on RSA Digest engine.

Change-Id: If9068371c7ab18083d432f8bc582d85c2f85e80e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101081
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit cd98388653d9038e8918f1a1431a4c836b1adcb9)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101062
Reviewed-by: Mike Kaganski 

diff --git a/wsd/ProofKey.cpp b/wsd/ProofKey.cpp
index c7df1afe1..1fdfc5eca 100644
--- a/wsd/ProofKey.cpp
+++ b/wsd/ProofKey.cpp
@@ -252,7 +252,8 @@ std::vector Proof::GetProof(const 
std::string& access_token, cons
 std::string Proof::SignProof(const std::vector& proof) const
 {
 assert(m_pKey);
-static Poco::Crypto::RSADigestEngine digestEngine(*m_pKey, "SHA256");
+// One per DocumentBroker that uses this via WopiStorage
+static thread_local Poco::Crypto::RSADigestEngine digestEngine(*m_pKey, 
"SHA256");
 digestEngine.reset();
 digestEngine.update(proof.data(), proof.size());
 return BytesToBase64(digestEngine.signature());
diff --git a/wsd/ProofKey.hpp b/wsd/ProofKey.hpp
index 34dd98e12..5efc79aeb 100644
--- a/wsd/ProofKey.hpp
+++ b/wsd/ProofKey.hpp
@@ -27,6 +27,11 @@ namespace Poco {
 
 class WopiProofTests;
 
+/**
+ * Global singleton - with one-time loaded key data
+ * loaded at startup, and then un-modified & shared
+ * across threads.
+ */
 class Proof {
 friend class WopiProofTests;
 void initialize();
___
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' - sc/source

[Eike Rathke (via logerrit)]

 sc/source/core/tool/interpr8.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2f4653f69103ff38324b26e7ba146de8121ad4d5
Author: Eike Rathke 
AuthorDate: Thu Aug 20 01:12:05 2020 +0200
Commit: Caolán McNamara 
CommitDate: Thu Aug 20 22:51:19 2020 +0200

Resolves: tdf#109409 TEXTJOIN() CONCAT() handle array/matrix row-wise

... like references, instead of column-wise.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101034
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit ff3955db7161b8644699d7a0128ec4a6e7e525ec)

 merge conflicts: sc/source/core/tool/interpr8.cxx

Change-Id: If3ada9b197dd15c95b0da50464c70844fb7685ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101052
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index 9fc1e799884a..92ea9ab1ac11 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -1474,9 +1474,9 @@ void ScInterpreter::ScConcat_MS()
 SetError(FormulaError::IllegalArgument);
 else
 {
-for ( SCSIZE j = 0; j < nC; j++ )
+for (SCSIZE k = 0; k < nR; ++k)
 {
-for (SCSIZE k = 0; k < nR; k++ )
+for (SCSIZE j = 0; j < nC; ++j)
 {
 if ( pMat->IsStringOrEmpty( j, k ) )
 {
@@ -1602,9 +1602,9 @@ void ScInterpreter::ScTextJoin_MS()
 SetError(FormulaError::IllegalArgument);
 else
 {
-for ( SCSIZE j = 0; j < nC; j++ )
+for (SCSIZE k = 0; k < nR; ++k)
 {
-for (SCSIZE k = 0; k < nR; k++ )
+for (SCSIZE j = 0; j < nC; ++j)
 {
 if ( !pMat->IsEmpty( j, k ) )
 {
@@ -1782,9 +1782,9 @@ void ScInterpreter::ScTextJoin_MS()
 else
 {
 OUString aStr;
-for ( SCSIZE j = 0; j < nC; j++ )
+for (SCSIZE k = 0; k < nR; ++k)
 {
-for (SCSIZE k = 0; k < nR; k++ )
+for (SCSIZE j = 0; j < nC; ++j)
 {
 if ( !pMat->IsEmpty( j, k ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/fontsubset/sft.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b93a294a38b6810aa5b871e02b851bb7e356515d
Author: Caolán McNamara 
AuthorDate: Thu Aug 20 20:18:17 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 20 22:47:10 2020 +0200

cid#1466206 Uninitialized pointer field

Change-Id: Ib694d3a43dd9bc5a430124d9c95128c4c15e3c57
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101088
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 7de35fa3c088..3f7d96945873 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1478,6 +1478,7 @@ TrueTypeFont::TrueTypeFont(const char* pFileName)
 , ntables(0)
 , cmap(nullptr)
 , cmapType(0)
+, mapper(nullptr)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source solenv/gbuild ucbhelper/source

[Stephan Bergmann (via logerrit)]

 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx |6 ++
 connectivity/source/sdbcx/VCollection.cxx  |5 ++---
 solenv/gbuild/gbuild.mk|1 -
 ucbhelper/source/client/content.cxx|7 ++-
 4 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 7281c497dec340efbcef330d88b55bcabefb8147
Author: Stephan Bergmann 
AuthorDate: Thu Aug 20 21:26:13 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Aug 20 22:27:48 2020 +0200

Use OSL_UNREACHABLE

...in those places that used some code conditional on ENABLE_LTO to work 
around
(non-)unreachability wranings.  This removes all uses of the ENABLE_LTO 
C/C++
macro, so it can go completely.

Change-Id: I67544986cb2d3fcd8051caf87c5129bd1086408c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101087
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx 
b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 969a1f1e1f4f..ffc0feb75a8b 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace connectivity;
@@ -169,10 +170,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( 
const OUString& colum
 }
 
 ::dbtools::throwInvalidColumnException( columnName, *this );
-#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
-assert(false);
-return 0; // Never reached
-#endif
+O3TL_UNREACHABLE;
 }
 
 void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex )
diff --git a/connectivity/source/sdbcx/VCollection.cxx 
b/connectivity/source/sdbcx/VCollection.cxx
index d7a716a59839..860ead949074 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -434,9 +435,7 @@ sal_Int32 SAL_CALL OCollection::findColumn( const OUString& 
columnName )
 if ( !m_pElements->exists(columnName) )
 {
 ::dbtools::throwInvalidColumnException( columnName, static_cast< 
XIndexAccess*>(this) );
-#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
-assert(false);
-#endif
+O3TL_UNREACHABLE;
 }
 
 return m_pElements->findColumn(columnName) + 1; // because columns start 
at one
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 64ca8184e2fa..999f5f79fa37 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -251,7 +251,6 @@ endif
 gb_GLOBALDEFS += \
$(call gb_Helper_define_if_set,\
DISABLE_DYNLOADING \
-   ENABLE_LTO \
)
 
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
diff --git a/ucbhelper/source/client/content.cxx 
b/ucbhelper/source/client/content.cxx
index 8d01366d3ffc..887658755be8 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -21,6 +21,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -1013,11 +1014,7 @@ bool Content::isFolder()
 get() ) ),
  m_xImpl->getEnvironment() );
 
-#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
-// Unreachable - cancelCommandExecution always throws an exception.
-// But some compilers complain...
-return false;
-#endif
+O3TL_UNREACHABLE;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf123390.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx|   24 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 -
 3 files changed, 29 insertions(+), 1 deletion(-)

New commits:
commit 4d9b72d1c3929eca04c7a2e363ab6214676b0f64
Author: László Németh 
AuthorDate: Thu Aug 20 19:41:00 2020 +0200
Commit: László Németh 
CommitDate: Thu Aug 20 22:05:28 2020 +0200

tdf#123390 DOCX import: fix SIGN formula

Convert SIGN(x) to the equivalent, but
portable Writer formula (0 < x) - (x < 0).

Note: this is a temporary conversion, which
supports only 1-level nesting of function calls.
Adding SIGN to Writer core, it will be possible
to remove portable conversion later.

Change-Id: I88853fe865808427c966b8570a052b101fecdac0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101085
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf123390.docx 
b/sw/qa/extras/ooxmlexport/data/tdf123390.docx
new file mode 100644
index ..c3591dbfd2e6
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123390.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index cd3dc8021f2a..c9cc9bd617c3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -91,6 +91,30 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123354, "tdf123354.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("233423"), 
xEnumerationAccess3->getPresentation(false).trim());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf123390, "tdf123390.docx")
+{
+// Tests cell formula SIGN(x) to (0 < x) - (x < 0) conversion
+uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference 
xFields(xFieldsAccess->createEnumeration());
+
+uno::Reference 
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("((0 L (-11)) - ((-11) L 0))"), 
xEnumerationAccess1->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("-1"), 
xEnumerationAccess1->getPresentation(false).trim());
+
+uno::Reference 
xEnumerationAccess4(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("((0 L ()) - (() L 0))"), 
xEnumerationAccess4->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("0"), 
xEnumerationAccess4->getPresentation(false).trim());
+
+uno::Reference 
xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("((0 L (0)) - ((0) L 0))"), 
xEnumerationAccess3->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("0"), 
xEnumerationAccess3->getPresentation(false).trim());
+
+uno::Reference 
xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("((0 L ()) - (() L 0))"), 
xEnumerationAccess2->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("1"), 
xEnumerationAccess2->getPresentation(false).trim());
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf98000_changePageStyle, 
"tdf98000_changePageStyle.odt")
 {
 uno::Reference xModel(mxComponent, uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d720e53a2a53..b5a8f124c142 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4264,10 +4264,14 @@ OUString DomainMapper_Impl::convertFieldFormula(const 
OUString& input) {
 icu::RegexMatcher rmatch5("\\bDEFINED\\s*\\(<([A-Z]+[0-9]+)>\\)", usInput, 
rMatcherFlags, status);
 usInput = rmatch5.replaceAll(icu::UnicodeString("DEFINED($1)"), status);
 
-/* Fix up ABS(x) using SQRT(x POW 2) - it supports only 1-level nesting */
+/* Fix up ABS(x) using SQRT(x POW 2) (it supports only 1-level nesting) */
 icu::RegexMatcher 
rmatch6("\\bABS\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput, 
rMatcherFlags, status);
 usInput = rmatch6.replaceAll(icu::UnicodeString("SQRT($1 POW 2)"), status);
 
+/* Fix up SIGN(x) using (0 < x) - (x < 0) (it supports only 1-level 
nesting) */
+icu::RegexMatcher 
rmatch7("\\bSIGN\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput, 
rMatcherFlags, status);
+usInput = rmatch7.replaceAll(icu::UnicodeString("((0 L $1) - ($1 L 0))"), 
status);
+
 return OUString(usInput.getTerminatedBuffer());
 }
 
___
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-1' - cui/source include/unotools unotools/source

[Mike Kaganski (via logerrit)]

 cui/source/dialogs/about.cxx |   17 +
 include/unotools/bootstrap.hxx   |3 ---
 unotools/source/config/bootstrap.cxx |   11 ---
 3 files changed, 5 insertions(+), 26 deletions(-)

New commits:
commit 37f452bc2beeae9b4648013a3bf4f2e8b56c0c85
Author: Mike Kaganski 
AuthorDate: Tue Aug 18 22:23:30 2020 +0300
Commit: Stephan Bergmann 
CommitDate: Thu Aug 20 21:40:19 2020 +0200

tdf#135133: Don't try to read BuildVersion

The option to set it was removed in 
5fdf2009d21fa220dfee70ea755bd698c16257a7,
and now the check is redundant - and even harmful until the remnants of the
setting is dropped from bootstrap.ini. Currently the dummy value found there
makes the About dialog miss the build id, and copying info to clipboard 
gives
 instead of proper build id. Previously the string was always
empty in most builds (including TDF), which made the code proceed to 
buildid.

Bootstrap::getBuildVersion got unused now, and is removed.

Change-Id: If59e456655da29bb9421edc0e15d421829d0a02b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100957
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100975
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 0a796797ddfe2d1913ac91908074c397cf7c9c82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101056
Reviewed-by: Christian Lohmaier 
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index efeef5a9c002..917e5f4bd30d 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -19,7 +19,6 @@
 
 #include 
 
-#include //OSL_ENSURE
 #include  //osl_getProcessLocale
 #include  //rtl::isAsciiHexDigit
 #include//SAL_WARN
@@ -34,7 +33,7 @@
 #include  //SfxApplication::loadBrandSvg
 #include 
 #include 
-#include  //utl::Bootstrap::getBuildVersion
+#include  //utl::Bootstrap::getBuildIdData
 #include  //ConfigManager::
 
 #include 
@@ -155,16 +154,10 @@ OUString AboutDialog::GetVersionString() {
   return sVersion;
 }
 
-OUString AboutDialog::GetBuildString() {
-
-  OUString sDefault;
-  OUString sBuildId(utl::Bootstrap::getBuildVersion(sDefault));
-  if (sBuildId.isEmpty())
-sBuildId = utl::Bootstrap::getBuildIdData(sDefault);
-  if (sBuildId.isEmpty()) {
-sBuildId = sBuildId.getToken(0, '-');
-  }
-  OSL_ENSURE(!sBuildId.isEmpty(), "No BUILDID in bootstrap file");
+OUString AboutDialog::GetBuildString()
+{
+  OUString sBuildId(utl::Bootstrap::getBuildIdData(""));
+  SAL_WARN_IF(!sBuildId.isEmpty(), "cui.dialogs", "No BUILDID in bootstrap 
file");
 
   return sBuildId;
 }
diff --git a/include/unotools/bootstrap.hxx b/include/unotools/bootstrap.hxx
index 447c33b64942..3f87741408c4 100644
--- a/include/unotools/bootstrap.hxx
+++ b/include/unotools/bootstrap.hxx
@@ -46,9 +46,6 @@ namespace utl
 /// retrieve the BUILDID information item; uses the given default, if 
not found
 static OUString getBuildIdData(OUString const& _sDefault);
 
-/// retrieve the BuildVersion information item; uses the given 
default, if not found
-static OUString getBuildVersion(OUString const& _sDefault);
-
 /// reload cached data
 static void reloadData();
 
diff --git a/unotools/source/config/bootstrap.cxx 
b/unotools/source/config/bootstrap.cxx
index 459d8e518945..a6c8eb228067 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -37,7 +37,6 @@
 #define BOOTSTRAP_ITEM_PRODUCT_KEY  "ProductKey"
 #define BOOTSTRAP_ITEM_VERSIONFILE  "Location"
 #define BOOTSTRAP_ITEM_BUILDID  "buildid"
-#define BOOTSTRAP_ITEM_BUILDVERSION "BuildVersion"
 
 #define BOOTSTRAP_ITEM_BASEINSTALLATION "BRAND_BASE_DIR"
 #define BOOTSTRAP_ITEM_USERINSTALLATION "UserInstallation"
@@ -546,16 +545,6 @@ OUString Bootstrap::getProductKey(OUString const& 
_sDefault)
 return data().getBootstrapValue( csProductKeyItem, _sDefault );
 }
 
-OUString Bootstrap::getBuildVersion(OUString const& _sDefault)
-{
-OUString const csBuildVersionItem(BOOTSTRAP_ITEM_BUILDVERSION);
-
-OUString sBuildVersion;
-// read BuildVersion from version.ini (versionrc)
-utl::Bootstrap::Impl::getVersionValue( csBuildVersionItem, sBuildVersion, 
_sDefault );
-return sBuildVersion;
-}
-
 OUString Bootstrap::getBuildIdData(OUString const& _sDefault)
 {
 OUString const csBuildIdItem(BOOTSTRAP_ITEM_BUILDID);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New build

[anshu khare]

Hi



I checked git status and I could clearly see modified files.

So I restored them all.

Then I again went to the build folder in C drive. I saw that the changes to
the code which I did in the the first build were gone.

Then I again built the debug version on libreoffice.sln in visual Studio.

I saw that though the changes in the code were removed but they were still
present in the build.

Also the new changes which I am doing now in the code aren't visible in the
build.

P. S : I was working on master branch.
 Also, when building libreoffice through cygwin, I didn't gave
--enable-debug or --enable-debug-util in autogen.sh

Could this be a possible reason?


On Thu, 20 Aug, 2020, 11:20 PM Shivam Kumar Singh, 
wrote:

>
>
> On Thu, 20 Aug 2020 at 22:41, anshu khare  wrote:
>
>>
>> I basically ran autogen.sh , /opt/lo/bin/make gb_color=1,
>> instdir/program/soffice.exe, and /opt/lo/bin/make vs2019-ide-integration
>> again on Cygwin.
>>
>
> You don't need to run autogen.sh every time. That is only for the first
> build. The normal workflow is to make a new branch -> do your required
> changes -> make
>
> Then I went to build folder in C drive of my pc. There I found
>> Libreoffice.sln
>>
>> I opened it and built the debug version.
>> I found that the changes which were made during first build were
>> reflected in this built.
>> The changes which I made earlier in the code during my first build were
>> present this time as well.
>>
> I undid the changes in the code. But that didn't affect the changes in
>> built.
>>
>
> Are you sure? run "git status" to check if you have some
> uncommitted changes or
> perhaps if you are working on a separate branch from master do "git diff
> master ... your_branch_name". (do not forget the "...")
>
> regards,
> Shivam Kumar Singh
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/inc sc/source

[Eike Rathke (via logerrit)]

 sc/inc/scmatrix.hxx  |2 +-
 sc/source/core/tool/interpr1.cxx |6 +-
 sc/source/core/tool/scmatrix.cxx |   30 +++---
 3 files changed, 29 insertions(+), 9 deletions(-)

New commits:
commit 64e19525eebd0974f1609300d95a74c1e083e8e3
Author: Eike Rathke 
AuthorDate: Thu Aug 20 18:53:02 2020 +0200
Commit: Eike Rathke 
CommitDate: Thu Aug 20 19:57:30 2020 +0200

Follow-up: tdf#132105 COUNTBLANK() count empty strings also in array/matrix

For Excel interoperability this somewhat is a *visual* blank,
unlike ISBLANK() empty strings are counted as blanks. An empty
string in a matrix can be either a formula result transformed to
matrix, or literal input in an inline array. There's no way to
differentiate the origin.

Change-Id: Ib799e95517d95e1a7c28fc4335bd0040f3629ad1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101083
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 2efa73c4a975..e9a71e82b94d 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -365,7 +365,7 @@ public:
 IterateResult Sum( bool bTextAsZero, bool bIgnoreErrorValues = false ) 
const ;
 IterateResult SumSquare( bool bTextAsZero, bool bIgnoreErrorValues = false 
) const ;
 IterateResult Product( bool bTextAsZero, bool bIgnoreErrorValues = false ) 
const ;
-size_t Count(bool bCountStrings, bool bCountErrors) const ;
+size_t Count(bool bCountStrings, bool bCountErrors, bool 
bIgnoreEmptyStrings = false) const ;
 size_t MatchDoubleInColumns(double fValue, size_t nCol1, size_t nCol2) 
const ;
 size_t MatchStringInColumns(const svl::SharedString& rStr, size_t nCol1, 
size_t nCol2) const ;
 
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f0e05b08795f..e76531eb031b 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5183,7 +5183,11 @@ void ScInterpreter::ScCountEmptyCells()
 SCSIZE nC, nR;
 xMat->GetDimensions( nC, nR);
 nMaxCount = nC * nR;
-nCount = xMat->Count( true, true);  // numbers (implicit), 
strings and error values
+// Numbers (implicit), strings and error values, ignore empty
+// strings as those if not entered in an inline array are the
+// result of a formula, to be par with a reference to formula
+// cell as *visual* blank, see isCellContentEmpty() above.
+nCount = xMat->Count( true, true, true);
 }
 }
 break;
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 7f1d915ec6c7..e841cdfdc13d 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -311,7 +311,7 @@ public:
 ScMatrix::IterateResult Sum( bool bTextAsZero, bool bIgnoreErrorValues ) 
const;
 ScMatrix::IterateResult SumSquare( bool bTextAsZero, bool 
bIgnoreErrorValues ) const;
 ScMatrix::IterateResult Product( bool bTextAsZero, bool bIgnoreErrorValues 
) const;
-size_t Count(bool bCountStrings, bool bCountErrors) const;
+size_t Count(bool bCountStrings, bool bCountErrors, bool 
bIgnoreEmptyStrings) const;
 size_t MatchDoubleInColumns(double fValue, size_t nCol1, size_t nCol2) 
const;
 size_t MatchStringInColumns(const svl::SharedString& rStr, size_t nCol1, 
size_t nCol2) const;
 
@@ -1297,9 +1297,11 @@ class CountElements
 size_t mnCount;
 bool mbCountString;
 bool mbCountErrors;
+bool mbIgnoreEmptyStrings;
 public:
-explicit CountElements(bool bCountString, bool bCountErrors) :
-mnCount(0), mbCountString(bCountString), mbCountErrors(bCountErrors) {}
+explicit CountElements(bool bCountString, bool bCountErrors, bool 
bIgnoreEmptyStrings) :
+mnCount(0), mbCountString(bCountString), mbCountErrors(bCountErrors),
+mbIgnoreEmptyStrings(bIgnoreEmptyStrings) {}
 
 size_t getCount() const { return mnCount; }
 
@@ -1327,7 +1329,21 @@ public:
 break;
 case mdds::mtm::element_string:
 if (mbCountString)
+{
 mnCount += node.size;
+if (mbIgnoreEmptyStrings)
+{
+typedef MatrixImplType::string_block_type block_type;
+
+block_type::const_iterator it = 
block_type::begin(*node.data);
+block_type::const_iterator itEnd = 
block_type::end(*node.data);
+for (; it != itEnd; ++it)
+{
+if (it->isEmpty())
+--mnCount;
+}
+}
+}
 break;
 case mdds::mtm::element_empty:
 default:
@@ -2117,9 +2133,9 @@ ScMatrix::IterateResult ScMatrixImpl::Prod

Re: New build

[Shivam Kumar Singh]

On Thu, 20 Aug 2020 at 22:41, anshu khare  wrote:

>
> I basically ran autogen.sh , /opt/lo/bin/make gb_color=1,
> instdir/program/soffice.exe, and /opt/lo/bin/make vs2019-ide-integration
> again on Cygwin.
>

You don't need to run autogen.sh every time. That is only for the first
build. The normal workflow is to make a new branch -> do your required
changes -> make

Then I went to build folder in C drive of my pc. There I found
> Libreoffice.sln
>
> I opened it and built the debug version.
> I found that the changes which were made during first build were reflected
> in this built.
> The changes which I made earlier in the code during my first build were
> present this time as well.
>
I undid the changes in the code. But that didn't affect the changes in
> built.
>

Are you sure? run "git status" to check if you have some
uncommitted changes or
perhaps if you are working on a separate branch from master do "git diff
master ... your_branch_name". (do not forget the "...")

regards,
Shivam Kumar Singh
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: New build

[anshu khare]

When I built libreoffice earlier I did some changes in the code.


I built libreoffice again using this link.

https://wiki.documentfoundation.org/Development/BuildingOnWindows

I didn't build from scratch.

I basically ran autogen.sh , /opt/lo/bin/make gb_color=1,
instdir/program/soffice.exe, and /opt/lo/bin/make vs2019-ide-integration
again on Cygwin.

Then I went to build folder in C drive of my pc. There I found
Libreoffice.sln

I opened it and built the debug version.
I found that the changes which were made during first build were reflected
in this built.
The changes which I made earlier in the code during my first build were
present this time as well.
I undid the changes in the code. But that didn't affect the changes in
built.


On Thu, 20 Aug, 2020, 9:00 PM Ilmari Lauhakangas, <
ilmari.lauhakan...@libreoffice.org> wrote:

> anshu khare kirjoitti 20.8.2020 klo 18.23:
> > Hi
> >
> > I was having my end-term exams. So I couldn't be active during that time.
> >
> > Recently, I installed libreoffice again on windows. But when I built it,
> > I saw that the previously installed libreoffice was getting built rather
> > than the new one.
> >
> > Could someone help me in building the newly installed libreoffice?
> > Do I have to give some specific commands in cygwin to first uninstall
> > the previous version and then install the new one for it to work
> properly?
>
> I don't understand what you mean by talking about installing LibreOffice
> and then proceeding to build it. Are you referring to doing a
> development environment setup from scratch? Please give more details,
> the exact steps on how you got where you are now. It is impossible to
> comment otherwise.
>
> Ilmari
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: New build

[anshu khare]

When I built libreoffice earlier I did some changes in the code.


I built libreoffice again using this link.

https://wiki.documentfoundation.org/Development/BuildingOnWindows

I didn't build from scratch.

I basically ran autogen.sh , /opt/lo/bin/make gb_color=1,
instdir/program/soffice.exe, and /opt/lo/bin/make vs2019-ide-integration
again on Cygwin.

Then I went to build folder in C drive of my pc. There I found
Libreoffice.sln

I opened it and built the debug version.
I found that the changes which were made during first build were reflected
in this built.
The changes which I made earlier in the code during my first build were
present this time as well.
I undid the changes in the code. But that didn't affect the changes in
built.


On Thu, 20 Aug, 2020, 9:00 PM Ilmari Lauhakangas, <
ilmari.lauhakan...@libreoffice.org> wrote:

> anshu khare kirjoitti 20.8.2020 klo 18.23:
> > Hi
> >
> > I was having my end-term exams. So I couldn't be active during that time.
> >
> > Recently, I installed libreoffice again on windows. But when I built it,
> > I saw that the previously installed libreoffice was getting built rather
> > than the new one.
> >
> > Could someone help me in building the newly installed libreoffice?
> > Do I have to give some specific commands in cygwin to first uninstall
> > the previous version and then install the new one for it to work
> properly?
>
> I don't understand what you mean by talking about installing LibreOffice
> and then proceeding to build it. Are you referring to doing a
> development environment setup from scratch? Please give more details,
> the exact steps on how you got where you are now. It is impossible to
> comment otherwise.
>
> Ilmari
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Eike Rathke (via logerrit)]

 sc/source/core/tool/interpr1.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 70126c3eb7a532b5f1e852d9ac81d0ece6edf0c3
Author: Eike Rathke 
AuthorDate: Thu Aug 20 17:32:25 2020 +0200
Commit: Eike Rathke 
CommitDate: Thu Aug 20 18:38:41 2020 +0200

Resolves: tdf#132105 COUNTBLANK() handle external references and 
array/matrix

Change-Id: I6f39c67a20c0d683da9f14775ce8cbddf2f92349
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101079
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 783dfd2849bb..f0e05b08795f 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5171,6 +5171,22 @@ void ScInterpreter::ScCountEmptyCells()
 }
 }
 break;
+case svMatrix:
+case svExternalSingleRef:
+case svExternalDoubleRef:
+{
+ScMatrixRef xMat = GetMatrix();
+if (!xMat)
+SetError( FormulaError::IllegalParameter);
+else
+{
+SCSIZE nC, nR;
+xMat->GetDimensions( nC, nR);
+nMaxCount = nC * nR;
+nCount = xMat->Count( true, true);  // numbers (implicit), 
strings and error values
+}
+}
+break;
 default : SetError(FormulaError::IllegalParameter); break;
 }
 if (xResMat)
___
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/skia

[Luboš Luňák (via logerrit)]

 vcl/skia/gdiimpl.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit c746693ffc1a47f668fcbb8af6f0a8ef2f1648d8
Author: Luboš Luňák 
AuthorDate: Wed Aug 19 12:44:07 2020 +0200
Commit: Caolán McNamara 
CommitDate: Thu Aug 20 18:24:06 2020 +0200

ensure that polygons that are just a line are drawn by Skia (tdf#135490)

Skia doesn't fill polygons that are really just a line, because they
are considered empty (width or height are zero). But LO apparently
requires those to be drawn, so ensure so.

Change-Id: I94f090874c91472ad23993ef095550c7bdf7374a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100985
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 6c703220ff3d7c3931ec324143342b03858c8eea)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101055
Reviewed-by: Caolán McNamara 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 7b69df95936f..b27ef0c7f488 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -641,6 +641,10 @@ void SkiaSalGraphicsImpl::privateDrawAlphaRect(long nX, 
long nY, long nWidth, lo
 {
 paint.setColor(toSkColorWithTransparency(mFillColor, fTransparency));
 paint.setStyle(SkPaint::kFill_Style);
+// HACK: If the polygon is just a line, it still should be drawn. But 
when filling
+// Skia doesn't draw empty polygons, so in that case ensure the line 
is drawn.
+if (mLineColor == SALCOLOR_NONE && SkSize::Make(nWidth, 
nHeight).isEmpty())
+paint.setStyle(SkPaint::kStroke_Style);
 canvas->drawIRect(SkIRect::MakeXYWH(nX, nY, nWidth, nHeight), paint);
 }
 if (mLineColor != SALCOLOR_NONE)
@@ -649,7 +653,7 @@ void SkiaSalGraphicsImpl::privateDrawAlphaRect(long nX, 
long nY, long nWidth, lo
 paint.setStyle(SkPaint::kStroke_Style);
 // The obnoxious "-1 DrawRect()" hack that I don't understand the 
purpose of (and I'm not sure
 // if anybody does), but without it some cases do not work. The max() 
is needed because Skia
-// will not drawn anything if width or height is 0.
+// will not draw anything if width or height is 0.
 canvas->drawIRect(
 SkIRect::MakeXYWH(nX, nY, std::max(1L, nWidth - 1), std::max(1L, 
nHeight - 1)), paint);
 }
@@ -751,9 +755,13 @@ void SkiaSalGraphicsImpl::performDrawPolyPolygon(const 
basegfx::B2DPolyPolygon&
 const SkScalar posFix = useAA ? toSkXYFix : 0;
 if (mFillColor != SALCOLOR_NONE)
 {
+aPath.offset(toSkX(0) + posFix, toSkY(0) + posFix, nullptr);
 aPaint.setColor(toSkColorWithTransparency(mFillColor, fTransparency));
 aPaint.setStyle(SkPaint::kFill_Style);
-aPath.offset(toSkX(0) + posFix, toSkY(0) + posFix, nullptr);
+// HACK: If the polygon is just a line, it still should be drawn. But 
when filling
+// Skia doesn't draw empty polygons, so in that case ensure the line 
is drawn.
+if (mLineColor == SALCOLOR_NONE && aPath.getBounds().isEmpty())
+aPaint.setStyle(SkPaint::kStroke_Style);
 getDrawCanvas()->drawPath(aPath, aPaint);
 }
 if (mLineColor != SALCOLOR_NONE)
___
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' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/uibase/lingu/olmenu.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a8ff48c342c4c883319f17cb652cdbf23ed36dfc
Author: Michael Stahl 
AuthorDate: Thu Aug 20 14:00:04 2020 +0200
Commit: Caolán McNamara 
CommitDate: Thu Aug 20 18:23:03 2020 +0200

tdf#135721 sw: fix SwSpellPopup::Execute() deleting flys

Follow-up to ec579354af954867b829e7d08e4d752518c83728 :
in 6.4, this is the location of the spell check menu code; not sure
how to call this but it has the same bug...

(regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)

Change-Id: I0e6ce9c97d810f7c92dff320d403c986a947c266
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101073
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit a58fe88b5b406749f6e47c14f56d7490a7958bda)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101060
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/uibase/lingu/olmenu.cxx 
b/sw/source/uibase/lingu/olmenu.cxx
index 813cfae970af..27d4b19fffc1 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -722,9 +722,8 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
 
 m_pSh->StartUndo(SwUndoId::UI_REPLACE, &aRewriter);
 m_pSh->StartAction();
-m_pSh->DelLeft();
 
-m_pSh->Insert( aTmp );
+m_pSh->Replace(aTmp, false);
 
 /* #102505# EndAction/EndUndo moved down since insertion
of temporary auto correction is now undoable two and
___
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' - scp2/source

[Stephan Bergmann (via logerrit)]

 scp2/source/ooo/common_brand.scp |9 -
 1 file changed, 9 deletions(-)

New commits:
commit a72fd22c10f9f545b20b301d688560acb6bb1fef
Author: Stephan Bergmann 
AuthorDate: Wed Aug 19 15:10:55 2020 +0200
Commit: Caolán McNamara 
CommitDate: Thu Aug 20 18:23:30 2020 +0200

Remove BuildVersion from installation set version ini files

...after 5fdf2009d21fa220dfee70ea755bd698c16257a7 "tdf#134522 remove
--with-build-version ./configure flag" had already removed it from the
instdir/ version ini file (but apparently forgot to also remove it from
installation set version ini files) and 
00fa759dc9f13eb4618a7762be9ca6eaf3fd37f7
"tdf#135133: Don't try to read BuildVersion" removed its last consumer now

Change-Id: I98fd71e218fc0ede74ebc1b2e649011616d559ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100997
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 6ee46adb446f5350df2b1efc7fc3ffe2506dfaa0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101057
Reviewed-by: Caolán McNamara 

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5f989c65cdf2..5eba313cdbc6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -599,15 +599,6 @@ ProfileItem gid_Brand_Profileitem_Version_Vendor
 Value = "";
 End
 
-ProfileItem gid_Brand_Profileitem_Version_BuildVersion
-ProfileID = gid_Brand_Profile_Version_Ini;
-ModuleID = gid_Module_Root_Brand;
-Section = "Version";
-Order = 17;
-Key = "BuildVersion";
-Value = "";
-End
-
 ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
 ProfileID = gid_Brand_Profile_Version_Ini;
 ModuleID = gid_Module_Root_Brand;
___
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' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/uibase/shells/textsh1.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0089f37fcfb166040326aedb99a11f7ce659fdb9
Author: Michael Stahl 
AuthorDate: Wed Aug 19 18:55:27 2020 +0200
Commit: Caolán McNamara 
CommitDate: Thu Aug 20 18:22:39 2020 +0200

tdf#135721 sw: fix spell check context menu deleting flys

Kind of similar to e1629c210ad78310e3d48c0756723134a27b89df
but the problem is at a higher level: SwTextShell::Execute() with
SID_SPELLCHECK_APPLY_SUGGESTION should not DelLeft() + Insert() but
just Replace().

(regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)

Change-Id: I78487c7841ba22ccc6751240a8e55e08a86fba32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101014
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit ec579354af954867b829e7d08e4d752518c83728)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101059
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index c9e74390289a..f24e8127f6bb 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1563,9 +1563,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
 
 rWrtSh.StartUndo(SwUndoId::UI_REPLACE, &aRewriter);
 rWrtSh.StartAction();
-rWrtSh.DelLeft();
 
-rWrtSh.Insert( aTmp );
+rWrtSh.Replace(aTmp, false);
 
 /* #102505# EndAction/EndUndo moved down since insertion
of temporary auto correction is now undoable two and
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/xmloff sc/source sw/source xmloff/source

[Noel Grandin (via logerrit)]

 include/xmloff/XMLFontStylesContext.hxx   |1 
 include/xmloff/XMLTextMasterStylesContext.hxx |1 
 include/xmloff/xmlnumfi.hxx   |   13 +
 include/xmloff/xmlstyle.hxx   |4 
 sc/source/filter/xml/xmlstyli.hxx |1 
 sw/source/filter/xml/xmlfmt.cxx   |1 
 xmloff/source/draw/ximpstyl.hxx   |1 
 xmloff/source/style/xmlnumfi.cxx  |  186 +++---
 xmloff/source/style/xmlstyle.cxx  |   35 
 9 files changed, 214 insertions(+), 29 deletions(-)

New commits:
commit 764d52045b0a28e071f214fb1334b7a0c05df6bd
Author: Noel Grandin 
AuthorDate: Thu Aug 20 17:10:16 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 20 18:22:26 2020 +0200

use fastparser in SvXMLNumFormatContext

which requires making SvXMLStylesContext capable of doing both
fast and slow-parser paths.

Change-Id: I57428b10ac2d67bc233cc978c9a0c0c3755d60e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101022
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/xmloff/XMLFontStylesContext.hxx 
b/include/xmloff/XMLFontStylesContext.hxx
index b10bf2797b14..3aad7826bcc3 100644
--- a/include/xmloff/XMLFontStylesContext.hxx
+++ b/include/xmloff/XMLFontStylesContext.hxx
@@ -45,6 +45,7 @@ class XMLOFF_DLLPUBLIC XMLFontStylesContext final : public 
SvXMLStylesContext
 
 rtl_TextEncodingeDfltEncoding;
 
+using SvXMLStylesContext::CreateStyleChildContext;
 virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix,
 const OUString& rLocalName,
 const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList 
) override;
diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx 
b/include/xmloff/XMLTextMasterStylesContext.hxx
index 12975af36469..45b253759fde 100644
--- a/include/xmloff/XMLTextMasterStylesContext.hxx
+++ b/include/xmloff/XMLTextMasterStylesContext.hxx
@@ -27,6 +27,7 @@
 class XMLOFF_DLLPUBLIC XMLTextMasterStylesContext : public SvXMLStylesContext
 {
 protected:
+using SvXMLStylesContext::CreateStyleChildContext;
 virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix,
 const OUString& rLocalName,
 const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList 
) override;
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index e428edc671ce..3170f8b8e7c1 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -83,9 +83,8 @@ public:
 ~SvXMLNumFmtHelper();
 
 SvXMLStyleContext*  CreateChildContext( SvXMLImport& rImport,
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList>& 
xAttrList,
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList 
>& xAttrList,
 SvXMLStylesContext& rStyles);
 
 SvXMLNumImpData* getData() { return pData.get(); }
@@ -154,12 +153,18 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public 
SvXMLStyleContext
 
 public:
 SvXMLNumFormatContext( SvXMLImport& rImport,
-sal_uInt16 nPrfx,
+sal_uInt16 nPrfx,
 const OUString& rLName,
 SvXMLNumImpData* pNewData,
 SvXMLStylesTokens nNewType,
 const css::uno::Reference< 
css::xml::sax::XAttributeList>& xAttrList,
 SvXMLStylesContext& rStyles );
+SvXMLNumFormatContext( SvXMLImport& rImport,
+sal_Int32 nElement,
+SvXMLNumImpData* pNewData,
+SvXMLStylesTokens nNewType,
+const css::uno::Reference< 
css::xml::sax::XFastAttributeList>& xAttrList,
+SvXMLStylesContext& rStyles );
 SvXMLNumFormatContext( SvXMLImport& rImport,
 sal_uInt16 nPrfx,
 const OUString& rLName,
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 6ddf51d8872a..e02f2d81a674 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -191,6 +191,10 @@ protected:
 const OUString& rLocalName,
 const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList 
);
 
+virtual SvXMLStyleContext *CreateStyleChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
xAttrList );
+
 virtual SvXMLStyleContext *CreateStyleStyleChildContext( XmlStyleFamily 
nFamily,
 sal_uInt16 nPrefix, const OUString& rLocalName,
 const css::uno::Reference< cs

[Libreoffice-commits] online.git: wsd/ProofKey.cpp wsd/ProofKey.hpp

[Michael Meeks (via logerrit)]

 wsd/ProofKey.cpp |3 ++-
 wsd/ProofKey.hpp |5 +
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit cd98388653d9038e8918f1a1431a4c836b1adcb9
Author: Michael Meeks 
AuthorDate: Thu Aug 20 16:46:05 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu Aug 20 18:11:12 2020 +0200

Avoid contention on RSA Digest engine.

Change-Id: If9068371c7ab18083d432f8bc582d85c2f85e80e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101081
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/wsd/ProofKey.cpp b/wsd/ProofKey.cpp
index c7df1afe1..1fdfc5eca 100644
--- a/wsd/ProofKey.cpp
+++ b/wsd/ProofKey.cpp
@@ -252,7 +252,8 @@ std::vector Proof::GetProof(const 
std::string& access_token, cons
 std::string Proof::SignProof(const std::vector& proof) const
 {
 assert(m_pKey);
-static Poco::Crypto::RSADigestEngine digestEngine(*m_pKey, "SHA256");
+// One per DocumentBroker that uses this via WopiStorage
+static thread_local Poco::Crypto::RSADigestEngine digestEngine(*m_pKey, 
"SHA256");
 digestEngine.reset();
 digestEngine.update(proof.data(), proof.size());
 return BytesToBase64(digestEngine.signature());
diff --git a/wsd/ProofKey.hpp b/wsd/ProofKey.hpp
index 34dd98e12..5efc79aeb 100644
--- a/wsd/ProofKey.hpp
+++ b/wsd/ProofKey.hpp
@@ -27,6 +27,11 @@ namespace Poco {
 
 class WopiProofTests;
 
+/**
+ * Global singleton - with one-time loaded key data
+ * loaded at startup, and then un-modified & shared
+ * across threads.
+ */
 class Proof {
 friend class WopiProofTests;
 void initialize();
___
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-1' - cui/source

[Stephan Bergmann (via logerrit)]

 cui/source/options/optjava.cxx |   19 ++-
 cui/source/options/optjava.hxx |1 +
 2 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 8edb94bdff70597b1fa776c326394b6004c81b11
Author: Stephan Bergmann 
AuthorDate: Mon Aug 17 13:06:50 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Aug 20 17:42:40 2020 +0200

Always display highlighted JRE's location

...when opening the Advanced options page and after adding a new JRE via the
"Add..." button, not only after highlighting another JRE line.  (I suspect 
this
broke with 1aa246a8e8c7d974ab0f7bdfa16cda36cb700e03 "weld 
SvxJavaOptionsPage"
towards LO 6.4.)

Change-Id: I5f9b63e2d33a351eeef09712969b703f1e99ef7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100860
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit f7fe1e93da753d74485a13d46fe15fb198411932)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100798
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 5fb474293af0b2ed2a68be6141941736a27bf34b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100800
Reviewed-by: Michael Stahl 
Reviewed-by: Eike Rathke 
Tested-by: Stephan Bergmann 

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 0eeaec393c6d..f3c9dcfee4a8 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -148,11 +149,7 @@ IMPL_LINK(SvxJavaOptionsPage, CheckHdl_Impl, const 
row_col&, rRowCol, void)
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl, weld::TreeView&, void)
 {
-// set installation directory info
-OUString sLocation = m_xJavaList->get_selected_id();
-// tdf#80646 insert LTR mark after label
-OUString sInfo = m_sInstallText + u"\u200E" + sLocation;
-m_xJavaPathText->set_label(sInfo);
+UpdateJavaPathText();
 }
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl, weld::Button&, void)
@@ -340,6 +337,7 @@ void SvxJavaOptionsPage::LoadJREs()
 if ( jfw_areEqualJavaInfo( pCmpInfo.get(), pSelectedJava.get() ) )
 {
 HandleCheckEntry(i);
+UpdateJavaPathText();
 break;
 }
 ++i;
@@ -378,6 +376,16 @@ void SvxJavaOptionsPage::HandleCheckEntry(int nCheckedRow)
 }
 }
 
+void SvxJavaOptionsPage::UpdateJavaPathText()
+{
+assert(m_xJavaList->get_selected_index() != -1);
+// set installation directory info
+OUString sLocation = m_xJavaList->get_selected_id();
+// tdf#80646 insert LTR mark after label
+OUString sInfo = m_sInstallText + u"\u200E" + sLocation;
+m_xJavaPathText->set_label(sInfo);
+}
+
 void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
 {
 #if HAVE_FEATURE_JAVA
@@ -420,6 +428,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& 
_rFolder )
 }
 
 HandleCheckEntry(nPos);
+UpdateJavaPathText();
 bStartAgain = false;
 }
 else if ( JFW_E_NOT_RECOGNIZED == eErr )
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index f117746ebeec..df90e2824bdc 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -99,6 +99,7 @@ private:
 voidLoadJREs();
 voidAddJRE( JavaInfo const * _pInfo );
 voidHandleCheckEntry(int nCheckedRow);
+voidUpdateJavaPathText();
 voidAddFolder( const OUString& _rFolder );
 voidRequestRestart( svtools::RestartReason eReason );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New build

[Ilmari Lauhakangas]

anshu khare kirjoitti 20.8.2020 klo 18.23:

Hi

I was having my end-term exams. So I couldn't be active during that time.

Recently, I installed libreoffice again on windows. But when I built it, 
I saw that the previously installed libreoffice was getting built rather 
than the new one.


Could someone help me in building the newly installed libreoffice?
Do I have to give some specific commands in cygwin to first uninstall 
the previous version and then install the new one for it to work properly?


I don't understand what you mean by talking about installing LibreOffice 
and then proceeding to build it. Are you referring to doing a 
development environment setup from scratch? Please give more details, 
the exact steps on how you got where you are now. It is impossible to 
comment otherwise.


Ilmari
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

New build

[anshu khare]

Hi

I was having my end-term exams. So I couldn't be active during that time.

Recently, I installed libreoffice again on windows. But when I built it, I
saw that the previously installed libreoffice was getting built rather than
the new one.

Could someone help me in building the newly installed libreoffice?
Do I have to give some specific commands in cygwin to first uninstall the
previous version and then install the new one for it to work properly?

Thanks
Anshu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: framework/inc framework/Library_fwk.mk framework/source solenv/clang-format

[Maxim Monastirsky (via logerrit)]

 framework/Library_fwk.mk|1 
 framework/inc/uielement/addonstoolbarmanager.hxx|   64 --
 framework/inc/uielement/addonstoolbarwrapper.hxx|1 
 framework/inc/uielement/toolbarmanager.hxx  |   12 
 framework/source/uielement/addonstoolbarmanager.cxx |  430 
 framework/source/uielement/addonstoolbarwrapper.cxx |   14 
 framework/source/uielement/toolbarmanager.cxx   |  171 +--
 solenv/clang-format/excludelist |2 
 8 files changed, 132 insertions(+), 563 deletions(-)

New commits:
commit 37892578e97ea0f0c948116d639797060ac5f21f
Author: Maxim Monastirsky 
AuthorDate: Thu Aug 20 12:07:24 2020 +0300
Commit: Maxim Monastirsky 
CommitDate: Thu Aug 20 16:42:52 2020 +0200

Base addon toolbars on the regular ToolBarManager

ToolBarManager already supported addon buttons because of the
toolbar merging feature. Besides the cleanup, this gives access to
addon devs to all toolbar features like aliases or style buttons.

Change-Id: I7adf830ac71c7f5354a924d60a531d8001e37571
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101071
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 12434b7a4b74..754090d5512f 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -175,7 +175,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/uiconfiguration/uicategorydescription \
 framework/source/uiconfiguration/uiconfigurationmanager \
 framework/source/uiconfiguration/windowstateconfiguration \
-framework/source/uielement/addonstoolbarmanager \
 framework/source/uielement/addonstoolbarwrapper \
 framework/source/uielement/buttontoolbarcontroller \
 framework/source/uielement/comboboxtoolbarcontroller \
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx 
b/framework/inc/uielement/addonstoolbarmanager.hxx
deleted file mode 100644
index d13c3f14b58a..
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARMANAGER_HXX
-#define INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARMANAGER_HXX
-
-#include 
-
-#include 
-
-#include 
-
-class ToolBox;
-
-namespace framework
-{
-
-class AddonsToolBarManager final : public ToolBarManager
-{
-public:
-AddonsToolBarManager( const css::uno::Reference< 
css::uno::XComponentContext >& rxContext,
-  const css::uno::Reference< css::frame::XFrame >& 
rFrame,
-  const OUString& rResourceName,
-  ToolBox* pToolBar );
-virtual ~AddonsToolBarManager() override;
-
-// XComponent
-void SAL_CALL dispose() override;
-
-virtual void RefreshImages() override;
-using ToolBarManager::FillToolbar;
-void FillToolbar( const css::uno::Sequence< css::uno::Sequence< 
css::beans::PropertyValue > >& rAddonToolbar );
-
-private:
-DECL_LINK(Click, ToolBox *, void);
-DECL_LINK(DoubleClick, ToolBox *, void);
-DECL_LINK(Select, ToolBox *, void);
-DECL_LINK(StateChanged, StateChangedType const *, void );
-DECL_LINK(DataChanged, DataChangedEvent const *, void );
-
-virtual bool MenuItemAllowed( sal_uInt16 ) const override;
-};
-
-}
-
-#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARMANAGER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx 
b/framework/inc/uielement/addonstoolbarwrapper.hxx
index 6d6fee13f4c4..2970ce6d13fa 100644
--- a/framework/inc/uielement/addonstoolbarwrapper.hxx
+++ b/framework/inc/uielement/addonstoolbarwrapper.hxx
@@ -28,7 +28,6 @@
 namespace framework
 {
 
-class AddonsToolBarManager;
 class AddonsToolBarWrapper final : public UIElementWrapperBase
 {
 public:
diff --git a/framework/inc/uielement/toolbarmanager.hxx 
b/framework/inc/uielement/toolbar

[Libreoffice-commits] core.git: include/svx svx/source sw/source

[Noel Grandin (via logerrit)]

 include/svx/sdrpagewindow.hxx   |4 ++--
 svx/source/svdraw/sdrpagewindow.cxx |   33 ++---
 svx/source/svdraw/svdpagv.cxx   |   11 ++-
 sw/source/core/view/viewsh.cxx  |5 +++--
 4 files changed, 37 insertions(+), 16 deletions(-)

New commits:
commit 445cf499666f21c2d480ce1df9ce6004b9450b64
Author: Noel Grandin 
AuthorDate: Thu Aug 20 11:27:29 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 20 16:37:51 2020 +0200

tdf#132940 Crash in mergedlo!vcl::Region::operator=

We had a SdrPageWindow accessing a SdPaintWindow that had already been
freed.
Turns that SdrPageWindow can be "patched" more than once given enough
stuff going on in writer, so make the call sites restore the previous
state as the stack unwinds.

Change-Id: Ia1ef5c9b2f818b7873e8e739c9cdf257554e403a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101044
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 1e6e9301b0cb..c7278233c313 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -66,8 +66,8 @@ public:
 rtl::Reference< sdr::overlay::OverlayManager > const & GetOverlayManager() 
const;
 
 // #i72752# allow patcing SdrPaintWindow from SdrPageView::DrawLayer if 
needed
-void patchPaintWindow(SdrPaintWindow& rPaintWindow);
-void unpatchPaintWindow();
+[[nodiscard]] SdrPaintWindow* patchPaintWindow(SdrPaintWindow& 
rPaintWindow);
+void unpatchPaintWindow(SdrPaintWindow* pPreviousPaintWindow);
 
 // the repaint method. For migration from pPaintProc, use one more 
parameter
 void PrePaint();
diff --git a/svx/source/svdraw/sdrpagewindow.cxx 
b/svx/source/svdraw/sdrpagewindow.cxx
index 823205a22e65..0b0ea0536945 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -163,22 +163,41 @@ rtl::Reference< sdr::overlay::OverlayManager > const & 
SdrPageWindow::GetOverlay
 return GetPaintWindow().GetOverlayManager();
 }
 
-void SdrPageWindow::patchPaintWindow(SdrPaintWindow& rPaintWindow)
+SdrPaintWindow* SdrPageWindow::patchPaintWindow(SdrPaintWindow& rPaintWindow)
 {
-mpImpl->mpOriginalPaintWindow = mpImpl->mpPaintWindow;
-mpImpl->mpPaintWindow = &rPaintWindow;
-mpImpl->mpOriginalPaintWindow->setPatched(&rPaintWindow);
+if (!mpImpl->mpOriginalPaintWindow)
+{
+// first patch
+mpImpl->mpOriginalPaintWindow = mpImpl->mpPaintWindow;
+mpImpl->mpPaintWindow = &rPaintWindow;
+mpImpl->mpOriginalPaintWindow->setPatched(&rPaintWindow);
+return mpImpl->mpOriginalPaintWindow;
+}
+else
+{
+// second or more patch
+auto pPreviousPaintWindow = mpImpl->mpPaintWindow;
+mpImpl->mpPaintWindow = &rPaintWindow;
+mpImpl->mpOriginalPaintWindow->setPatched(&rPaintWindow);
+return pPreviousPaintWindow;
+}
 }
 
-void SdrPageWindow::unpatchPaintWindow()
+void SdrPageWindow::unpatchPaintWindow(SdrPaintWindow* pPreviousPaintWindow)
 {
-DBG_ASSERT(mpImpl->mpOriginalPaintWindow, 
"SdrPageWindow::unpatchPaintWindow: paint window not patched!" );
-if (mpImpl->mpOriginalPaintWindow)
+if (pPreviousPaintWindow == mpImpl->mpOriginalPaintWindow)
 {
+// first patch
 mpImpl->mpPaintWindow = mpImpl->mpOriginalPaintWindow;
 mpImpl->mpOriginalPaintWindow->setPatched(nullptr);
 mpImpl->mpOriginalPaintWindow = nullptr;
 }
+else
+{
+// second or more patch
+mpImpl->mpPaintWindow = pPreviousPaintWindow;
+mpImpl->mpOriginalPaintWindow->setPatched(pPreviousPaintWindow);
+}
 }
 
 void SdrPageWindow::PrePaint()
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index b95109ed6886..ad38d0ad3395 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -290,14 +291,14 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* 
pGivenTarget,
 aTemporaryPaintWindow.SetRedrawRegion(rExistingRegion);
 else
 aTemporaryPaintWindow.SetRedrawRegion(vcl::Region(rRect));
-// patch the ExistingPageWindow
-pPreparedTarget->patchPaintWindow(aTemporaryPaintWindow);
 
+// patch the ExistingPageWindow
+auto pPreviousWindow = 
pPreparedTarget->patchPaintWindow(aTemporaryPaintWindow);
+// unpatch window when leaving the scope
+const ::comphelper::ScopeGuard aGuard(
+[&pPreviousWindow, &pPreparedTarget]() { 
pPreparedTarget->unpatchPaintWindow(pPreviousWindow); } );
 // redraw the layer
 pPreparedTarget->RedrawLayer(&nID, pRedirector, pPageFrame);
-
-// resto

ESC meeting minutes: 2020-08-20

[Stephan Bergmann]

* Present:
+ Caolan, Gabriel, Olivier, Cloph, Eike, Michael S., Stephan

* Completed Action Items:
+ None

* Pending Action Items:
+ make a decision on what notebookbar variant to promote (Heiko)
  + see tdf#135501 for details
  + no decision yet
+ give commit access to Gokay Satir (Cloph)

* Release Engineering update (Cloph)
+ 7.0 status
   + 7.0.1 rc2 due next week
+ 6.4 status
   + last 6.4.7 rc in late September
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)
* New Help
  + Changes in schema.org expecting better SEO results
  + improvements to rescue extended tips into UI files
 + requires Glade 3.36. Is this a show stopper?
   + does not affect build, but if you modify a .ui file
 with older Glade, the information will get lost
   + Fedora 32 has the fixed Glade (Caolan)
   + Olivier uses flatpak that also works fine

* Helpcpontent2
  + New pages (ohallot)
  + housekeeping, fixes and refactors (Johnny_M, ohallot)

* Google seasons of Doc 2020
  + Project 1 : Finish Calc Functions wiki page (Ronnie Ghandi)
  + Project 2 : Calc E-Learning (Prashant Mathapathi)

* Guides
  + Work in progress

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
248(248) (topicUI) bugs open, 263(263) (needsUXEval) needs to 
be evaluated by the UXteam

+ Updates:
BZ changes   1 week1 month   3 months   12 months
 added  28(22)39(21)62(21) 175(19)
 commented 122(14)   411(59)   996(26)3699(65)
   removed   0(0)  0(-2) 9(-1)  53(0)
  resolved   8(1) 41(4)106(-4) 389(5)
+ top 10 contributors:
  Heiko Tietze made 178 changes in 1 month, and 2103 changes in 
1 year

  Telesto made 173 changes in 1 month, and 450 changes in 1 year
  Foote, V Stuart made 71 changes in 1 month, and 600 changes 
in 1 year
  Dieter Praas made 55 changes in 1 month, and 529 changes in 1 
year

  Xisco Fauli made 34 changes in 1 month, and 551 changes in 1 year
  Timur made 25 changes in 1 month, and 239 changes in 1 year
  Thomas Lendo made 22 changes in 1 month, and 208 changes in 1 
year
  Kaganski, Mike made 18 changes in 1 month, and 108 changes in 
1 year
  Roman Kuznetsov made 15 changes in 1 month, and 238 changes 
in 1 year
  Kainz, Andreas made 15 changes in 1 month, and 414 changes in 
1 year


* Crash testing (Caolan)
+ 6(+0) import failure, 34(+0) export failures
  + found the most frequent failure, workaround patch in gerrit
+ 18 coverity issues
  + build in queue, keeping an eye on it to see does it succeed or 
disappear

+ 16 ossfuzz isses, 14 timeouts, 2 oom

* Crash Reporting (Xisco)
+ 6.4.6.2243(+0)
+ 7.0.0.02475(+44)
+ 7.0.0.2252(+25)
+ 7.0.0.39137(+4880)

* GSoC 2020 (Thorsten/Ilmari)
+ Projects announced: 
https://blog.documentfoundation.org/blog/2020/05/05/9769/

+ June 1, 2020 - August 24, 2020: Students work on their projects
+ 6 projects accepted
+ the game is on, students are reporting more or less regularly
  + remind your students if it's not happening
+ August 31, 2020 - September 7, 2020: Mentors Submit Final Evaluations
+ Students will have a panel: (Thorsten)
  + mentors: please poke your students to have a 10-15 mins 
presentation of their work


* Mentoring/easyhack update
  committer...   1 week 1 month 3 months12 months
  open  91(-17)201(-13)202(-12) 211(-12)
   reviews 472(8) 1958(30)4648(16)19803(-126)
merged 359(11)1816(0) 5385(-19)   19562(3)
 abandoned  17(2)   85(-4) 242(-2) 1005(-3)
   own commits 266(34)1150(9) 3624(-6)15810(-30)
review commits  87(11) 355(13)1109(-19)4523(-5)
contributor...   1 week  1 month 3 months 12 months
  open   29(-10)102(4)   104(5)   106(5)
   reviews 1180(-48)   5076(-74)   14109(-44)   44548(112)
merged   28(-8) 149(-8)  503(-20)1668(-5)
 abandoned9(-2)  29(-15) 140(-2)  549(3)
   own commits   46(-8) 205(-2)  643(-5) 1559(35)
review commits0(0)0(0) 0(0) 0(0)
+ easyHack statistics:
   needsDevEval 9(9)   needsUXEval 2(2)   cleanup_comments 243(243)
   total 293(293)   assigned 13(13)   open 258(258)
+ top 10 contributors:
  Johnny_M made 100 patches in 1 month, and 292 patches in 1 year
  Shivam Kumar Singh made 12 patches in 1 month, and 34 patches 
in 1 year

  Gökay ŞATIR made 10 patches in 1 month, and 41 patches in 1 year
 

[Libreoffice-commits] core.git: dbaccess/source include/svx include/vcl svx/source vcl/source

[Noel Grandin (via logerrit)]

 dbaccess/source/ui/browser/dbexchange.cxx |   30 --
 dbaccess/source/ui/inc/QueryTextView.hxx  |2 --
 dbaccess/source/ui/inc/dbexchange.hxx |   17 -
 include/svx/dbaobjectex.hxx   |7 ---
 include/vcl/edit.hxx  |1 -
 include/vcl/toolkit/vclmedit.hxx  |1 -
 svx/source/fmcomp/dbaobjectex.cxx |7 ---
 vcl/source/control/edit.cxx   |4 
 vcl/source/edit/vclmedit.cxx  |5 -
 9 files changed, 74 deletions(-)

New commits:
commit 901add54cd5191b5a41ec11baddd669954c34025
Author: Noel Grandin 
AuthorDate: Thu Aug 20 13:41:06 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 20 16:05:40 2020 +0200

loplugin:unusedmethods

Change-Id: Ic3690d7f2a075d47ffed3db03ee6895ebdab441e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101070
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/dbaccess/source/ui/browser/dbexchange.cxx 
b/dbaccess/source/ui/browser/dbexchange.cxx
index a6d649674f07..d9358ec776ad 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -62,36 +62,6 @@ namespace dbaui
 {
 }
 
-ODataClipboard::ODataClipboard(
-const OUString&  _rDatasource,
-const sal_Int32 _nCommandType,
-const OUString&  _rCommand,
-const Reference< XConnection >& _rxConnection,
-const Reference< XNumberFormatter >& _rxFormatter,
-const Reference< XComponentContext >& _rxORB)
-:ODataAccessObjectTransferable( _rDatasource, 
_nCommandType, _rCommand, _rxConnection )
-{
-osl_atomic_increment( &m_refCount );
-lcl_setListener( _rxConnection, this, true );
-
-m_pHtml.set( new OHTMLImportExport( getDescriptor(), _rxORB, 
_rxFormatter ) );
-m_pRtf.set( new ORTFImportExport( getDescriptor(), _rxORB, 
_rxFormatter ) );
-
-osl_atomic_decrement( &m_refCount );
-}
-
-ODataClipboard::ODataClipboard(
-const OUString&  _rDatasource,
-const sal_Int32 _nCommandType,
-const OUString&  _rCommand,
-const Reference< XNumberFormatter >& _rxFormatter,
-const Reference< XComponentContext >& _rxORB)
-:ODataAccessObjectTransferable( _rDatasource, _nCommandType, _rCommand)
-{
-m_pHtml.set( new OHTMLImportExport( getDescriptor(),_rxORB, 
_rxFormatter ) );
-m_pRtf.set( new ORTFImportExport( getDescriptor(),_rxORB, _rxFormatter 
) );
-}
-
 void ODataClipboard::Update(
 const OUString&  rDatasource,
 const sal_Int32  nCommandType,
diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx 
b/dbaccess/source/ui/inc/QueryTextView.hxx
index e472c8dad8c7..dcce2e80102e 100644
--- a/dbaccess/source/ui/inc/QueryTextView.hxx
+++ b/dbaccess/source/ui/inc/QueryTextView.hxx
@@ -64,8 +64,6 @@ namespace dbaui
 
 void stopTimer();
 void startTimer();
-
-OQueryContainerWindow*  getContainerWindow() { return static_cast< 
OQueryContainerWindow* >( GetParent() ); }
 };
 }
 
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx 
b/dbaccess/source/ui/inc/dbexchange.hxx
index 13b3e18503bb..e288186c391e 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -45,23 +45,6 @@ namespace dbaui
 public:
 ODataClipboard();
 
-ODataClipboard(
-const OUString&  _rDatasource,
-const sal_Int32 _nCommandType,
-const OUString&  _rCommand,
-const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
-const css::uno::Reference< css::util::XNumberFormatter >& 
_rxFormatter,
-const css::uno::Reference< css::uno::XComponentContext >& _rxORB
-);
-
-ODataClipboard(
-const OUString&  _rDatasource,
-const sal_Int32 _nCommandType,
-const OUString&  _rCommand,
-const css::uno::Reference< css::util::XNumberFormatter >& 
_rxFormatter,
-const css::uno::Reference< css::uno::XComponentContext >& _rxORB
-);
-
 ODataClipboard(
 const css::uno::Reference< css::beans::XPropertySet >& 
i_rAliveForm,
 const css::uno::Sequence< css::uno::Any >& i_rSelectedRows,
diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx
index d570fac7f5b3..2a0d243cce0a 100644
--- a/include/svx/dbaobjectex.hxx
+++ b/include/svx/dbaobjectex.hxx
@@ -32,13 +32,6 @@ namespace svx
 class SAL_WARN_UNUSED SVX_DLLPUBLIC OComponentTransferable final : public 
TransferDataContainer
 {
 public:
-/** construct the transferable
-*/
-OComponentTransferable(
-cons

[Libreoffice-commits] core.git: compilerplugins/clang vcl/inc vcl/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/singlevalfields.results |   31 +++---
 vcl/inc/svimpbox.hxx  |1 
 vcl/source/treelist/svimpbox.cxx  |  118 --
 3 files changed, 18 insertions(+), 132 deletions(-)

New commits:
commit 1e701a9d1cf67532026014d627ab96d28e8b8476
Author: Noel Grandin 
AuthorDate: Thu Aug 20 13:19:58 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 20 16:05:19 2020 +0200

loplugin:singlevalfields

Change-Id: I4cd20d1a449196b68c7dbe153c60e68b9563bea9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101049
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/singlevalfields.results 
b/compilerplugins/clang/singlevalfields.results
index 545d50c5d753..dc00798c88b6 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -130,12 +130,9 @@ cui/source/options/optgdlg.cxx:1127
 cui/source/options/optjava.hxx:59
 SvxJavaOptionsPage m_aResetIdle
 cui options SvxJavaOptionsPage Reset
-dbaccess/source/ui/inc/directsql.hxx:68
-dbaui::DirectSQLDialog m_aHighlighter
+dbaccess/source/ui/inc/sqledit.hxx:43
+dbaui::SQLEditView m_aHighlighter
 1
-dbaccess/source/ui/inc/JoinExchange.hxx:38
-dbaui::OJoinExchObj m_pDragListener
-0
 desktop/source/app/app.cxx:480
 desktop::Desktop::Init bTryHardOfficeconfigBroken
 0
@@ -151,16 +148,16 @@ drawinglayer/source/primitive2d/sceneprimitive2d.cxx:481
 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx:340
 drawinglayer::impBufferDevice::paint bDoSaveForVisualControl
 0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:953
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:954
 
drawinglayer::processor2d::VclMetafileProcessor2D::processGraphicPrimitive2D 
bSuppressPDFExtOutDevDataSupport
 0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1307
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1308
 
drawinglayer::processor2d::VclMetafileProcessor2D::processTextHierarchyParagraphPrimitive2D
 bSuppressPDFExtOutDevDataSupport
 0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2069
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2070
 
drawinglayer::processor2d::VclMetafileProcessor2D::processUnifiedTransparencePrimitive2D
 bForceToMetafile
 0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2170
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2171
 
drawinglayer::processor2d::VclMetafileProcessor2D::processTransparencePrimitive2D
 bForceToBigTransparentVDev
 0
 drawinglayer/source/tools/converters.cxx:91
@@ -349,9 +346,6 @@ include/vcl/settings.hxx:146
 include/vcl/settings.hxx:147
 DialogStyle action_area_border
 5
-include/vcl/toolkit/longcurr.hxx:62
-LongCurrencyFormatter mbThousandSep
-1
 include/vcl/toolkit/treelistbox.hxx:213
 SvTreeListBox nIndent
 20
@@ -559,10 +553,10 @@ sd/source/ui/inc/DrawController.hxx:292
 sd/source/ui/inc/pubdlg.hxx:151
 SdPublishingDlg aAssistentFunc
 6
-sd/source/ui/inc/View.hxx:237
+sd/source/ui/inc/View.hxx:240
 sd::View maDropErrorIdle
 sd View DropError
-sd/source/ui/inc/View.hxx:238
+sd/source/ui/inc/View.hxx:241
 sd::View maDropInsertFileIdle
 sd View DropInsertFile
 sd/source/ui/inc/ViewTabBar.hxx:146
@@ -985,6 +979,9 @@ vcl/inc/salwtype.hxx:162
 vcl/inc/svdata.hxx:315
 ImplSVNWFData mbMenuBarDockingAreaCommonBG
 0
+vcl/inc/svimpbox.hxx:128
+SvImpLBox m_bContextMenuHandling
+0
 vcl/source/bitmap/bitmap.cxx:140
 Bitmap::~Bitmap save
 0
@@ -1084,10 +1081,10 @@ vcl/source/outdev/bitmap.cxx:1243
 vcl/unx/gtk3/a11y/gtk3atkutil.cxx:694
 ooo_atk_util_ensure_event_listener bInited
 1
-vcl/unx/gtk3/gtk3gtkinst.cxx:15444
+vcl/unx/gtk3/gtk3gtkinst.cxx:15466
 (anonymous namespace)::ensure_intercept_drawing_area_accessibility bDone
 1
-vcl/unx/gtk3/gtk3gtkinst.cxx:15472
+vcl/unx/gtk3/gtk3gtkinst.cxx:15494
 (anonymous namespace)::ensure_disable_ctrl_page_up_down_bindings bDone
 1
 workdir/LexTarget/l10ntools/source/xrmlex.cxx:706
@@ -1096,7 +1093,7 @@ workdir/LexTarget/l10ntools/source/xrmlex.cxx:706
 writerfilter/source/dmapper/DomainMapper_Impl.hxx:148
 writerfilter::dmapper::FieldParagraph m_bRemove
 0
-writerfilter/source/dmapper/SettingsTable.cxx:269
+writerfilter/source/dmapper/SettingsTable.cxx:271
 writerfilter::dmapper::SettingsTable_Impl m_pThemeFontLangProps
 3
 writerfilter/source/rtftok/rtfdocumentimpl.hxx:873
diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index 34f2500b5ea2..3def46700396 100644
--- a/vcl/inc/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -125,7 +125,6 @@ private:
 
 boolm_bUpdateMode : 1;
 boolm_bSubLstOpLR : 1;// open/close sublist with 
cursor left/right, defaulted with false
-boolm_bContextMenuHand

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-1' - vcl/source

[Mike Kaganski (via logerrit)]

 vcl/source/outdev/polygon.cxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 597a095ecb0cf74c613ec2ee19ec253b9fdf9c0d
Author: Mike Kaganski 
AuthorDate: Fri Aug 14 02:01:05 2020 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Aug 20 15:44:51 2020 +0200

tdf#134968: don't forget to draw on mpAlphaVDev in fallback case

Change-Id: I6ab8cc8907943c3bb7fd717624ea4ac7c9d4fd5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100711
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 18fd4437077f1e51ae54cfd1a160866cca015c2d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100692
Reviewed-by: Caolán McNamara 
(cherry picked from commit 76b93688505c0ab2b0e1876d5461a36d8ea22414)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100699
Reviewed-by: Xisco Fauli 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index 77e0564ba16f..e031fb05990c 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -290,6 +290,8 @@ void 
OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
 if( mbInitFillColor )
 InitFillColor();
 
+bool bSuccess(false);
+
 if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) &&
RasterOp::OverPaint == GetRasterOp() &&
@@ -297,7 +299,7 @@ void 
OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
 {
 const basegfx::B2DHomMatrix aTransform(ImplGetDeviceTransformation());
 basegfx::B2DPolyPolygon aB2DPolyPolygon(rB2DPolyPoly);
-bool bSuccess(true);
+bSuccess = true;
 
 // ensure closed - maybe assert, hinders buffering
 if(!aB2DPolyPolygon.isClosed())
@@ -335,20 +337,18 @@ void 
OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
 break;
 }
 }
+}
 
-if(bSuccess)
-{
-if (mpAlphaVDev)
-
mpAlphaVDev->ImplDrawPolyPolygonWithB2DPolyPolygon(rB2DPolyPoly);
-
-return;
-}
+if (!bSuccess)
+{
+// fallback to old polygon drawing if needed
+const tools::PolyPolygon aToolsPolyPolygon(rB2DPolyPoly);
+const tools::PolyPolygon aPixelPolyPolygon = 
ImplLogicToDevicePixel(aToolsPolyPolygon);
+ImplDrawPolyPolygon(aPixelPolyPolygon.Count(), aPixelPolyPolygon);
 }
 
-// fallback to old polygon drawing if needed
-const tools::PolyPolygon aToolsPolyPolygon( rB2DPolyPoly );
-const tools::PolyPolygon aPixelPolyPolygon = ImplLogicToDevicePixel( 
aToolsPolyPolygon );
-ImplDrawPolyPolygon( aPixelPolyPolygon.Count(), aPixelPolyPolygon );
+if (mpAlphaVDev)
+mpAlphaVDev->ImplDrawPolyPolygonWithB2DPolyPolygon(rB2DPolyPoly);
 }
 
 // #100127# Extracted from OutputDevice::DrawPolyPolygon()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/draw/dcontact.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 6e0c7591ab86a893be85087d3caee0328e9411dd
Author: Caolán McNamara 
AuthorDate: Thu Aug 13 19:39:40 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 20 15:43:56 2020 +0200

tdf#129542 the control is already anchored to header/footer content

DisconnectFromLayout has unset its old anchor, if we don't insert
it somewhere then its old anchor is null and we crash eventually.

Seeing as we're already anchored into header/footer content, albeit only
in the first view of a header/footer, then allow reconnecting to layout
in that mode

Change-Id: I0be4d167ee7d7b932318a1318954bed0da3a4fc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100686
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 5384426f6e61..0b6fffab9057 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1830,7 +1830,7 @@ void SwDrawContact::ConnectToLayout( const 
SwFormatAnchor* pAnch )
 for( SwFrame *pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next() )
 {
 // append drawing object, if
-// (1) proposed anchor frame isn't a follow and
+// (1) proposed anchor frame isn't a follow and...
 const bool bFollow = pFrame->IsContentFrame() && 
static_cast(pFrame)->IsFollow();
 if (bFollow)
 continue;
@@ -1838,7 +1838,9 @@ void SwDrawContact::ConnectToLayout( const 
SwFormatAnchor* pAnch )
 // (2) drawing object isn't a control object to be anchored
 // in header/footer.
 const bool bControlInHF = ::CheckControlLayer(GetMaster()) 
&& pFrame->FindFooterOrHeader();
-if (bControlInHF)
+// tdf#129542 but make an exception for control objects so 
they can get added to just the first frame,
+// the Master Anchor Frame and not the others
+if (bControlInHF && pAnchorFrameOfMaster)
 continue;
 
 bool bAdd;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Tünde Tóth (via logerrit)]

 sc/source/filter/xcl97/xcl97rec.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 5884f85ace3ea1b90c314f46e3f2aeadc247ffa1
Author: Tünde Tóth 
AuthorDate: Wed Aug 19 11:52:49 2020 +0200
Commit: László Németh 
CommitDate: Thu Aug 20 15:35:16 2020 +0200

clean-up to commit: a8950d08a33e7aded31d4591c98a03d1edf8c5a4

Change-Id: Icfe1e3d7925a3e31fd8bc0185d6b898c61346766
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100989
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sc/source/filter/xcl97/xcl97rec.cxx 
b/sc/source/filter/xcl97/xcl97rec.cxx
index 0f9ba1288d33..fa2fc748bf2c 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -203,11 +203,6 @@ bool IsValidObject( const XclObj& rObj )
 return false;
 
 const uno::Sequence> 
xCooSysSeq = xCooSysContainer->getCoordinateSystems();
-
-// tdf#123647 Save empty charts too.
-// if (!xCooSysSeq.hasElements())
-// return false;
-
 for (const auto& rCooSys : xCooSysSeq)
 {
 Reference xChartTypeCont(rCooSys, 
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-6.2' - source/es

[Andras Timar (via logerrit)]

 source/es/cui/messages.po |2 +-
 source/es/sd/messages.po  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b97ac43b2424a66e566afbbf3735bc0cedac201
Author: Andras Timar 
AuthorDate: Thu Aug 20 15:23:58 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Aug 20 15:24:57 2020 +0200

Spanish translation amendment requested by a customer 'Insertar tabla'

Change-Id: I716e45cb7a23248ee3553816b001006a7c18aa2f

diff --git a/source/es/cui/messages.po b/source/es/cui/messages.po
index cd0a76a88f6..f7c64e4b386 100644
--- a/source/es/cui/messages.po
+++ b/source/es/cui/messages.po
@@ -6984,7 +6984,7 @@ msgstr "Cambiar nombre"
 #: cui/uiconfig/ui/newtabledialog.ui:22
 msgctxt "newtabledialog|NewTableDialog"
 msgid "Insert Table"
-msgstr "Insertar una tabla"
+msgstr "Insertar tabla"
 
 #: cui/uiconfig/ui/newtabledialog.ui:101
 msgctxt "newtabledialog|columns_label"
diff --git a/source/es/sd/messages.po b/source/es/sd/messages.po
index 02fa052c4f6..5e501c4be8b 100644
--- a/source/es/sd/messages.po
+++ b/source/es/sd/messages.po
@@ -1541,7 +1541,7 @@ msgstr "Restablecer disposición de diapositiva"
 #: sd/inc/strings.hrc:267
 msgctxt "STR_INSERT_TABLE"
 msgid "Insert Table"
-msgstr "Insertar una tabla"
+msgstr "Insertar tabla"
 
 #: sd/inc/strings.hrc:268
 msgctxt "STR_INSERT_CHART"
___
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' - translations

[Andras Timar (via logerrit)]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 113b843f7dd14a2d898151b657b24f8ca7c4644d
Author: Andras Timar 
AuthorDate: Thu Aug 20 15:25:02 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Aug 20 15:25:02 2020 +0200

Update git submodules

* Update translations from branch 'distro/collabora/cp-6.2'
  to 1b97ac43b2424a66e566afbbf3735bc0cedac201
  - Spanish translation amendment requested by a customer 'Insertar tabla'

Change-Id: I716e45cb7a23248ee3553816b001006a7c18aa2f

diff --git a/translations b/translations
index 3f1238d044c7..1b97ac43b242 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3f1238d044c7f9e383e6df3e1b14d6ab16ccf5ee
+Subproject commit 1b97ac43b2424a66e566afbbf3735bc0cedac201
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: slideshow/source

[Sarper Akdemir (via logerrit)]

 slideshow/source/engine/box2dtools.cxx |  209 ++---
 slideshow/source/inc/box2dtools.hxx|7 -
 2 files changed, 198 insertions(+), 18 deletions(-)

New commits:
commit 51275a633ff5f8aa5843ba1622c701fd7fdda5a0
Author: Sarper Akdemir 
AuthorDate: Mon Jul 27 23:02:48 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Aug 20 15:23:01 2020 +0200

add support for complex shapes in physics animation effects

Makes it possible to represent complex shapes of LibreOffice
in physics animation effects by closely approximating their geometry.

Therefore enables more convincing animation effects.

Change-Id: I807bbde92c143b8c96792b3d8bf9603a31216486
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100432
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index c02a967a5f87..6fa427c15c9a 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -11,6 +11,13 @@
 #include 
 
 #include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
 
 #define BOX2D_SLIDE_SIZE_IN_METERS 100.00f
 
@@ -62,6 +69,134 @@ b2Vec2 convertB2DPointToBox2DVec2(const basegfx::B2DPoint& 
aPoint, const double
 return { static_cast(aPoint.getX() * fScaleFactor),
  static_cast(aPoint.getY() * -fScaleFactor) };
 }
+
+// expects rTriangleVector to have coordinates relative to the shape's 
bounding box center
+void addTriangleVectorToBody(const basegfx::triangulator::B2DTriangleVector& 
rTriangleVector,
+ b2Body* aBody, const float fDensity, const float 
fFriction,
+ const float fRestitution, const double 
fScaleFactor)
+{
+for (const basegfx::triangulator::B2DTriangle& aTriangle : rTriangleVector)
+{
+b2FixtureDef aFixture;
+b2PolygonShape aPolygonShape;
+b2Vec2 aTriangleVertices[3]
+= { convertB2DPointToBox2DVec2(aTriangle.getA(), fScaleFactor),
+convertB2DPointToBox2DVec2(aTriangle.getB(), fScaleFactor),
+convertB2DPointToBox2DVec2(aTriangle.getC(), fScaleFactor) };
+
+bool bValidPointDistance = true;
+for (int nPointIndexA = 0; nPointIndexA < 3; nPointIndexA++)
+{
+for (int nPointIndexB = 0; nPointIndexB < 3; nPointIndexB++)
+{
+if (nPointIndexA == nPointIndexB)
+continue;
+
+// check whether the triangle would be a degenerately small one
+if (b2DistanceSquared(aTriangleVertices[nPointIndexA],
+  aTriangleVertices[nPointIndexB])
+< 0.003f)
+{
+bValidPointDistance = false;
+}
+}
+}
+if (bValidPointDistance)
+{
+aPolygonShape.Set(aTriangleVertices, 3);
+aFixture.shape = &aPolygonShape;
+aFixture.density = fDensity;
+aFixture.friction = fFriction;
+aFixture.restitution = fRestitution;
+aBody->CreateFixture(&aFixture);
+}
+}
+}
+
+// expects rPolygon to have coordinates relative to it's center
+void addEdgeShapeToBody(const basegfx::B2DPolygon& rPolygon, b2Body* aBody, 
const float fDensity,
+const float fFriction, const float fRestitution, const 
double fScaleFactor)
+{
+// make sure there's no bezier curves on the polygon
+assert(!rPolygon.areControlPointsUsed());
+basegfx::B2DPolygon aPolygon = 
basegfx::utils::removeNeutralPoints(rPolygon);
+
+// value that somewhat defines half width of the quadrilateral
+// that will be representing edge segment in the box2d world
+const float fHalfWidth = 0.1f;
+bool bHasPreviousQuadrilateralEdge = false;
+b2Vec2 aQuadrilateralVertices[4];
+
+for (sal_uInt32 nIndex = 0; nIndex < aPolygon.count(); nIndex++)
+{
+b2FixtureDef aFixture;
+b2PolygonShape aPolygonShape;
+
+basegfx::B2DPoint aPointA;
+basegfx::B2DPoint aPointB;
+if (nIndex != 0)
+{
+aPointA = aPolygon.getB2DPoint(nIndex - 1);
+aPointB = aPolygon.getB2DPoint(nIndex);
+}
+else if (aPolygon.isClosed())
+{
+// start by connecting the last point to the first one
+aPointA = aPolygon.getB2DPoint(aPolygon.count() - 1);
+aPointB = aPolygon.getB2DPoint(nIndex);
+}
+else // the polygon isn't closed, won't connect last and first points
+{
+continue;
+}
+
+b2Vec2 aEdgeUnitVec(convertB2DPointToBox2DVec2(aPointB, fScaleFactor)
+- convertB2DPointToBox2DVec2(aPointA, 
fScaleFactor));
+aEdgeUnitVec.Normalize();
+
+b2Vec2 aEdgeNormal(-aEdgeUnitVec.y, aEdgeUnitVec.

[Libreoffice-commits] core.git: animations/source include/xmloff offapi/com offapi/UnoApi_offapi.mk officecfg/registry schema/libreoffice sd/xml xmloff/source

[Sarper Akdemir (via logerrit)]

 animations/source/animcore/animcore.component|4 +
 animations/source/animcore/animcore.cxx  |   35 
 include/xmloff/xmltoken.hxx  |1 
 offapi/UnoApi_offapi.mk  |1 
 offapi/com/sun/star/animations/AnimatePhysics.idl|   25 ++
 officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu |7 +
 schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng  |   43 +++
 sd/xml/effects.xml   |7 +
 xmloff/source/core/xmltoken.cxx  |1 
 xmloff/source/draw/animationexport.cxx   |   25 ++
 xmloff/source/draw/animationimport.cxx   |2 
 xmloff/source/token/tokens.txt   |1 
 12 files changed, 148 insertions(+), 4 deletions(-)

New commits:
commit e33486189d5af3e651a5bc2e974b548fc07cc5bc
Author: Sarper Akdemir 
AuthorDate: Thu Jun 25 20:33:05 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Aug 20 15:21:07 2020 +0200

make physics based animation effects importable-exportable

Makes physics based animation effects importable and exportable
on content.xml. Uses one new xml token animatePhysics.

Also adds a new animation preset called Physics Basic that is
available under Emphasis animation effect category.

Change-Id: I38b0511f973668655cff78becebe3f1e628d9083
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100247
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/animations/source/animcore/animcore.component 
b/animations/source/animcore/animcore.component
index 2f490aa0ae06..cd691f05e0ba 100644
--- a/animations/source/animcore/animcore.component
+++ b/animations/source/animcore/animcore.component
@@ -30,6 +30,10 @@
   
 
+  
+
+
   
   
diff --git a/animations/source/animcore/animcore.cxx 
b/animations/source/animcore/animcore.cxx
index f3ffe8c4190a..88e42772936a 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -291,7 +291,7 @@ private:
 const sal_Int16 mnNodeType;
 
 // for XTypeProvider
-static std::array*, 12> mpTypes;
+static std::array*, 13> mpTypes;
 
 // attributes for the XAnimationNode interface implementation
 Any maBegin, maDuration, maEnd, maEndSync, maRepeatCount, maRepeatDuration;
@@ -394,7 +394,7 @@ Any SAL_CALL TimeContainerEnumeration::nextElement()
 }
 
 
-std::array*, 12> AnimationNode::mpTypes = { nullptr, nullptr, 
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, 
nullptr, nullptr };
+std::array*, 13> AnimationNode::mpTypes = { nullptr, nullptr, 
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, 
nullptr, nullptr, nullptr };
 
 AnimationNode::AnimationNode( sal_Int16 nNodeType )
 :   maChangeListener(maMutex),
@@ -565,6 +565,16 @@ static OUString getImplementationName_ANIMATEMOTION()
 return "animcore::AnimateMotion";
 }
 
+static Sequence getSupportedServiceNames_ANIMATEPHYSICS()
+{
+return { "com.sun.star.animations.AnimatePhysics" };
+}
+
+static OUString getImplementationName_ANIMATEPHYSICS()
+{
+return "animcore::AnimatePhysics";
+}
+
 static Sequence getSupportedServiceNames_ANIMATETRANSFORM()
 {
 return { "com.sun.star.animations.AnimateTransform" };
@@ -658,6 +668,12 @@ Any SAL_CALL AnimationNode::queryInterface( const Type& 
aType )
 static_cast< XAnimate * >( static_cast< XAnimateMotion * 
>(this) ),
 static_cast< XAnimateMotion * >( this ) );
 break;
+case AnimationNodeType::ANIMATEPHYSICS:
+aRet = ::cppu::queryInterface(
+aType,
+static_cast< XAnimate * >( static_cast< XAnimateMotion * 
>(this) ),
+static_cast< XAnimateMotion * >( this ) );
+break;
 case AnimationNodeType::ANIMATECOLOR:
 aRet = ::cppu::queryInterface(
 aType,
@@ -717,6 +733,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) 
throw()
 8, // TRANSITIONFILTER
 8, // AUDIO
 8, // COMMAND
+8, // ANIMATEPHYSICS
 };
 
 // collect types
@@ -749,6 +766,9 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) 
throw()
 case AnimationNodeType::ANIMATEMOTION:
 pTypeAr[nPos++] = cppu::UnoType::get();
 break;
+case AnimationNodeType::ANIMATEPHYSICS:
+pTypeAr[nPos++] = cppu::UnoType::get();
+break;
 case AnimationNodeType::ANIMATECOLOR:
 pTypeAr[nPos++] = cppu::UnoType::get();
 break;
@@ -817,6 +837,8 @@ OUString AnimationNode::getImplementationName()
 return getImplementationName_ANIMATECOLOR();
 case AnimationNodeType::ANIMATEMOTION:
 return getImplementationName_ANIMATEMOTION();
+case AnimationNodeType::ANIM

[Libreoffice-commits] core.git: sw/source

[Michael Stahl (via logerrit)]

 sw/source/uibase/lingu/olmenu.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a58fe88b5b406749f6e47c14f56d7490a7958bda
Author: Michael Stahl 
AuthorDate: Thu Aug 20 14:00:04 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 20 15:11:20 2020 +0200

tdf#135721 sw: fix SwSpellPopup::Execute() deleting flys

Follow-up to ec579354af954867b829e7d08e4d752518c83728 :
in 6.4, this is the location of the spell check menu code; not sure
how to call this but it has the same bug...

(regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)

Change-Id: I0e6ce9c97d810f7c92dff320d403c986a947c266
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101073
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/uibase/lingu/olmenu.cxx 
b/sw/source/uibase/lingu/olmenu.cxx
index c6e4b1349ef3..866402f8905f 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -722,9 +722,8 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
 
 m_pSh->StartUndo(SwUndoId::UI_REPLACE, &aRewriter);
 m_pSh->StartAction();
-m_pSh->DelLeft();
 
-m_pSh->Insert( aTmp );
+m_pSh->Replace(aTmp, false);
 
 /* #102505# EndAction/EndUndo moved down since insertion
of temporary auto correction is now undoable two and
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang include/vcl toolkit/source vcl/inc vcl/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/virtualdead.results  |4 +-
 compilerplugins/clang/virtualdead.unusedparams.results |7 +---
 include/vcl/toolkit/treelistbox.hxx|5 +-
 include/vcl/toolkit/vclmedit.hxx   |6 ---
 toolkit/source/controls/tree/treecontrolpeer.cxx   |4 +-
 vcl/inc/treeglue.hxx   |   14 ++--
 vcl/source/edit/vclmedit.cxx   |   29 -
 vcl/source/treelist/treelistbox.cxx|   10 ++---
 8 files changed, 17 insertions(+), 62 deletions(-)

New commits:
commit d31570fbcc95ef718a68c4b0f94584b2b714d4f9
Author: Noel Grandin 
AuthorDate: Thu Aug 20 12:45:19 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 20 14:58:31 2020 +0200

loplugin:virtualdead

Change-Id: Ib41d80d1e068d66edabdfb36061dd382dc34b04c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101046
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/virtualdead.results 
b/compilerplugins/clang/virtualdead.results
index a7ea08a6118e..8e2aa00ce120 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -64,8 +64,8 @@ include/unotools/desktopterminationobserver.hxx:36
 include/vbahelper/vbahelperinterface.hxx:74
 int InheritedHelperInterfaceImpl::getCreator()
 1400204879
-include/vcl/toolkit/treelistbox.hxx:512
-void SvTreeListBox::PreparePaint(class OutputDevice &,class 
SvTreeListEntry &,)
+include/vcl/toolkit/vclmedit.hxx:118
+void VclMultiLineEdit::UpdateData()
 empty
 sc/source/core/opencl/formulagroupcl.cxx:1069
 void sc::opencl::(anonymous 
namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class 
std::__cxx11::basic_stringstream &,)
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results 
b/compilerplugins/clang/virtualdead.unusedparams.results
index 130223cb56be..fe2036720143 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -130,13 +130,10 @@ include/vcl/dndhelp.hxx:62
 include/vcl/opengl/OpenGLContext.hxx:141
 struct SystemWindowData OpenGLContext::generateWinData(class vcl::Window 
*,_Bool,)
 10
-include/vcl/toolkit/treelistbox.hxx:431
+include/vcl/toolkit/treelistbox.hxx:430
 enum DragDropMode SvTreeListBox::NotifyStartDrag(class 
TransferDataContainer &,class SvTreeListEntry *,)
 00
-include/vcl/toolkit/treelistbox.hxx:512
-void SvTreeListBox::PreparePaint(class OutputDevice &,class 
SvTreeListEntry &,)
-00
-include/vcl/toolkit/treelistbox.hxx:591
+include/vcl/toolkit/treelistbox.hxx:589
 _Bool SvTreeListBox::EditingEntry(class SvTreeListEntry *,class Selection 
&,)
 10
 sc/inc/filter.hxx:82
diff --git a/include/vcl/toolkit/treelistbox.hxx 
b/include/vcl/toolkit/treelistbox.hxx
index fe9c1d653c7a..0af7d371659b 100644
--- a/include/vcl/toolkit/treelistbox.hxx
+++ b/include/vcl/toolkit/treelistbox.hxx
@@ -427,8 +427,7 @@ public:
 virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) 
override;
 virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) 
override;
 virtual void StartDrag( sal_Int8 nAction, const Point& 
rPosPixel ) override;
-virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData,
- SvTreeListEntry* );
+virtual DragDropMode NotifyStartDrag();
 virtual void DragFinished( sal_Int8 nDropAction );
 
 SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource );
@@ -586,7 +585,7 @@ public:
 voidEnableInplaceEditing( bool bEnable );
 // Edits the Entry's first StringItem, 0 == Cursor
 voidEditEntry( SvTreeListEntry* pEntry );
-virtual boolEditingEntry( SvTreeListEntry* pEntry, Selection& );
+virtual boolEditingEntry( SvTreeListEntry* pEntry );
 virtual boolEditedEntry( SvTreeListEntry* pEntry, const OUString& 
rNewText );
 
 virtual voidPaint( vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect ) override;
diff --git a/include/vcl/toolkit/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx
index a15ca2aaa901..da38a5bbcb57 100644
--- a/include/vcl/toolkit/vclmedit.hxx
+++ b/include/vcl/toolkit/vclmedit.hxx
@@ -84,8 +84,6 @@ private:
 
 Link  aModifyHdlLink;
 
-std::unique_ptr pUpdateDataTimer;
-
 protected:
 
 DECL_LINK( ImpUpdateDataHdl, Timer*, void );
@@ -114,10 +112,6 @@ public:
 virtual voidSetModifyFlag() override;
 virtual voidClearModifyFlag() override;
 
-voidEnableUpdateData( sal_uLong nTimeout );
-virtual voidUpdateData();
-voidDisableUpdateData() { pUpdateDataTimer.reset(); }
-
 virtual voidSetReadOnly( bool bReadOnly = true ) override;
 virtual boolIsReadOnly() const override;
 
diff -

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit fbead0febeef17092286f8252ee2241fee8172ee
Author: Michael Meeks 
AuthorDate: Tue Aug 18 19:54:41 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu Aug 20 14:41:54 2020 +0200

We no longer need to mess with focus during sidebar paint.

TextInput.js sends keyboard events to the right dialog window now
by referring to Map.js - rather than needing several different places
that can be focused.

Change-Id: I044bc858a80379b68838d64d1987a1dbd9007195
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100981
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 117ae0873..b46fa91c4 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1629,13 +1629,6 @@ L.Control.LokDialog = L.Control.extend({
 
this._resizeCalcInputBar(deckOffset);
this._adjustTabsBar(width);
-   // If we didn't have the focus, don't steal it form the editor.
-   if ($('#' + this._currentDeck.strId + '-cursor').css('display') 
=== 'none') {
-   if (this._map.editorHasFocus()) {
-   this._map.fire('editorgotfocus');
-   this._map.focus();
-   }
-   }
},
 
_resizeCalcInputBar: function(offset) {
___
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' - xmloff/source

[Michael Stahl (via logerrit)]

 xmloff/source/style/PageMasterExportPropMapper.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fb87c2ae2d28665f6d95df8ff5ac410db2dccb45
Author: Michael Stahl 
AuthorDate: Wed Aug 19 18:12:01 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Aug 20 14:14:14 2020 +0200

tdf#103602 xmloff: ODF export of page style: don't export draw:fill

... attributes on header-style and footer-style in strict ODF.

Change-Id: Ic1af26b6112a5afbb70a82b29dbacd3dcec14ec3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101012
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit dd7caf3cfd3de636c8bf37c8347c1b72b3772aeb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101041
Reviewed-by: Thorsten Behrens 

diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx 
b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 9c20a6a2b70e..a0443a5103c7 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -350,7 +350,11 @@ void XMLPageMasterExportPropMapper::ContextFilter(
 
 // tdf#103602 don't export draw:fill attributes on 
page-layout-properteis in strict ODF
 if (!isDrawingPageExport
-&& aPropMapper->GetEntryAPIName(rProp.mnIndex).startsWith("Fill")
+&& [](OUString const& rName) -> bool {
+return rName.startsWith("Fill")
+|| rName.startsWith("HeaderFill")
+|| rName.startsWith("FooterFill");
+} (aPropMapper->GetEntryAPIName(rProp.mnIndex))
 && ((aBackgroundImageExport.GetExport().getSaneDefaultVersion()
 & SvtSaveOptions::ODFSVER_EXTENDED) == 0))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/inc sw/source

[Michael Stahl (via logerrit)]

 sw/inc/textboxhelper.hxx|5 +
 sw/source/core/doc/DocumentContentOperationsManager.cxx |6 +-
 sw/source/core/doc/textboxhelper.cxx|   16 +---
 sw/source/core/undo/undobj1.cxx |1 +
 4 files changed, 4 insertions(+), 24 deletions(-)

New commits:
commit 8934e31f53274a5e288340c9f756aac5f931eba4
Author: Michael Stahl 
AuthorDate: Wed Aug 19 16:44:09 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Aug 20 14:13:59 2020 +0200

tdf#135412 tdf#135888 sw: fix copying of linked text-boxes

The resetLink()/restoreLinks() were added in commit
00a007be5ad88bac9905b373bc5e02d02acab11a because testMissingPath
missing-path.docx was crashing.

But then 0bcc5b3daebeb2a7d2b5ba132af4745cc6c78cd0 refactored how linking
works and introduced the isTextBox function, which is called in the
middle of DocumentContentOperationsManager::CopyFlyInFlyImpl() after
resetLink(), and this now always returns false, the same for another
call inside CopyLayoutFormat() (when called from CopyFlyInFlyImpl()),
which causes text-boxes to be copied to 2 separate flys (tdf#135888).

The problem in tdf#135412 is that somehow when called from
SwFEShell::Paste() the content-index from the clipboard document ends up
in the SwDrawFrameFormat that is created in the target document,
and this causes crash in Undo because the node index is out of bounds.

 10 SwUndoInsLayFormat::UndoImpl (this=0x7c2a760, rContext=...) at 
sw/source/core/undo/undobj1.cxx:310
(rr) p rContent.GetContentIdx()->GetNode().GetDoc()->IsClipBoard()
(rr) $29 = true

It turns out that missing-path.docx doesn't crash any more without
resetLink(), and removing it fixes the 2 bugs.

Change-Id: I0c6c91a42e00b9f3b79b774c814e7323f2bb3e05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101004
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 10ae7ba661dff57a7d08174792565ec5e33fae9b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100948
Reviewed-by: Thorsten Behrens 

diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index db565c2e8915..746a5e90b356 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -120,12 +120,9 @@ public:
 /// Saves the current shape -> textbox links in a map, so they can be 
restored later.
 static void saveLinks(const SwFrameFormats& rFormats,
   std::map& rLinks);
-/// Reset the shape -> textbox link on the shape, and save it to the map, 
so it can be restored later.
-static void resetLink(SwFrameFormat* pShape,
-  std::map& 
rOldContent);
 /// Undo the effect of saveLinks() + individual resetLink() calls.
 static void restoreLinks(std::set& rOld, 
std::vector& rNew,
- SavedLink& rSavedLinks, SavedContent& 
rResetContent);
+ SavedLink& rSavedLinks);
 };
 
 #endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 162b8389e463..ecebb3d000b6 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3595,7 +3595,6 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
 
 SwTextBoxHelper::SavedLink aOldTextBoxes;
 SwTextBoxHelper::saveLinks(*m_rDoc.GetSpzFrameFormats(), aOldTextBoxes);
-SwTextBoxHelper::SavedContent aOldContent;
 
 for ( size_t n = 0; n < nArrLen; ++n )
 {
@@ -3662,9 +3661,6 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
 }
 if( bAdd )
 {
-// Make sure draw formats don't refer to content, so that such
-// content can be removed without problems.
-SwTextBoxHelper::resetLink(pFormat, aOldContent);
 aSet.insert( ZSortFly( pFormat, pAnchor, nArrLen + aSet.size() ));
 }
 }
@@ -3834,7 +3830,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
 // Re-create content property of draw formats, knowing how old shapes
 // were paired with old fly formats (aOldTextBoxes) and that aSet is
 // parallel with aVecSwFrameFormat.
-SwTextBoxHelper::restoreLinks(aSet, aVecSwFrameFormat, aOldTextBoxes, 
aOldContent);
+SwTextBoxHelper::restoreLinks(aSet, aVecSwFrameFormat, aOldTextBoxes);
 }
 }
 
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 4656e3bec14c..ea57aa58319d 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -639,19 +639,8 @@ void SwTextBoxHelper::saveLinks(const SwFrameFormats& 
rFormats,
 }
 }
 
-void SwTextBoxHelper::resetLink(SwFrameFormat* pShape,
-  

Re: GSoC "Extending the UITest framework" Week (11) Report

[ahmed El-Shreif]

Hello all,

> Here is my Week (11) report:
> > https://ahmedelshreifgsoc20.blogspot.com/2020/08/week-11-report.html
> >
> > waiting for all your feedback.
>
> I notice that your next week tasks include starting on documentation of
> the project.
>
> I encourage you to provide guidance about the prerequisites.  My last
> attempt
> to use your work ended with the lack, IIRC, of xtext needed by the
> conversion
> to Python; I wonder what the next stopper will be.
>
> Thanks,
> Terry.
>

I will try to provide each single detail needed and all the prerequisites.

But for now I think this video will be really helpful:
https://youtu.be/nnng_er2mro
I created it to show how to use the work.

Also here is a documentation for the UI Logger:
https://chiranias.blogspot.com/2018/08/an-overview-of-how-ui-logging-works-in.html

 Also here is another documentation of the full work done from the last
year:
https://ahmedelshreif.blogspot.com/2019/08/ui-logger.html

I will try also to keep this wiki page updated with all the details:
https://wiki.documentfoundation.org/Development/UITests

Thanks,
Ahmed ElShreif
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Michael Stahl (via logerrit)]

 sw/source/uibase/shells/textsh1.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ec579354af954867b829e7d08e4d752518c83728
Author: Michael Stahl 
AuthorDate: Wed Aug 19 18:55:27 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 20 13:47:08 2020 +0200

tdf#135721 sw: fix spell check context menu deleting flys

Kind of similar to e1629c210ad78310e3d48c0756723134a27b89df
but the problem is at a higher level: SwTextShell::Execute() with
SID_SPELLCHECK_APPLY_SUGGESTION should not DelLeft() + Insert() but
just Replace().

(regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)

Change-Id: I78487c7841ba22ccc6751240a8e55e08a86fba32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101014
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index 932eca2901ba..c8c2ecfa9ffc 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1562,9 +1562,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
 
 rWrtSh.StartUndo(SwUndoId::UI_REPLACE, &aRewriter);
 rWrtSh.StartAction();
-rWrtSh.DelLeft();
 
-rWrtSh.Insert( aTmp );
+rWrtSh.Replace(aTmp, false);
 
 /* #102505# EndAction/EndUndo moved down since insertion
of temporary auto correction is now undoable two and
___
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' - vcl/headless

[Tor Lillqvist (via logerrit)]

 vcl/headless/svpinst.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c22f194479185423b773f5ffc5881bb9ccf722ba
Author: Tor Lillqvist 
AuthorDate: Thu Aug 20 14:24:33 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Aug 20 13:45:27 2020 +0200

Fix iOS build error

Change-Id: Ic272d1b7e91662e8da212f18d52e063ae5ab9d00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101047
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 6ff536926829..303ee40f4da7 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -268,6 +268,8 @@ cairo_surface_t* get_underlying_cairo_surface(const 
VirtualDevice& rDevice)
 return 
static_cast(rDevice.mpVirDev.get())->GetSurface();
 }
 
+#endif
+
 const cairo_font_options_t* SvpSalInstance::GetCairoFontOptions()
 {
 static cairo_font_options_t *gOptions = nullptr;
@@ -281,8 +283,6 @@ const cairo_font_options_t* 
SvpSalInstance::GetCairoFontOptions()
 return gOptions;
 }
 
-#endif
-
 SalTimer* SvpSalInstance::CreateSalTimer()
 {
 return new SvpSalTimer( this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source desktop/source forms/source include/svtools include/vcl svtools/source svx/source vcl/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/constantparam.bitmask.results  |4 
 compilerplugins/clang/constantparam.booleans.results |  398 ---
 compilerplugins/clang/constantparam.constructors.results |  138 ++---
 compilerplugins/clang/constantparam.numbers.results  |  282 +-
 dbaccess/source/ui/app/AppDetailPageHelper.cxx   |2 
 dbaccess/source/ui/control/tabletree.cxx |4 
 dbaccess/source/ui/inc/dbtreelistbox.hxx |2 
 desktop/source/lib/init.cxx  |   15 
 forms/source/solar/control/navtoolbar.cxx|2 
 include/svtools/imagemgr.hxx |2 
 include/svtools/recorditemwindow.hxx |2 
 include/vcl/toolkit/treelistbox.hxx  |2 
 svtools/source/brwbox/recorditemwindow.cxx   |4 
 svtools/source/misc/imagemgr.cxx |8 
 svx/source/form/tbxform.cxx  |2 
 vcl/source/treelist/treelistbox.cxx  |4 
 16 files changed, 450 insertions(+), 421 deletions(-)

New commits:
commit 6274fbe13c8fa556916b5aed695c6921ef6ff84f
Author: Noel Grandin 
AuthorDate: Thu Aug 20 12:16:15 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 20 13:41:30 2020 +0200

loplugin:constantparam

Change-Id: I59a37e1d37fa749cba5159daa23fe663bcc55435
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101045
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/constantparam.bitmask.results 
b/compilerplugins/clang/constantparam.bitmask.results
index e7e1e830fa2a..17b57d32bf66 100644
--- a/compilerplugins/clang/constantparam.bitmask.results
+++ b/compilerplugins/clang/constantparam.bitmask.results
@@ -13,13 +13,13 @@ include/basegfx/polygon/b2dpolygontools.hxx:145
 include/framework/framelistanalyzer.hxx:185
 void framework::FrameListAnalyzer::FrameListAnalyzer(const class 
com::sun::star::uno::Reference 
&,const class com::sun::star::uno::Reference &,enum FrameAnalyzerFlags)
 enum FrameAnalyzerFlags eDetectMode setBits=0x4
-include/sfx2/objsh.hxx:464
+include/sfx2/objsh.hxx:471
 void SfxObjectShell::FinishedLoading(enum SfxLoadedFlags)
 enum SfxLoadedFlags nWhich setBits=0x1
 include/svtools/brwbox.hxx:511
 void BrowseBox::InsertDataColumn(unsigned short,const class rtl::OUString 
&,long,enum HeaderBarItemBits,unsigned short)
 enum HeaderBarItemBits nBits setBits=0x400 clearBits=0x3ec
-include/vcl/wizardmachine.hxx:140
+include/vcl/wizardmachine.hxx:139
 void vcl::WizardMachine::WizardMachine(class weld::Window *,enum 
WizardButtonFlags)
 enum WizardButtonFlags _nButtonFlags setBits=0xf
 sc/inc/rangelst.hxx:48
diff --git a/compilerplugins/clang/constantparam.booleans.results 
b/compilerplugins/clang/constantparam.booleans.results
index a7997ecceac1..99d80d4ab8a3 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -74,7 +74,7 @@ chart2/qa/extras/chart2dump/chart2dump.cxx:98
 void Chart2DumpTest::Chart2DumpTest(_Bool)
 _Bool bDumpMode
 0
-chart2/qa/extras/chart2export.cxx:420
+chart2/qa/extras/chart2export.cxx:424
 void checkCommonTrendline(const class com::sun::star::uno::Reference 
&,double,double,_Bool,double,_Bool,_Bool)
 _Bool aExpectedShowEquation
 1
@@ -222,7 +222,7 @@ connectivity/inc/sdbcx/VUser.hxx:62
 void connectivity::sdbcx::OUser::OUser(const class rtl::OUString &,_Bool)
 _Bool _bCase
 1
-connectivity/source/drivers/postgresql/pq_connection.cxx:352
+connectivity/source/drivers/postgresql/pq_connection.cxx:349
 void pq_sdbc_driver::(anonymous namespace)::cstr_vector::push_back(const 
char *,enum __sal_NoAcquire)
 enum __sal_NoAcquire 
 0
@@ -266,6 +266,10 @@ cui/source/inc/acccfg.hxx:43
 void TAccInfo::TAccInfo(int,int,const class vcl::KeyCode &)
 int nListPos
 0
+cui/source/inc/cfg.hxx:335
+void SvxMenuEntriesListBox::set_text(int,const class rtl::OUString &,int)
+int col
+0
 cui/source/inc/cfg.hxx:459
 void SvxConfigPage::InsertEntryIntoUI(class SvxConfigEntry *,class 
weld::TreeView &,class weld::TreeIter &,_Bool)
 _Bool bMenu
@@ -278,7 +282,7 @@ cui/source/inc/cfgutil.hxx:143
 class std::unique_ptr > 
CuiConfigFunctionListBox::make_iterator(const class weld::TreeIter *) const
 const class weld::TreeIter * pOrig
 0
-cui/source/inc/cuitabarea.hxx:726
+cui/source/inc/cuitabarea.hxx:727
 void SvxColorTabPage::SetPropertyList(enum XPropertyListType,const class 
rtl::Reference &)
 enum XPropertyListType t
 0
@@ -334,7 +338,7 @@ dbaccess/source/ui/app/AppSwapWindow.hxx:58
 class SvxIconChoiceCtrlEntry * 
dbaui::OApplicationSwapWindow::GetEntry(unsigned long) const
 unsigned long nPos
 0
-dbaccess/source/ui/control/tabletree.cxx:287
+dbaccess/source/ui/control/tabletree.cxx:172
   

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - include/vcl sw/qa vcl/inc vcl/unx

[Caolán McNamara (via logerrit)]

 include/vcl/weldutils.hxx |  128 ++
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |2 
 vcl/inc/unx/gtk/gtkinst.hxx   |   99 ++-
 vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx |2 
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   34 +++
 5 files changed, 175 insertions(+), 90 deletions(-)

New commits:
commit 9869ca098765ed5ec0325492fa2cdce4a5bab795
Author: Caolán McNamara 
AuthorDate: Wed Nov 13 21:28:12 2019 +
Commit: Thorsten Behrens 
CommitDate: Thu Aug 20 13:17:33 2020 +0200

factor out 'weld::Widget as XWindow'

Reviewed-on: https://gerrit.libreoffice.org/82641
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 20d5f61abfd47fc76da3be8241653fdb7ae10491)

Change-Id: I24b52c5b8908fdf1a66fd26b2dc438b9557afa6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100423
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx
index 4144803e8b3d..764d343902df 100644
--- a/include/vcl/weldutils.hxx
+++ b/include/vcl/weldutils.hxx
@@ -10,8 +10,11 @@
 #ifndef INCLUDED_VCL_WELDUTILS_HXX
 #define INCLUDED_VCL_WELDUTILS_HXX
 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -29,6 +32,131 @@ public:
 // fill in the label and icons for actions and dispatch the action on item 
click
 ToolbarUnoDispatcher(Toolbar& rToolbar, const 
css::uno::Reference& rFrame);
 };
+
+typedef cppu::WeakComponentImplHelper 
TransportAsXWindow_Base;
+
+class VCL_DLLPUBLIC TransportAsXWindow : public TransportAsXWindow_Base
+{
+private:
+osl::Mutex m_aHelperMtx;
+weld::Widget* m_pWeldWidget;
+
+comphelper::OInterfaceContainerHelper2 m_aWindowListeners;
+comphelper::OInterfaceContainerHelper2 m_aKeyListeners;
+comphelper::OInterfaceContainerHelper2 m_aFocusListeners;
+comphelper::OInterfaceContainerHelper2 m_aMouseListeners;
+comphelper::OInterfaceContainerHelper2 m_aMotionListeners;
+comphelper::OInterfaceContainerHelper2 m_aPaintListeners;
+
+public:
+TransportAsXWindow(weld::Widget* pWeldWidget)
+: TransportAsXWindow_Base(m_aHelperMtx)
+, m_pWeldWidget(pWeldWidget)
+, m_aWindowListeners(m_aHelperMtx)
+, m_aKeyListeners(m_aHelperMtx)
+, m_aFocusListeners(m_aHelperMtx)
+, m_aMouseListeners(m_aHelperMtx)
+, m_aMotionListeners(m_aHelperMtx)
+, m_aPaintListeners(m_aHelperMtx)
+{
+}
+
+weld::Widget* getWidget() const { return m_pWeldWidget; }
+
+virtual void clear() { m_pWeldWidget = nullptr; }
+
+// css::awt::XWindow
+void SAL_CALL setPosSize(sal_Int32, sal_Int32, sal_Int32, sal_Int32, 
sal_Int16) override
+{
+throw css::uno::RuntimeException("not implemented");
+}
+
+css::awt::Rectangle SAL_CALL getPosSize() override
+{
+throw css::uno::RuntimeException("not implemented");
+}
+
+void SAL_CALL setVisible(sal_Bool bVisible) override { 
m_pWeldWidget->set_visible(bVisible); }
+
+void SAL_CALL setEnable(sal_Bool bSensitive) override
+{
+m_pWeldWidget->set_sensitive(bSensitive);
+}
+
+void SAL_CALL setFocus() override { m_pWeldWidget->grab_focus(); }
+
+void SAL_CALL
+addWindowListener(const css::uno::Reference& 
rListener) override
+{
+m_aWindowListeners.addInterface(rListener);
+}
+
+void SAL_CALL
+removeWindowListener(const css::uno::Reference& 
rListener) override
+{
+m_aWindowListeners.removeInterface(rListener);
+}
+
+void SAL_CALL
+addFocusListener(const css::uno::Reference& 
rListener) override
+{
+m_aFocusListeners.addInterface(rListener);
+}
+
+void SAL_CALL
+removeFocusListener(const css::uno::Reference& 
rListener) override
+{
+m_aFocusListeners.removeInterface(rListener);
+}
+
+void SAL_CALL
+addKeyListener(const css::uno::Reference& 
rListener) override
+{
+m_aKeyListeners.addInterface(rListener);
+}
+
+void SAL_CALL
+removeKeyListener(const css::uno::Reference& 
rListener) override
+{
+m_aKeyListeners.removeInterface(rListener);
+}
+
+void SAL_CALL
+addMouseListener(const css::uno::Reference& 
rListener) override
+{
+m_aMouseListeners.addInterface(rListener);
+}
+
+void SAL_CALL
+removeMouseListener(const css::uno::Reference& 
rListener) override
+{
+m_aMouseListeners.removeInterface(rListener);
+}
+
+void SAL_CALL addMouseMotionListener(
+const css::uno::Reference& rListener) 
override
+{
+m_aMotionListeners.addInterface(rListener);
+}
+
+void SAL_CALL removeMouseMotionListener(
+const css::uno::Reference& rListener) 
override
+{
+m_aMotionListeners.removeInterface(rListener);
+}
+
+void SAL_CALL
+  

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/svtools svtools/source svx/source

[Caolán McNamara (via logerrit)]

 include/svtools/editbrowsebox.hxx |   27 +--
 svtools/source/brwbox/ebbcontrols.cxx |   10 ++--
 svx/source/fmcomp/gridcell.cxx|   39 +-
 svx/source/inc/gridcell.hxx   |9 +++
 4 files changed, 62 insertions(+), 23 deletions(-)

New commits:
commit 23c965a299315398c0931ecefbca49824cc21261
Author: Caolán McNamara 
AuthorDate: Fri Aug 14 16:26:52 2020 +0100
Commit: Michael Stahl 
CommitDate: Thu Aug 20 13:07:27 2020 +0200

tdf#135550 make XComboBox Item status changed event work again

Change-Id: I323a114d3b71a74267ee7a89c5fb29821611e57e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100704
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 2e9c7cb891cb..61deadfdd4fa 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -319,6 +319,11 @@ namespace svt
 //= ComboBoxControl
 class SVT_DLLPUBLIC ComboBoxControl final : public InterimItemWindow
 {
+private:
+std::unique_ptr m_xWidget;
+Link m_aModify1Hdl;
+Link m_aModify2Hdl;
+
 friend class ComboBoxCellController;
 
 public:
@@ -326,10 +331,28 @@ namespace svt
 
 weld::ComboBox& get_widget() { return *m_xWidget; }
 
+// sets a link to call when the selection is changed by the user
+void SetModifyHdl(const Link& rHdl)
+{
+m_aModify1Hdl = rHdl;
+}
+
+// sets an additional link to call when the selection is changed by 
the user
+void SetAuxModifyHdl(const Link& rLink)
+{
+m_aModify2Hdl = rLink;
+}
+
 virtual void dispose() override;
 
 private:
-std::unique_ptr m_xWidget;
+DECL_LINK(SelectHdl, weld::ComboBox&, void);
+
+void CallModifyHdls()
+{
+m_aModify1Hdl.Call(nullptr);
+m_aModify2Hdl.Call(nullptr);
+}
 };
 
 //= ComboBoxCellController
@@ -346,7 +369,7 @@ namespace svt
 protected:
 virtual bool MoveAllowed(const KeyEvent& rEvt) const override;
 private:
-DECL_LINK(ModifyHdl, weld::ComboBox&, void);
+DECL_LINK(ModifyHdl, LinkParamNone*, void);
 };
 
 //= ListBoxControl
diff --git a/svtools/source/brwbox/ebbcontrols.cxx 
b/svtools/source/brwbox/ebbcontrols.cxx
index 2c6291fd3f7e..4d4fc8ea72cf 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -32,6 +32,7 @@ namespace svt
 , m_xWidget(m_xBuilder->weld_combo_box("combobox"))
 {
 m_xWidget->set_entry_width_chars(1); // so a smaller than default 
width can be used
+m_xWidget->connect_changed(LINK(this, ComboBoxControl, SelectHdl));
 }
 
 void ComboBoxControl::dispose()
@@ -40,14 +41,19 @@ namespace svt
 InterimItemWindow::dispose();
 }
 
+IMPL_LINK_NOARG(ComboBoxControl, SelectHdl, weld::ComboBox&, void)
+{
+CallModifyHdls();
+}
+
 //= ComboBoxCellController
 ComboBoxCellController::ComboBoxCellController(ComboBoxControl* pWin)
  :CellController(pWin)
 {
-GetComboBox().connect_changed(LINK(this, ComboBoxCellController, 
ModifyHdl));
+static_cast(GetWindow()).SetModifyHdl(LINK(this, 
ComboBoxCellController, ModifyHdl));
 }
 
-IMPL_LINK_NOARG(ComboBoxCellController, ModifyHdl, weld::ComboBox&, void)
+IMPL_LINK_NOARG(ComboBoxCellController, ModifyHdl, LinkParamNone*, void)
 {
 callModifyHdl();
 }
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index fcbb633fb003..8811f7ce29e1 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -4031,10 +4031,10 @@ FmXComboBoxCell::FmXComboBoxCell( DbGridColumn* 
pColumn, std::unique_ptr(m_pCellControl->GetWindow()).get_widget())
+,m_pComboBox(&static_cast(m_pCellControl->GetWindow()))
 
,m_nLines(Application::GetSettings().GetStyleSettings().GetListBoxMaximumLineCount())
 {
-m_pComboBox->connect_changed(LINK(this, FmXComboBoxCell, ChangedHdl));
+m_pComboBox->SetAuxModifyHdl(LINK(this, FmXComboBoxCell, ChangedHdl));
 }
 
 FmXComboBoxCell::~FmXComboBoxCell()
@@ -4053,7 +4053,7 @@ void FmXComboBoxCell::disposing()
 m_aItemListeners.disposeAndClear(aEvt);
 m_aActionListeners.disposeAndClear(aEvt);
 
-m_pComboBox->connect_changed( Link() );
+m_pComboBox->SetAuxModifyHdl(Link());
 m_pComboBox = nullptr;
 
 FmXTextCell::disposing();
@@ -4105,7 +4105,8 @@ void SAL_CALL FmXComboBoxCell::addItem( const OUString& 
Item, sal_Int16 Pos )
 ::osl::MutexGuard aGuard( m_aMutex );
 if (!m_pComboBox)
 return;
-m_pComboBox->insert_text(Pos, Item);
+weld::ComboBox& rBox = m_pComboBox->get_widget();
+rBox.insert_text(Pos, Item);
 }
 
 void SAL_CALL FmXComboBoxCell::addItems( con

[Libreoffice-commits] online.git: loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CanvasTileLayer.js |   19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 701e78a6aef7013622c95c75c2a37f9e6e870a2b
Author: Michael Meeks 
AuthorDate: Wed Aug 19 18:21:00 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu Aug 20 11:23:06 2020 +0200

Detect dpi scale factor change and re-render.

Change-Id: I4c09ade1efdfee67bc5d9224c50cf1825b6657fb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101016
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 06911991c..f6c29d57a 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -40,10 +40,11 @@ L.CanvasTilePainter = L.Class.extend({
debug: false,
},
 
-   initialize: function (layer, dpiScale, enableImageSmoothing) {
+   initialize: function (layer, enableImageSmoothing) {
this._layer = layer;
this._canvas = this._layer._canvas;
 
+   var dpiScale = L.getDpiScaleFactor();
if (dpiScale === 1 || dpiScale === 2) {
enableImageSmoothing = (enableImageSmoothing === true);
}
@@ -221,10 +222,12 @@ L.CanvasTilePainter = L.Class.extend({
var newTopLeft = pixelBounds.getTopLeft();
var part = this._layer._selectedPart;
var newSplitPos = splitPanesContext ?
-   splitPanesContext.getSplitPos(): this._splitPos;
+   splitPanesContext.getSplitPos(): this._splitPos;
+   var newDpiScale = L.getDpiScaleFactor();
 
var zoomChanged = (zoom !== this._lastZoom);
var partChanged = (part !== this._lastPart);
+   var scaleChanged = this._dpiScale != newDpiScale;
 
var mapSizeChanged = !newMapSize.equals(this._lastMapSize);
// To avoid flicker, only resize the canvas element if width or 
height of the map increases.
@@ -241,13 +244,16 @@ L.CanvasTilePainter = L.Class.extend({
!zoomChanged &&
!partChanged &&
!resizeCanvas &&
-   !splitPosChanged);
+   !splitPosChanged &&
+   !scaleChanged);
 
if (skipUpdate) {
return;
}
+   if (scaleChanged)
+   this._dpiScale = L.getDpiScaleFactor();
 
-   if (resizeCanvas) {
+   if (resizeCanvas || scaleChanged) {
this._setCanvasSize(newSize.x, newSize.y);
this._lastSize = newSize;
}
@@ -265,7 +271,8 @@ L.CanvasTilePainter = L.Class.extend({
 
// TODO: fix _shiftAndPaint for high DPI.
var shiftPaintDisabled = true;
-   var fullRepaintNeeded = zoomChanged || partChanged || 
resizeCanvas || shiftPaintDisabled;
+   var fullRepaintNeeded = zoomChanged || partChanged || 
resizeCanvas ||
+   shiftPaintDisabled || scaleChanged;
 
this._lastZoom = zoom;
this._lastPart = part;
@@ -439,7 +446,7 @@ L.CanvasTileLayer = L.TileLayer.extend({
}
 
this._canvas = L.DomUtil.create('canvas', '', 
this._canvasContainer);
-   this._painter = new L.CanvasTilePainter(this, 
L.getDpiScaleFactor());
+   this._painter = new L.CanvasTilePainter(this);
this._container.style.position = 'absolute';
 
if (L.Browser.cypressTest) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmloff/source

[Michael Stahl (via logerrit)]

 xmloff/source/style/PageMasterExportPropMapper.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit dd7caf3cfd3de636c8bf37c8347c1b72b3772aeb
Author: Michael Stahl 
AuthorDate: Wed Aug 19 18:12:01 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 20 10:56:02 2020 +0200

xmloff: ODF export of page style: don't export draw:fill

... attributes on header-style and footer-style in strict ODF.

Change-Id: Ic1af26b6112a5afbb70a82b29dbacd3dcec14ec3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101012
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx 
b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 965cdf650c86..2f1a5df943e4 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -350,7 +350,11 @@ void XMLPageMasterExportPropMapper::ContextFilter(
 
 // tdf#103602 don't export draw:fill attributes on 
page-layout-properties in strict ODF
 if (!isDrawingPageExport
-&& aPropMapper->GetEntryAPIName(rProp.mnIndex).startsWith("Fill")
+&& [](OUString const& rName) -> bool {
+return rName.startsWith("Fill")
+|| rName.startsWith("HeaderFill")
+|| rName.startsWith("FooterFill");
+} (aPropMapper->GetEntryAPIName(rProp.mnIndex))
 && ((aBackgroundImageExport.GetExport().getSaneDefaultVersion()
 & SvtSaveOptions::ODFSVER_EXTENDED) == 0))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/undo/undobj1.cxx |   24 
 1 file changed, 4 insertions(+), 20 deletions(-)

New commits:
commit 6c55d0ea3952c87aebec7fce76e1cdea1ff981f8
Author: Michael Stahl 
AuthorDate: Wed Aug 19 17:05:20 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 20 10:55:33 2020 +0200

sw: remove misleading initialisation from SwUndoInsLayFormat

Change-Id: I5577b388b565cdab6dcf60721f0f90d2987dac05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101005
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 3f20a2e9c67a..3feab0a10c74 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -269,26 +269,10 @@ SwUndoInsLayFormat::SwUndoInsLayFormat( SwFrameFormat* 
pFormat, sal_uLong nNodeI
 const SwFormatAnchor& rAnchor = m_pFrameFormat->GetAnchor();
 m_nRndId = rAnchor.GetAnchorId();
 m_bDelFormat = false;
-switch( m_nRndId )
-{
-case RndStdIds::FLY_AT_PAGE:
-m_nNodePagePos = rAnchor.GetPageNum();
-break;
-case RndStdIds::FLY_AT_PARA:
-case RndStdIds::FLY_AT_FLY:
-m_nNodePagePos = rAnchor.GetContentAnchor()->nNode.GetIndex();
-break;
-case RndStdIds::FLY_AS_CHAR:
-case RndStdIds::FLY_AT_CHAR:
-{
-const SwPosition* pPos = rAnchor.GetContentAnchor();
-m_nContentPos = pPos->nContent.GetIndex();
-m_nNodePagePos = pPos->nNode.GetIndex();
-}
-break;
-default:
-OSL_FAIL( "Which FlyFrame?" );
-}
+// note: SwUndoInsLayFormat is called with the content being fully inserted
+// from most places but with only an empty content section from
+// CopyLayoutFormat(); it's not necessary here to init m_nNodePagePos
+// because Undo will do it.
 }
 
 SwUndoInsLayFormat::~SwUndoInsLayFormat()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/uibase/config/StoredChapterNumbering.cxx |   32 +++--
 1 file changed, 12 insertions(+), 20 deletions(-)

New commits:
commit db10942f021026e67ab146da1b625e534f58cf34
Author: Noel Grandin 
AuthorDate: Wed Aug 19 20:38:24 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 20 10:52:05 2020 +0200

use fastparser in StoredChapterNumberingRootContext

Change-Id: I133f9885755ba594d8a136baa056f9ff96908a30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101018
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx 
b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 830b1d3da679..8a21b9f3ff2e 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -337,26 +337,6 @@ public:
 }
 }
 
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList >& 
xAttrList ) override
-{
-if (XML_NAMESPACE_TEXT == nPrefix && IsXMLToken(rLocalName, 
XML_OUTLINE_STYLE))
-{
-++m_nCounter;
-if (m_nCounter <= SwChapterNumRules::nMaxRules)
-{
-SvxXMLListStyleContext *const pContext(
-new SvxXMLListStyleContext(GetImport(),
-nPrefix, rLocalName, xAttrList, true));
-m_Contexts.emplace_back(pContext);
-return pContext;
-}
-}
-return nullptr;
-}
-
 virtual css::uno::Reference SAL_CALL 
createFastChildContext(
 sal_Int32 Element,
 const css::uno::Reference< css::xml::sax::XFastAttributeList > 
& xAttrList ) override
@@ -369,6 +349,18 @@ public:
 {
 return new StoredChapterNumberingDummyStyleContext(GetImport(), 
xAttrList);
 }
+else if (Element == XML_ELEMENT(TEXT, XML_OUTLINE_STYLE))
+{
+++m_nCounter;
+if (m_nCounter <= SwChapterNumRules::nMaxRules)
+{
+SvxXMLListStyleContext *const pContext(
+new SvxXMLListStyleContext(GetImport(),
+Element, xAttrList, true));
+m_Contexts.emplace_back(pContext);
+return pContext;
+}
+}
 
 return nullptr;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf135187.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |   17 +++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   12 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|4 ++-
 writerfilter/source/dmapper/PropertyMap.hxx  |2 +
 5 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit bf3124cdf61b40c94ba117a76f1b63dabdfd528e
Author: László Németh 
AuthorDate: Wed Aug 19 13:00:58 2020 +0200
Commit: László Németh 
CommitDate: Thu Aug 20 10:34:18 2020 +0200

tdf#135187 DOCX import: fix table style at character formatting

applied also on paragraph level during import.

Regression from commit 4d5c0eaf3e0d3d3bcd9e691fffee19b75f3d6631
(tdf#118812 DOCX import: fix table style preference – part 2)

See also commit 5ac6f02fdc6015a5d78071570dee310febf95fc6
(tdf#105215 DOCX import: fix paragraph-length direct formatting).

Change-Id: I14072c81fc4c54e376a004fa36ba76b56d2beb01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100996
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf135187.docx 
b/sw/qa/extras/ooxmlexport/data/tdf135187.docx
new file mode 100644
index ..98a151048f08
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf135187.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index bc80088f7a94..a80b76a21223 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -1222,6 +1222,23 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf105215, 
"tdf105215.docx")
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[5]/w:rPr/w:rFonts", "ascii", "Lohit 
Devanagari");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf135187, "tdf135187.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[2]/w:tc[1]/w:p/w:pPr/w:rPr/w:b", 0);
+// FIXME: remove duplicate
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[3]/w:tc[1]/w:p/w:pPr/w:rPr/w:b", 2);
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[4]/w:tc[1]/w:p/w:pPr/w:rPr/w:b", 2);
+
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[2]/w:tc[1]/w:p/w:r[1]/w:rPr/w:b", 1);
+assertXPathNoAttribute(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[2]/w:tc[1]/w:p/w:r[1]/w:rPr/w:b", "val");
+// This was 0
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[3]/w:tc[1]/w:p/w:r[1]/w:rPr/w:b", 1);
+assertXPathNoAttribute(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[3]/w:tc[1]/w:p/w:r[1]/w:rPr/w:b", "val");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[4]/w:tc[1]/w:p/w:r[1]/w:rPr/w:b", 1);
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[4]/w:tc[1]/w:p/w:r[1]/w:rPr/w:b", "val", 
"false");
+}
+
 
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121597TrackedDeletionOfMultipleParagraphs,
 "tdf121597.odt")
 {
 CPPUNIT_ASSERT_EQUAL(1, getPages());
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index b44325fa06d3..02baba345d58 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1094,7 +1094,8 @@ void 
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
 {
 // apply paragraph and character properties of the table style on 
table paragraphs
 // if there is no direct paragraph formatting
-if ( !rParaProp.m_pPropertyMap->isSet(eId) )
+bool bIsParaLevel = rParaProp.m_pPropertyMap->isSet(eId);
+if ( !bIsParaLevel || isCharacterProperty(eId) )
 {
 if ( (eId == PROP_PARA_LEFT_MARGIN || eId == 
PROP_PARA_FIRST_LINE_INDENT) &&
 rParaProp.m_pPropertyMap->isSet(PROP_NUMBERING_RULES) )
@@ -1104,6 +1105,15 @@ void 
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
 }
 
 OUString sPropertyName = getPropertyName(eId);
+
+if ( bIsParaLevel && ( 
rParaProp.m_aParaOverrideApplied.find(sPropertyName) != 
rParaProp.m_aParaOverrideApplied.end() ||
+sPropertyName.startsWith("CharFontName") ) )
+{
+// don't apply table style, if this character property was 
applied on paragraph level
+// (or in the case of paragraph level font name settings to 
avoid regressions)
+continue;
+}
+
 auto pCellProp = std::find_if(rCellProperties.begin(), 
rCellProperties.end(),
 [&](const beans::PropertyValue& rProp) { return rProp.Name == 
sPropertyName; });
 // this cell applies the table style property
diff --git a/writerfilter/source/dmapper

[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/control/thumbnailview.cxx |4 ++--
 sfx2/source/control/thumbnailviewitem.cxx |   11 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit b39364492c7cbe34923e0d0755db8737b7d6225a
Author: Caolán McNamara 
AuthorDate: Wed Aug 19 17:06:26 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 20 10:09:15 2020 +0200

use HighlightTextColor from Settings for thumbnailviewitem 
HighlightTextColor

so if an icon is selected, typically with a blue background, that
the text is rendered with a matching color, typically white foreground

Change-Id: I3397924ccf657a9d2bd3c03c51c339685c27d5ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101024
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index b37cb617b974..f0eae308158f 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -137,7 +137,7 @@ void ThumbnailView::ImplInit()
 maFillColor = GetSettings().GetStyleSettings().GetFieldColor();
 maTextColor = GetSettings().GetStyleSettings().GetWindowTextColor();
 maHighlightColor = GetSettings().GetStyleSettings().GetHighlightColor();
-maHighlightTextColor = 
GetSettings().GetStyleSettings().GetWindowTextColor();
+maHighlightTextColor = 
GetSettings().GetStyleSettings().GetHighlightTextColor();
 maSelectHighlightColor = GetSettings().GetStyleSettings().GetActiveColor();
 maSelectHighlightTextColor = 
GetSettings().GetStyleSettings().GetActiveTextColor();
 
@@ -1321,7 +1321,7 @@ void SfxThumbnailView::ImplInit()
 maFillColor = rSettings.GetFieldColor();
 maTextColor = rSettings.GetWindowTextColor();
 maHighlightColor = rSettings.GetHighlightColor();
-maHighlightTextColor = rSettings.GetWindowTextColor();
+maHighlightTextColor = rSettings.GetHighlightTextColor();
 maSelectHighlightColor = rSettings.GetActiveColor();
 maSelectHighlightTextColor = rSettings.GetActiveTextColor();
 
diff --git a/sfx2/source/control/thumbnailviewitem.cxx 
b/sfx2/source/control/thumbnailviewitem.cxx
index 40a68ec3ed20..b3be4b5357c9 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -249,10 +249,13 @@ void ThumbnailViewItem::addTextPrimitives (const 
OUString& rText, const Thumbnai
 
 // setup color
 BColor aTextColor = pAttrs->aTextColor;
-if( mbSelected && mbHover)
-aTextColor = pAttrs->aSelectHighlightTextColor;
-else if (mbSelected || mbHover)
-aTextColor = pAttrs->aHighlightTextColor;
+if(mbSelected)
+{
+if (mbHover)
+aTextColor = pAttrs->aSelectHighlightTextColor;
+else
+aTextColor = pAttrs->aHighlightTextColor;
+}
 
 rSeq[nPrimitives++] = drawinglayer::primitive2d::Primitive2DReference(
 new TextSimplePortionPrimitive2D(aTextMatrix,
___
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' - desktop/source sfx2/source

[Pranam Lashkari (via logerrit)]

 desktop/source/lib/init.cxx  |7 ---
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit ecf66f5b61b362f454fcc0ace6739a5ee03a4cbf
Author: Pranam Lashkari 
AuthorDate: Thu Aug 20 03:57:17 2020 +0530
Commit: Andras Timar 
CommitDate: Thu Aug 20 09:57:22 2020 +0200

LOK: send state of FreezePanes

Change-Id: I817117d05f7f0f75f65c8e6dbf6105d120ab275d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101031
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4d96e34333ea..9e3d24ff8973 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2804,7 +2804,6 @@ static void doc_iniUnoCommands ()
 OUString(".uno:AcceptTrackedChange"),
 OUString(".uno:RejectTrackedChange"),
 OUString(".uno:ShowResolvedAnnotations"),
-OUString(".uno:FreezePanesColumn"),
 OUString(".uno:InsertBreak"),
 OUString(".uno:InsertEndnote"),
 OUString(".uno:InsertFootnote"),
@@ -2831,9 +2830,11 @@ static void doc_iniUnoCommands ()
 OUString(".uno:Substract"),
 OUString(".uno:DistributeSelection"),
 OUString(".uno:Intersect"),
-OUString(".uno:FreezePanesRow"),
 OUString(".uno:BorderInner"),
-OUString(".uno:BorderOuter")
+OUString(".uno:BorderOuter"),
+OUString(".uno:FreezePanes"),
+OUString(".uno:FreezePanesColumn"),
+OUString(".uno:FreezePanesRow")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 01a398800813..4c86f6eec6a7 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1016,7 +1016,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "AlignMiddle" ||
 aEvent.FeatureURL.Path == "AlignDown" ||
 aEvent.FeatureURL.Path == "TraceChangeMode" ||
-aEvent.FeatureURL.Path == "FormatPaintbrush")
+aEvent.FeatureURL.Path == "FormatPaintbrush" ||
+aEvent.FeatureURL.Path == "FreezePanes")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Andras Timar (via logerrit)]

 loleaflet/src/control/Control.UserList.js |   32 +++---
 1 file changed, 17 insertions(+), 15 deletions(-)

New commits:
commit 4d821065b93d3c2de0f610fe4def6e3b896c5cd4
Author: Andras Timar 
AuthorDate: Wed Aug 19 11:19:08 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Aug 20 09:56:24 2020 +0200

do not show broken images instead of avatars

Change-Id: I6babd0a892dccc2ca5d6d1bf6ac6e6007411b1e2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100977
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 
(cherry picked from commit 449dc691d2d2ebcc6d81410f536b0fc04ff8b0bd)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100943
Tested-by: Jenkins CollaboraOffice 

diff --git a/loleaflet/src/control/Control.UserList.js 
b/loleaflet/src/control/Control.UserList.js
index 9a7c27386..47a259eca 100644
--- a/loleaflet/src/control/Control.UserList.js
+++ b/loleaflet/src/control/Control.UserList.js
@@ -88,14 +88,16 @@ L.Control.UserList = L.Control.extend({
if (extraInfo !== undefined && extraInfo.avatar !== undefined) {
var img = L.DomUtil.create('img', 'avatar-img', iconTd);
img.src = extraInfo.avatar;
+   var altImg = L.LOUtil.getImageURL('user.svg');
+   img.setAttribute('onerror', 
'this.onerror=null;this.src=\'' + altImg + '\';');
$(img).css({'border-color': color});
} else {
img = L.DomUtil.create('div', 'user-info', iconTd);
$(img).css({'background-color': color});
}
-   
+
nameTd.innerHTML = userName;
-   
+
return content;
},
 
@@ -105,7 +107,7 @@ L.Control.UserList = L.Control.extend({
if (userlistItem == null) {
return;
}
-   
+
var count = $(userlistItem.html).find('#userlist_table tbody 
tr').length;
if (count > 1) {
userlistItem.text = this.options.nUsers.replace('%n', 
count);
@@ -114,9 +116,9 @@ L.Control.UserList = L.Control.extend({
} else {
userlistItem.text = this.options.noUser;
}
-   
+
w2ui['actionbar'].refresh();
-   
+
var hideUserList =
window.ThisIsAMobileApp ||
(this.map['wopi'].HideUserList !== null && 
this.map['wopi'].HideUserList !== undefined &&
@@ -124,7 +126,7 @@ L.Control.UserList = L.Control.extend({
(window.mode.isMobile() && $.inArray('mobile', 
this.map['wopi'].HideUserList) >= 0) ||
(window.mode.isTablet() && $.inArray('tablet', 
this.map['wopi'].HideUserList) >= 0) ||
(window.mode.isDesktop() && 
$.inArray('desktop', this.map['wopi'].HideUserList) >= 0));
-   
+
if (!hideUserList && count > 1) {
actionbar.show('userlist');
actionbar.show('userlistbreak');
@@ -139,7 +141,7 @@ L.Control.UserList = L.Control.extend({
if (userlistItem === null) {
return;
}
-   
+
$('#user-' + e.viewId).removeClass('selected-user');
},
 
@@ -169,10 +171,10 @@ L.Control.UserList = L.Control.extend({
var userlistItem = w2ui['actionbar'].get('userlist');
var username = this.escapeHtml(e.username);
var showPopup = false;
-   
+
if (userlistItem !== null)
showPopup = $(userlistItem.html).find('#userlist_table 
tbody tr').length > 0;
-   
+
if (showPopup) {
$('#tb_actionbar_item_userlist')
.w2overlay({
@@ -188,18 +190,18 @@ L.Control.UserList = L.Control.extend({
that.options.userPopupTimeout = null;
}, 3000);
}
-   
+
var color = L.LOUtil.rgbToHex(this.map.getViewColor(e.viewId));
if (e.viewId === this.map._docLayer._viewId) {
username = _('You');
color = '#000';
}
-   
+
// Mention readonly sessions in userlist
if (e.readonly) {
username += ' (' +  _('Readonly') + ')';
}
-   
+
if (userlistItem !== null) {
var newhtml = 
$(userlistItem.html).find('#userlist_table 
tbody').append(this.getUserItem(e.viewId, username, e.extraInfo, 
color)).parent().parent()[0].outerHTML;
userlistItem.html = newhtml;
@@ -221,12 +223,12 @@ L.Control.UserList = L.Control.extend({
clearTimeout(that.

[Libreoffice-commits] online.git: loleaflet/css loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/css/leaflet.css|5 +
 loleaflet/css/loleaflet.css  |6 +++---
 loleaflet/src/control/Control.Toolbar.js |6 ++
 loleaflet/src/layer/marker/Cursor.js |4 +++-
 4 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit cb5e5b3e505aa85e13d74fe7fc2eb263138c1306
Author: Pranam Lashkari 
AuthorDate: Thu Jul 9 16:50:27 2020 +0530
Commit: Andras Timar 
CommitDate: Thu Aug 20 09:55:19 2020 +0200

leaflet: changing cursor according to objects selected

text cursor only if cursor is visible
appropriate cursor for drag markers
move cursor for selected object

Change-Id: If750ac91fc870a0d730d4455c51bde0423c55e4a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98425
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 98f6aa71b..67899f262 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -185,10 +185,7 @@
 /* cursors */
 
 .leaflet-interactive {
-   cursor: pointer;
-   }
-.leaflet-container {
-   cursor: text;
+   cursor: move;
}
 .leaflet-crosshair,
 .leaflet-crosshair .leaflet-interactive {
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 2c3703763..1b84d1091 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -69,14 +69,14 @@
z-index: 1000;
 }
 
-#document-container.text-doctype > #map{
-   cursor: text;
-}
 .scroll-container .mCSB_scrollTools.mCSB_1_scrollbar {
position: absolute;
z-index: 1000;
 }
 
+.bucket-cursor {
+   cursor: url('images/cursors/fill.png'), auto !important;
+}
 .loleaflet-scrollbar-show {
opacity: 1 !important;
filter: "alpha(opacity=100)" !important;
diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 8e4aaf6af..9a124cf88 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -838,6 +838,12 @@ function onCommandStateChanged(e) {
toolbar.disable('repair');
}
}
+   else if (commandName === '.uno:FormatPaintbrush') {
+   if (state === 'true')
+   
$('.leaflet-pane.leaflet-map-pane').addClass('bucket-cursor');
+   else
+   
$('.leaflet-pane.leaflet-map-pane').removeClass('bucket-cursor');
+   }
 
var id = unoCmdToToolbarId(commandName);
// id is set to '' by unoCmdToToolbarId() if the statechange message 
should be ignored.
diff --git a/loleaflet/src/layer/marker/Cursor.js 
b/loleaflet/src/layer/marker/Cursor.js
index c668c205f..71cd97a00 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -3,6 +3,7 @@
  * L.Cursor blinking cursor.
  */
 
+ /* global $ */
 L.Cursor = L.Layer.extend({
 
options: {
@@ -22,7 +23,7 @@ L.Cursor = L.Layer.extend({
if (!this._container) {
this._initLayout();
}
-
+   $('.leaflet-pane.leaflet-map-pane').css('cursor', 'text');
this._zoomAnimated = this._zoomAnimated && 
this.options.zoomAnimation;
if (this._zoomAnimated) {
L.DomUtil.addClass(this._container, 
'leaflet-zoom-animated');
@@ -35,6 +36,7 @@ L.Cursor = L.Layer.extend({
 
onRemove: function () {
this._map.off('splitposchanged', this.update, this);
+   $('.leaflet-pane.leaflet-map-pane').css('cursor', '');
if (this._container) {
this.getPane().removeChild(this._container);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools

[Andrea Gelmini (via logerrit)]

 include/tools/weakbase.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bcf8868e031f916473f13bcd1a0835c74cb05de5
Author: Andrea Gelmini 
AuthorDate: Wed Aug 19 18:04:17 2020 +0200
Commit: Andrea Gelmini 
CommitDate: Thu Aug 20 09:39:03 2020 +0200

Fix typo in comment

Change-Id: Iacc4791157674fde0c2b76b024a7deceb2159e46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101011
Reviewed-by: Julien Nabet 
Tested-by: Andrea Gelmini 

diff --git a/include/tools/weakbase.h b/include/tools/weakbase.h
index 86f3c24d8c24..f5a79e635b25 100644
--- a/include/tools/weakbase.h
+++ b/include/tools/weakbase.h
@@ -43,7 +43,7 @@
 {
 tools::WeakReference< ImplClass > mxWeakRef;
 
-UserClass( ImplClass* pOjbect ) : mxWeakRef( pObject ) {}
+UserClass( ImplClass* pObject ) : mxWeakRef( pObject ) {}
 
 DoSomething()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/xmloff xmloff/source

[Noel Grandin (via logerrit)]

 include/xmloff/xmlstyle.hxx  |9 ++
 xmloff/source/draw/ximpbody.cxx  |   27 --
 xmloff/source/draw/ximpbody.hxx  |4 --
 xmloff/source/draw/ximpstyl.cxx  |   56 +++
 xmloff/source/draw/ximpstyl.hxx  |8 +
 xmloff/source/style/xmlstyle.cxx |   32 ++
 6 files changed, 112 insertions(+), 24 deletions(-)

New commits:
commit 7b83a28f1eb7d0687d07cfaaf8cfaaf9a8eea8c1
Author: Noel Grandin 
AuthorDate: Wed Aug 19 20:23:26 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 20 09:38:13 2020 +0200

use fastparser in SdXMLHeaderFooterDeclContext

actually, it can do both fast and slow parser paths for now, because
it is used in a place fast-parser doesn't reach yet.

Which means that I had to make SvXMLStyleContext also
capable of handling both fast and slow parser paths.

Change-Id: I24fd5bfb6603e93a5f752365c246ce47dabea8bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101017
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 017b2c56af47..6ddf51d8872a 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -98,11 +98,20 @@ public:
 XmlStyleFamily nFamily=XmlStyleFamily::DATA_STYLE,
 bool bDefaultStyle = false );
 
+// Fast-parser constructor
+SvXMLStyleContext( SvXMLImport& rImport,
+  XmlStyleFamily nFamily=XmlStyleFamily::DATA_STYLE,
+  bool bDefaultStyle = false );
+
 virtual ~SvXMLStyleContext() override;
 
 virtual void StartElement(
 const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList 
) final override;
 
+virtual void SAL_CALL startFastElement(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& ) 
override;
+
 const OUString&  GetName() const { return maName; }
 const OUString&  GetDisplayName() const { return maDisplayName.getLength() 
? maDisplayName : maName; }
 const OUString&  GetAutoName() const { return maAutoName; }
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 87acc84f18d6..7e7325018cba 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -331,30 +331,17 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLBodyContext::crea
 }
 break;
 }
-}
-return nullptr;
-}
-
-SvXMLImportContextRef SdXMLBodyContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const uno::Reference< xml::sax::XAttributeList>& xAttrList )
-{
-SvXMLImportContextRef xContext;
-const SvXMLTokenMap& rTokenMap = GetSdImport().GetBodyElemTokenMap();
-
-switch(rTokenMap.Get(nPrefix, rLocalName))
-{
-case XML_TOK_BODY_HEADER_DECL:
-case XML_TOK_BODY_FOOTER_DECL:
-case XML_TOK_BODY_DATE_TIME_DECL:
+case XML_ELEMENT(PRESENTATION, XML_HEADER_DECL):
+case XML_ELEMENT(PRESENTATION, XML_FOOTER_DECL):
+case XML_ELEMENT(PRESENTATION, XML_DATE_TIME_DECL):
 {
-xContext = new SdXMLHeaderFooterDeclContext( GetImport(), nPrefix, 
rLocalName, xAttrList );
+return new SdXMLHeaderFooterDeclContext( GetImport(), xAttrList );
 break;
 }
+default:
+assert(false);
 }
-
-return xContext;
+return nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index ac77bf5479aa..714c8f8ec07d 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -58,10 +58,6 @@ public:
 
 virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
 sal_Int32 nElement, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& AttrList ) override;
-
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix, const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) 
override;
 };
 
 #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPBODY_HXX
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 6952d6b68562..51058a1f36d1 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1512,11 +1512,62 @@ 
SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext(SvXMLImport& rImport,
 }
 }
 
+SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext(SvXMLImport& 
rImport,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList)
+: SvXMLStyleContext( rImport )
+, mbFixed(false)
+{
+for (auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ))
+{
+OUString sValue = aIter.toString();
+if( aIter.g

[Libreoffice-commits] core.git: chart2/source

[Andrea Gelmini (via logerrit)]

 chart2/source/view/diagram/VDiagram.cxx |2 +-
 chart2/source/view/inc/VDiagram.hxx |2 +-
 chart2/source/view/main/ChartView.cxx   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit bf529f8dff2482eba190b512ff93f16bcab7af26
Author: Andrea Gelmini 
AuthorDate: Wed Aug 19 17:55:38 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Aug 20 09:06:19 2020 +0200

Fix typo in code

Change-Id: Ic9cc89e8b112e049594fb56a1641d36d082abbd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101006
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/chart2/source/view/diagram/VDiagram.cxx 
b/chart2/source/view/diagram/VDiagram.cxx
index bf9b9b70d343..53b96b036266 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -667,7 +667,7 @@ basegfx::B2IRectangle VDiagram::getCurrentRectangle() const
 return 
BaseGFXHelper::makeRectangle(m_aCurrentPosWithoutAxes,m_aCurrentSizeWithoutAxes);
 }
 
-void VDiagram::reduceToMimimumSize()
+void VDiagram::reduceToMinimumSize()
 {
 if( !m_xOuterGroupShape.is() )
 return;
diff --git a/chart2/source/view/inc/VDiagram.hxx 
b/chart2/source/view/inc/VDiagram.hxx
index 15ea26434531..ebfff98e9c8f 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -65,7 +65,7 @@ public: //methods
  */
 basegfx::B2IRectangle getCurrentRectangle() const;
 
-voidreduceToMimimumSize();
+voidreduceToMinimumSize();
 
 ::basegfx::B2IRectangleadjustPosAndSize( const css::awt::Point& rPos
 , const css::awt::Size& rAvailableSize );
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 656503a8588b..49c9906f23c6 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1486,7 +1486,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( 
const CreateShapeParam2D
 xSeriesTargetInFrontOfAxis = aVDiagram.getCoordinateRegion();
 // It is preferable to use full size than minimum for pie charts
 if (!rParam.mbUseFixedInnerSize)
-aVDiagram.reduceToMimimumSize();
+aVDiagram.reduceToMinimumSize();
 }
 
 uno::Reference< drawing::XShapes > xTextTargetShapes =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Andrea Gelmini (via logerrit)]

 cui/source/options/optinet2.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 69d1691e62d8daf0d2af7e8315c7884ababedf61
Author: Andrea Gelmini 
AuthorDate: Wed Aug 19 17:57:43 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Aug 20 09:05:41 2020 +0200

Fix typo in code

Change-Id: I7c78c0fed4e92371ef7c6f4480227d4eca3a38fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101008
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 46b8268eb350..025d31d6e724 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -765,7 +765,7 @@ DeactivateRC SvxSecurityTabPage::DeactivatePage( 
SfxItemSet* _pSet )
 
 namespace
 {
-bool CheckAndSave( SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption 
_eOpt, const bool _bIsChecked, bool& _rModfied )
+bool CheckAndSave( SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption 
_eOpt, const bool _bIsChecked, bool& _rModified )
 {
 bool bModified = false;
 if ( _rOpt.IsOptionEnabled( _eOpt ) )
@@ -774,7 +774,7 @@ namespace
 if ( bModified )
 {
 _rOpt.SetOption( _eOpt, _bIsChecked );
-_rModfied = true;
+_rModified = true;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: drawinglayer/source

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/tools/wmfemfhelper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 235fb7b7b2b44599065fc0ea6df34cfe36a67d04
Author: Andrea Gelmini 
AuthorDate: Wed Aug 19 17:59:22 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Aug 20 09:03:54 2020 +0200

Fix typo in code

Change-Id: I7ceb13e4dd247185c2d9b264e81fc5973a0da916
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101009
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx 
b/drawinglayer/source/tools/wmfemfhelper.cxx
index cfab0426ef74..e74135c66170 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -1309,7 +1309,7 @@ namespace wmfemfhelper
 }
 
 /** helper which takes complete care for creating the needed textLine 
primitives */
-static void proccessMetaTextLineAction(
+static void processMetaTextLineAction(
 const MetaTextLineAction& rAction,
 TargetHolder& rTarget,
 PropertyHolder const & rProperty)
@@ -2786,7 +2786,7 @@ namespace wmfemfhelper
 // Font.
 const MetaTextLineAction* pA = static_cast(pAction);
 
-proccessMetaTextLineAction(
+processMetaTextLineAction(
 *pA,
 rTargetHolders.Current(),
 rPropertyHolders.Current());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Andrea Gelmini (via logerrit)]

 cui/source/factory/dlgfact.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 64dba0693e1200518d378faa02d828605c196a82
Author: Andrea Gelmini 
AuthorDate: Wed Aug 19 17:56:40 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Aug 20 09:03:10 2020 +0200

Fix typo in code

Change-Id: Iebaf6a6d31a9819494205f7c838b78bcda1f7c52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101007
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index f3306065f959..f7e2ffc31b90 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -803,10 +803,10 @@ public:
 virtual VclPtr
   
CreateSvxDistributeDialog(weld::Window* pParent, const SfxItemSet& rAttr) 
override;
 virtual VclPtr
-   
CreateInsertObjectDialog(weld::Window* pParent, const OUString& rCommmand,
+   
CreateInsertObjectDialog(weld::Window* pParent, const OUString& rCommand,
 const css::uno::Reference < 
css::embed::XStorage >& xStor,
 const SvObjectServerList* pList ) 
override;
-virtual VclPtr  
CreateEditObjectDialog(weld::Window* pParent, const OUString& rCommmand,
+virtual VclPtr  
CreateEditObjectDialog(weld::Window* pParent, const OUString& rCommand,
 const css::uno::Reference < 
css::embed::XEmbeddedObject >& xObj ) override;
 virtual VclPtr CreatePasteDialog(weld::Window* 
pParent) override;
 virtual VclPtr CreateLinksDialog(weld::Window* 
pParent, sfx2::LinkManager* pMgr, bool bHTML = false, sfx2::SvBaseLink* 
p=nullptr) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits