date:20200128

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

2020-01-28 Thread Jim Raykowski (via logerrit)

 sw/source/uibase/utlui/content.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 000ba228db56c28b6e2a42bf6adefe6ca6cfdffb
Author: Jim Raykowski 
AuthorDate: Tue Jan 28 18:52:27 2020 -0900
Commit: Noel Grandin 
CommitDate: Wed Jan 29 07:09:48 2020 +0100

tdf#129625 Gray out content types with no content

This patch is for Writer Navigator only.

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 06de1fb5302c..1063970181e9 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1763,6 +1763,11 @@ void SwContentTree::Display( bool bActive )
 bool bChOnDemand = 0 != rpContentT->GetMemberCount();
 pEntry = InsertEntry(sEntry, aImage, aImage,
 nullptr, bChOnDemand, TREELIST_APPEND, 
rpContentT.get());
+if(pEntry && !pEntry->HasChildren() && 
!pEntry->HasChildrenOnDemand())
+{
+pEntry->SetFlags(pEntry->GetFlags() | 
SvTLEntryFlags::SEMITRANSPARENT);
+pEntry->SetTextColor(COL_GRAY);
+}
 if(nCntType == m_nLastSelType)
 pSelEntry = pEntry;
 sal_Int32 nExpandOptions = (State::HIDDEN == m_eState)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2020-01-28 Thread Andrea Gelmini (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96e6bb1ac62114299352deef7246f2ab4f1e1e12
Author: Andrea Gelmini 
AuthorDate: Wed Jan 29 00:52:08 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Jan 29 07:06:44 2020 +0100

Fix typo

Change-Id: I27f2c02ff3d4ab277219428be99b1219f1d6e94e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87667
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/configure.ac b/configure.ac
index d16b49a69c83..d4a737aeaeb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6446,7 +6446,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 AC_LANG_POP([C++])
 
 dnl Available in GCC 4.9 and at least since Clang 3.4; this check can 
eventually be removed
-dnl completely (e.g., aftger libreoffice-6-5 branch off):
+dnl completely (e.g., after libreoffice-6-5 branch off):
 AC_MSG_CHECKING([that $CXX_BASE supports __attribute__((warn_unused))])
 AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Missing _sysconfigdata_m_linux_i686-linux-gnu.py

2020-01-28 Thread escuelaslinux

Hi Julien

Adding --enable-python=fully-internal to my autogen.input did not work, but
I left that line just in case!

Renaming sysconfigdata_m_linux_i386-linux-gnu.py to
sysconfigdata_m_linux_i686-linux-gnu.py did the trick!

Thanks for caring to help!



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Missing _sysconfigdata_m_linux_i686-linux-gnu.py

2020-01-28 Thread dreamn...@gmail.com

Thanks Michael, your answer led me to a solution.

I renamed the file
sysconfigdata_m_linux_i386-linux-gnu.py
to
sysconfigdata_m_linux_i686-linux-gnu.py

I thought that would do no harm, since the contents of the i386 file was
full of i686 references, anyway. And that did the trick, I now have
LibreOffice 6.4.0.3 32-bit compiled.

Thanks again for your help!

El mar., 28 ene. 2020 a las 3:45, Michael Stahl ()
escribió:

> On 28.01.20 05:19, dreamn...@gmail.com wrote:
> > I'm having troubles to compile LibreOffice 6.4.0.3
>
> > However, I ran into another Python issue:
> >
> >
> /home/linux/libreoffice-6.4.0.3/external/python3/ExternalPackage_python3.mk:42:
>
> > *** file
> >
> /home/linux/libreoffice-6.4.0.3/workdir/UnpackedTarball/python3/LO_lib/_sysconfigdata_m_linux_i686-linux-gnu.py
>
> > does not exist in the tarball.  Stop.
> >
> > How could it be solved? (Yes, I'm trying to build Linux 32-bit
> binaries)...
>
> i don't understand how this is possible, given that the tag
> libreoffice-6.4.0.3 contains commit
> c885123b9817370c1c898e75e58221ab84785e59 "python3: fix 32-bit x86
> build", so it should look for a file with i386, not i686.
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-01-28 Thread Mike Kaganski (via logerrit)

 sw/qa/extras/ooxmlimport/data/tdf130214.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |5 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
 3 files changed, 11 insertions(+)

New commits:
commit d7d27ce1788fa6dab98639626fd3b856c0ae6b37
Author: Mike Kaganski 
AuthorDate: Tue Jan 28 13:22:56 2020 +0300
Commit: Xisco Faulí 
CommitDate: Tue Jan 28 23:43:25 2020 +0100

tdf#130214: workaround invalid state resulting from error on import

Obviously the real error is somewhere else, which results in tdf#126435,
and produces unexpected state with missing text append context on stack.
This is just a hack to avoid crash.

Change-Id: I420ac3b74f5efb9688dc764ac2ad0dcc974ba0e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87595
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit eca00082c78fddf79f247057227404738be8806c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87635
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/ooxmlimport/data/tdf130214.docx 
b/sw/qa/extras/ooxmlimport/data/tdf130214.docx
new file mode 100644
index ..4344e1c6e44e
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf130214.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 2a250a898cf2..28d62e4811db 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -460,6 +460,11 @@ DECLARE_OOXMLIMPORT_TEST(testTdf103345, 
"numbering-circle.docx")
 }
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf130214, "tdf130214.docx")
+{
+// Currently this file imports with errors because of tdf#126435; it must 
not segfault on load
+}
+
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in 
ooxmlEXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 15c6ae130ecd..d4e97d18f598 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4221,6 +4221,12 @@ void DomainMapper_Impl::handleBibliography
 (const FieldContextPtr& pContext,
 const OUString & sTOCServiceName)
 {
+if (m_aTextAppendStack.empty())
+{
+// tdf#130214: a workaround to avoid crash on import errors
+SAL_WARN("writerfilter.dmapper", "no text append stack");
+return;
+}
 // Create section before setting m_bStartTOC and m_bStartBibliography: 
finishing paragraph
 // inside StartIndexSectionChecked could do the wrong thing otherwise
 const auto xTOC = StartIndexSectionChecked(sTOCServiceName);
___
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/qa writerfilter/source

2020-01-28 Thread Mike Kaganski (via logerrit)

 sw/qa/extras/ooxmlimport/data/tdf130214.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |5 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
 3 files changed, 11 insertions(+)

New commits:
commit a232c0a72b195975c1c77e7e70ab844cd6d3f65f
Author: Mike Kaganski 
AuthorDate: Tue Jan 28 13:22:56 2020 +0300
Commit: Xisco Faulí 
CommitDate: Tue Jan 28 23:43:09 2020 +0100

tdf#130214: workaround invalid state resulting from error on import

Obviously the real error is somewhere else, which results in tdf#126435,
and produces unexpected state with missing text append context on stack.
This is just a hack to avoid crash.

Change-Id: I420ac3b74f5efb9688dc764ac2ad0dcc974ba0e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87595
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit eca00082c78fddf79f247057227404738be8806c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87634
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/ooxmlimport/data/tdf130214.docx 
b/sw/qa/extras/ooxmlimport/data/tdf130214.docx
new file mode 100644
index ..4344e1c6e44e
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf130214.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index d75a8c0dc4fe..636e0337ad81 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -531,6 +531,11 @@ DECLARE_OOXMLIMPORT_TEST(testTdf103345, 
"numbering-circle.docx")
 }
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf130214, "tdf130214.docx")
+{
+// Currently this file imports with errors because of tdf#126435; it must 
not segfault on load
+}
+
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in 
ooxmlEXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 4206b41ddaed..8128c800e834 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4426,6 +4426,12 @@ void DomainMapper_Impl::handleBibliography
 (const FieldContextPtr& pContext,
 const OUString & sTOCServiceName)
 {
+if (m_aTextAppendStack.empty())
+{
+// tdf#130214: a workaround to avoid crash on import errors
+SAL_WARN("writerfilter.dmapper", "no text append stack");
+return;
+}
 // Create section before setting m_bStartTOC and m_bStartBibliography: 
finishing paragraph
 // inside StartIndexSectionChecked could do the wrong thing otherwise
 const auto xTOC = StartIndexSectionChecked(sTOCServiceName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark

2020-01-28 Thread rizmut (via logerrit)

 icon-themes/sifr/links.txt  |6 +++---
 icon-themes/sifr_dark/links.txt |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 140f108726ae35ce99436b27b2e4c538bbc013fa
Author: rizmut 
AuthorDate: Tue Jan 28 20:15:45 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Jan 28 23:33:13 2020 +0100

Sifr: Update Gamma icons in Sidebar and Tabbed bar

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

diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 3a1a0560a572..c334e40be1e8 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -1555,7 +1555,7 @@ res/sc10864.png cmd/sc_grafcontrast.png
 res/sc10865.png cmd/sc_grafred.png
 res/sc10866.png cmd/sc_grafgreen.png
 res/sc10867.png cmd/sc_grafblue.png
-res/sc10868.png cmd/sc_graphicfilterinvert.png
+res/sc10868.png cmd/sc_grafgamma.png
 res/sc10869.png cmd/sc_graftransparence.png
 res/script.png cmd/sc_insertscript.png
 res/sx03150.png cmd/sc_showsinglepage.png
@@ -1744,7 +1744,7 @@ svtools/res/template.png cmd/lc_newdoc.png
 svx/res/3dgeo.png cmd/lc_window3d.png
 svx/res/3dlight.png svx/res/lighton.png
 svx/res/AdjustColorBlue_16x16.png cmd/sc_grafblue.png
-svx/res/AdjustColorGamma_16x16.png cmd/sc_graphicfilterinvert.png
+svx/res/AdjustColorGamma_16x16.png cmd/sc_grafgamma.png
 svx/res/AdjustColorGreen_16x16.png cmd/sc_grafgreen.png
 svx/res/AdjustColorRed_16x16.png cmd/sc_grafred.png
 svx/res/ColorModeBlackWhite_16x16.png cmd/sc_outputqualityblackwhite.png
@@ -1822,7 +1822,7 @@ svx/res/rotate3d.png cmd/sc_convertinto3dlathe.png
 svx/res/signet_11x16.png xmlsecurity/res/certificate_16.png
 svx/res/sphere3d.png cmd/sc_sphere.png
 svx/res/symphony/AdjustColorBlue_16x16.png cmd/sc_grafblue.png
-svx/res/symphony/AdjustColorGamma_16x16.png cmd/sc_graphicfilterinvert.png
+svx/res/symphony/AdjustColorGamma_16x16.png cmd/sc_grafgamma.png
 svx/res/symphony/AdjustColorGreen_16x16.png cmd/sc_grafgreen.png
 svx/res/symphony/AdjustColorRed_16x16.png cmd/sc_grafred.png
 svx/res/symphony/decrease_font.png cmd/sc_shrink.png
diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt
index 3a1a0560a572..c334e40be1e8 100644
--- a/icon-themes/sifr_dark/links.txt
+++ b/icon-themes/sifr_dark/links.txt
@@ -1555,7 +1555,7 @@ res/sc10864.png cmd/sc_grafcontrast.png
 res/sc10865.png cmd/sc_grafred.png
 res/sc10866.png cmd/sc_grafgreen.png
 res/sc10867.png cmd/sc_grafblue.png
-res/sc10868.png cmd/sc_graphicfilterinvert.png
+res/sc10868.png cmd/sc_grafgamma.png
 res/sc10869.png cmd/sc_graftransparence.png
 res/script.png cmd/sc_insertscript.png
 res/sx03150.png cmd/sc_showsinglepage.png
@@ -1744,7 +1744,7 @@ svtools/res/template.png cmd/lc_newdoc.png
 svx/res/3dgeo.png cmd/lc_window3d.png
 svx/res/3dlight.png svx/res/lighton.png
 svx/res/AdjustColorBlue_16x16.png cmd/sc_grafblue.png
-svx/res/AdjustColorGamma_16x16.png cmd/sc_graphicfilterinvert.png
+svx/res/AdjustColorGamma_16x16.png cmd/sc_grafgamma.png
 svx/res/AdjustColorGreen_16x16.png cmd/sc_grafgreen.png
 svx/res/AdjustColorRed_16x16.png cmd/sc_grafred.png
 svx/res/ColorModeBlackWhite_16x16.png cmd/sc_outputqualityblackwhite.png
@@ -1822,7 +1822,7 @@ svx/res/rotate3d.png cmd/sc_convertinto3dlathe.png
 svx/res/signet_11x16.png xmlsecurity/res/certificate_16.png
 svx/res/sphere3d.png cmd/sc_sphere.png
 svx/res/symphony/AdjustColorBlue_16x16.png cmd/sc_grafblue.png
-svx/res/symphony/AdjustColorGamma_16x16.png cmd/sc_graphicfilterinvert.png
+svx/res/symphony/AdjustColorGamma_16x16.png cmd/sc_grafgamma.png
 svx/res/symphony/AdjustColorGreen_16x16.png cmd/sc_grafgreen.png
 svx/res/symphony/AdjustColorRed_16x16.png cmd/sc_grafred.png
 svx/res/symphony/decrease_font.png cmd/sc_shrink.png
___
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' - icon-themes/sifr icon-themes/sifr_dark

2020-01-28 Thread rizmut (via logerrit)

 icon-themes/sifr/links.txt  |   12 +---
 icon-themes/sifr_dark/links.txt |   12 +---
 2 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit 81351f71107d6c335eb8b1ef986c01eb2b6aa352
Author: rizmut 
AuthorDate: Tue Jan 28 20:29:40 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Jan 28 23:33:49 2020 +0100

Sifr: Update Gamma icons in Sidebar and Tabbed bar

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

diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 781480a39b3a..c334e40be1e8 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -1342,21 +1342,18 @@ cmd/32/dsbdocumentdatasource.png 
cmd/32/sbaexecutesql.png
 cmd/32/inserttoolbox.png cmd/32/dataimport.png
 cmd/32/savesimple.png cmd/32/save.png
 cmd/32/sbabrwinsert.png cmd/32/insertfieldctrl.png
-cmd/32/setreminder.png cmd/32/timefield.png
 cmd/32/showbrowser.png cmd/32/controlproperties.png
 cmd/32/showpropbrowser.png cmd/32/controlproperties.png
 cmd/lc_dsbdocumentdatasource.png cmd/lc_sbaexecutesql.png
 cmd/lc_inserttoolbox.png cmd/lc_dataimport.png
 cmd/lc_savesimple.png cmd/lc_save.png
 cmd/lc_sbabrwinsert.png cmd/lc_insertfieldctrl.png
-cmd/lc_setreminder.png cmd/lc_timefield.png
 cmd/lc_showbrowser.png cmd/lc_controlproperties.png
 cmd/lc_showpropbrowser.png cmd/lc_controlproperties.png
 cmd/sc_dsbdocumentdatasource.png cmd/sc_sbaexecutesql.png
 cmd/sc_inserttoolbox.png cmd/sc_dataimport.png
 cmd/sc_savesimple.png cmd/sc_save.png
 cmd/sc_sbabrwinsert.png cmd/sc_insertfieldctrl.png
-cmd/sc_setreminder.png cmd/sc_timefield.png
 cmd/sc_showbrowser.png cmd/sc_controlproperties.png
 cmd/sc_showpropbrowser.png cmd/sc_controlproperties.png
 
@@ -1558,7 +1555,7 @@ res/sc10864.png cmd/sc_grafcontrast.png
 res/sc10865.png cmd/sc_grafred.png
 res/sc10866.png cmd/sc_grafgreen.png
 res/sc10867.png cmd/sc_grafblue.png
-res/sc10868.png cmd/sc_graphicfilterinvert.png
+res/sc10868.png cmd/sc_grafgamma.png
 res/sc10869.png cmd/sc_graftransparence.png
 res/script.png cmd/sc_insertscript.png
 res/sx03150.png cmd/sc_showsinglepage.png
@@ -1747,7 +1744,7 @@ svtools/res/template.png cmd/lc_newdoc.png
 svx/res/3dgeo.png cmd/lc_window3d.png
 svx/res/3dlight.png svx/res/lighton.png
 svx/res/AdjustColorBlue_16x16.png cmd/sc_grafblue.png
-svx/res/AdjustColorGamma_16x16.png cmd/sc_graphicfilterinvert.png
+svx/res/AdjustColorGamma_16x16.png cmd/sc_grafgamma.png
 svx/res/AdjustColorGreen_16x16.png cmd/sc_grafgreen.png
 svx/res/AdjustColorRed_16x16.png cmd/sc_grafred.png
 svx/res/ColorModeBlackWhite_16x16.png cmd/sc_outputqualityblackwhite.png
@@ -1825,7 +1822,7 @@ svx/res/rotate3d.png cmd/sc_convertinto3dlathe.png
 svx/res/signet_11x16.png xmlsecurity/res/certificate_16.png
 svx/res/sphere3d.png cmd/sc_sphere.png
 svx/res/symphony/AdjustColorBlue_16x16.png cmd/sc_grafblue.png
-svx/res/symphony/AdjustColorGamma_16x16.png cmd/sc_graphicfilterinvert.png
+svx/res/symphony/AdjustColorGamma_16x16.png cmd/sc_grafgamma.png
 svx/res/symphony/AdjustColorGreen_16x16.png cmd/sc_grafgreen.png
 svx/res/symphony/AdjustColorRed_16x16.png cmd/sc_grafred.png
 svx/res/symphony/decrease_font.png cmd/sc_shrink.png
@@ -2002,6 +1999,7 @@ sw/res/sc20174.png cmd/sc_upsearch.png
 sw/res/sc20177.png cmd/sc_insertpagefooter.png
 sw/res/sc20179.png cmd/sc_insertpageheader.png
 sw/res/sc20182.png cmd/sc_toggleanchortype.png
+sw/res/sc20183.png cmd/sc_setreminder.png
 sw/res/sc20233.png cmd/sc_ok.png
 sw/res/sc20234.png cmd/sc_datafilterstandardfilter.png
 sw/res/sc20235.png cmd/sc_inserthyperlink.png
@@ -2036,7 +2034,7 @@ sw/res/sr20009.png cmd/sc_insertgraphic.png
 sw/res/sr20010.png cmd/sc_objectmenue.png
 sw/res/sr20011.png sw/res/nc2.png
 sw/res/sr20013.png cmd/sc_insertfootnote.png
-sw/res/sr20014.png sw/res/sc20183.png
+sw/res/sr20014.png cmd/sc_setreminder.png
 sw/res/sr20015.png cmd/sc_shownote.png
 sw/res/sr20016.png cmd/sc_recsearch.png
 sw/res/sr20017.png cmd/sc_insertindexesentry.png
diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt
index 781480a39b3a..c334e40be1e8 100644
--- a/icon-themes/sifr_dark/links.txt
+++ b/icon-themes/sifr_dark/links.txt
@@ -1342,21 +1342,18 @@ cmd/32/dsbdocumentdatasource.png 
cmd/32/sbaexecutesql.png
 cmd/32/inserttoolbox.png cmd/32/dataimport.png
 cmd/32/savesimple.png cmd/32/save.png
 cmd/32/sbabrwinsert.png cmd/32/insertfieldctrl.png
-cmd/32/setreminder.png cmd/32/timefield.png
 cmd/32/showbrowser.png cmd/32/controlproperties.png
 cmd/32/showpropbrowser.png cmd/32/controlproperties.png
 cmd/lc_dsbdocumentdatasource.png cmd/lc_sbaexecutesql.png
 cmd/lc_inserttoolbox.png cmd/lc_dataimport.png
 cmd/lc_savesimple.png cmd/lc_save.png
 cmd/lc_sbabrwinsert.png cmd/lc_insertfieldctrl.png
-cmd/lc_setreminder.png cmd/lc_timefield.png
 cmd/lc_showbrowser.png cmd/lc_controlproperties.png
 cmd/lc_showpropbrowser.png cm

[Libreoffice-commits] core.git: svx/uiconfig

2020-01-28 Thread Adolfo Jayme Barrientos (via logerrit)

 svx/uiconfig/ui/accessibilitycheckentry.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2a23016cc109393de78ea8d057a62c0b89c7fa27
Author: Adolfo Jayme Barrientos 
AuthorDate: Tue Jan 28 13:33:24 2020 -0600
Commit: Muhammet Kara 
CommitDate: Tue Jan 28 23:10:54 2020 +0100

“Go to” is two words

If it’s one word, then it may be interpreted as a noun,
but then it doesn’t form an imperative sentence.

Change-Id: I848cf8dd629e44e1570d3c9e42b9720240373320
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87655
Reviewed-by: Muhammet Kara 
Tested-by: Muhammet Kara 

diff --git a/svx/uiconfig/ui/accessibilitycheckentry.ui 
b/svx/uiconfig/ui/accessibilitycheckentry.ui
index 4a4633eb3f14..308cd8a08f7e 100644
--- a/svx/uiconfig/ui/accessibilitycheckentry.ui
+++ b/svx/uiconfig/ui/accessibilitycheckentry.ui
@@ -22,7 +22,7 @@
 
 
   
-Goto 
Issue
+Go to 
Issue
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Pranam Lashkari (via logerrit)

 loleaflet/src/control/Control.ColumnHeader.js |   12 ++--
 loleaflet/src/control/Control.RowHeader.js|   12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit f41cf7c6ba1af02929704c80b6a7760277061c37
Author: Pranam Lashkari 
AuthorDate: Wed Jan 29 02:13:04 2020 +0530
Commit: Michael Meeks 
CommitDate: Tue Jan 28 22:53:13 2020 +0100

fix: Row/Column header context menu operates incorrectly

select any row/column now try to open the context menu
by right-clicking row/column header and perform some action
Action will be performed on the originally selected row/column
(same goes with the mobile wizard)

Change-Id: I2d2a7f871b1562d4706e9ea1e4382968a4502583
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87658
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index 6ef875dc6..008b01bdc 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -110,7 +110,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
},
 
optimalWidth: function(index) {
-   if (this._map._docLayer._selections.getLayers().length === 0) {
+   if (!this.isHighlighted(index)) {
this._selectColumn(index, 0);
}
this._map.sendUnoCommand('.uno:SetOptimalColumnWidth');
@@ -120,7 +120,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
// First select the corresponding column because
// .uno:InsertColumn doesn't accept any column number
// as argument and just inserts before the selected column
-   if (this._map._docLayer._selections.getLayers().length === 0) {
+   if (!this.isHighlighted(index)) {
this._selectColumn(index, 0);
}
this._map.sendUnoCommand('.uno:InsertColumns');
@@ -128,7 +128,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
},
 
insertColumnAfter: function(index) {
-   if (this._map._docLayer._selections.getLayers().length === 0) {
+   if (!this.isHighlighted(index)) {
this._selectColumn(index, 0);
}
this._map.sendUnoCommand('.uno:InsertColumnsAfter');
@@ -136,7 +136,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
},
 
deleteColumn: function(index) {
-   if (this._map._docLayer._selections.getLayers().length === 0) {
+   if (!this.isHighlighted(index)) {
this._selectColumn(index, 0);
}
this._map.sendUnoCommand('.uno:DeleteColumns');
@@ -144,7 +144,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
},
 
hideColumn: function(index) {
-   if (this._map._docLayer._selections.getLayers().length === 0) {
+   if (!this.isHighlighted(index)) {
this._selectColumn(index, 0);
}
this._map.sendUnoCommand('.uno:HideColumn');
@@ -152,7 +152,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
},
 
showColumn: function(index) {
-   if (this._map._docLayer._selections.getLayers().length === 0) {
+   if (!this.isHighlighted(index)) {
this._selectColumn(index, 0);
}
this._map.sendUnoCommand('.uno:ShowColumn');
diff --git a/loleaflet/src/control/Control.RowHeader.js 
b/loleaflet/src/control/Control.RowHeader.js
index 264d1bf76..2b654a09e 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -108,7 +108,7 @@ L.Control.RowHeader = L.Control.Header.extend({
},
 
optimalHeight: function(index) {
-   if (this._map._docLayer._selections.getLayers().length === 0) {
+   if (!this.isHighlighted(index)) {
this._selectRow(index, 0);
}
this._map.sendUnoCommand('.uno:SetOptimalRowHeight');
@@ -118,35 +118,35 @@ L.Control.RowHeader = L.Control.Header.extend({
// First select the corresponding row because
// .uno:InsertRows doesn't accept any row number
// as argument and just inserts before the selected row
-   if (this._map._docLayer._selections.getLayers().length === 0) {
+   if (!this.isHighlighted(index)) {
this._selectRow(index, 0);
}
this._map.sendUnoCommand('.uno:InsertRows');
},
 
insertRowBelow: function(index) {
-   if (this._map._docLayer._selections.getLayers().length === 0) {
+   if (!this.isHighlighted(index)) {
this._sel

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

2020-01-28 Thread Michael Meeks (via logerrit)

 svx/source/svdraw/svdmrkv.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 9a65f2086082cbb35016b7b83e008f7b5cc3cd54
Author: Michael Meeks 
AuthorDate: Fri Jan 24 16:42:48 2020 +0100
Commit: Michael Meeks 
CommitDate: Tue Jan 28 22:39:46 2020 +0100

lok: create marking overlay object, but add no objects to it

null mpMarkObjOverlay was used for a number of other reasons.

Change-Id: I0681d9c544f0cd3f93e991eb048b97bd58f94787
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87409
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index bcc048b8a788..acba9103244a 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -96,6 +96,9 @@ ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& 
rView, const basegfx:
 :   maSecondPosition(rStartPos),
 mbUnmarking(bUnmarking)
 {
+if (comphelper::LibreOfficeKit::isActive())
+return; // We do client-side object manipulation with the Kit API
+
 for(sal_uInt32 a(0); a < rView.PaintWindowCount(); a++)
 {
 SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
@@ -358,12 +361,8 @@ void SdrMarkView::BegMarkObj(const Point& rPnt, bool 
bUnmark)
 
 DBG_ASSERT(nullptr == mpMarkObjOverlay, "SdrMarkView::BegMarkObj: There 
exists a mpMarkObjOverlay (!)");
 
-// We do client-side object manipulation with the Kit API
-if (!comphelper::LibreOfficeKit::isActive())
-{
-basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
-mpMarkObjOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark);
-}
+basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
+mpMarkObjOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark);
 
 maDragStat.Reset(rPnt);
 maDragStat.NextPoint();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread mert (via logerrit)

 loleaflet/src/control/Control.MobileWizard.js |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 0c91e668186fa40b41c823c90cd53b467051495f
Author: mert 
AuthorDate: Tue Jan 28 15:19:03 2020 +0300
Commit: Michael Meeks 
CommitDate: Tue Jan 28 22:38:42 2020 +0100

mobilewizard: Fix character properties

This patch fixes non-showing character properties
on calc, also a bit improved the related function
in terms of performance.

Change-Id: Iba3f32ec535dd0d34bb56173151c52156564
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87610
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index f455ad2ea..02b90407b 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -344,10 +344,9 @@ L.Control.MobileWizard = L.Control.extend({
var textIdx = this._findIdxInParentById(deck, textName);
if (stylesIdx >= 0 && textIdx >= 0)
{
-   var moveContent = 
deck.children[stylesIdx].children;
-   deck.children.splice(stylesIdx, 1); // remove
-   textIdx = this._findIdxInParentById(deck, 
textName); // re-lookup
-   deck.children[textIdx].children = 
moveContent.concat(deck.children[textIdx].children);
+   var moveContent = 
deck.children[stylesIdx].children[0].children;
+   deck.children[textIdx].children[0].children = 
moveContent.concat(deck.children[textIdx].children[0].children);
+   deck.children.splice(stylesIdx, 1); //remove 
the styles property
}
this._removeItems(deck, ['cellbordertype', 
'borderlinestyle', 'borderlinecolor']);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread mert (via logerrit)

 loleaflet/src/control/Control.MobileWizard.js |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 227b11488ac2c2b00ea1f10f2008d28126114ed4
Author: mert 
AuthorDate: Thu Jan 23 20:19:52 2020 +0300
Commit: Michael Meeks 
CommitDate: Tue Jan 28 22:36:48 2020 +0100

mobilewizard: remove some problematic items

Under Cell Appearance properties, cellbordertype, borderlinestyle,
borderlinecolor items are removed due to not working properly.

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

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index ea7a7c557..f455ad2ea 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -349,6 +349,7 @@ L.Control.MobileWizard = L.Control.extend({
textIdx = this._findIdxInParentById(deck, 
textName); // re-lookup
deck.children[textIdx].children = 
moveContent.concat(deck.children[textIdx].children);
}
+   this._removeItems(deck, ['cellbordertype', 
'borderlinestyle', 'borderlinecolor']);
}
 
this._removeItems(data, ['editcontour']);
@@ -384,14 +385,12 @@ L.Control.MobileWizard = L.Control.extend({
if (data.children[i].id === items[j]) {
data.children.splice(i, 1);
childRemoved = true;
-   continue;
}
}
-   if (childRemoved === true) {
+   if (childRemoved && i > 0)
i = i - 1;
-   } else {
+   if (data.children[i])
this._removeItems(data.children[i], 
items);
-   }
}
}
},
___
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' - cui/source

2020-01-28 Thread Seth Chaiklin (via logerrit)

 cui/source/inc/numpages.hxx  |3 +++
 cui/source/tabpages/numpages.cxx |   29 -
 2 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit dfbf810ce521f1342dc1f13a6815762c2d7359ce
Author: Seth Chaiklin 
AuthorDate: Tue Jan 21 16:38:25 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 22:23:31 2020 +0100

tdf#127112 repair "sticky" levels in Customize numbering style dialog

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

diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 56131e25c841..d03f44a868e2 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -203,6 +203,8 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
 SizeaInitSize[SVX_MAX_NUM];
 
+ImplSVEvent*m_pLevelHdlEvent;
+
 boolbLastWidthModified  : 1;
 boolbModified   : 1;
 boolbPreset : 1;
@@ -262,6 +264,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
 DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void);
 DECL_LINK(LevelHdl_Impl, weld::TreeView&, void);
+DECL_LINK(LevelHdl, void *, void);
 DECL_LINK(PopupActivateHdl_Impl, weld::ToggleButton&, void);
 DECL_LINK(GraphicHdl_Impl, const OString&, void);
 DECL_LINK(BulletHdl_Impl, weld::Button&, void);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 03c431cfdd9e..fdbeb6f7cb4b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1014,6 +1014,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, 
ClickAddBrowseHdl_Impl, weld::Button&, voi
 SvxNumOptionsTabPage::SvxNumOptionsTabPage(weld::Container* pPage, 
weld::DialogController* pController,
const SfxItemSet& rSet)
 : SfxTabPage(pPage, pController, "cui/ui/numberingoptionspage.ui", 
"NumberingOptionsPage", &rSet)
+, m_pLevelHdlEvent(nullptr)
 , bLastWidthModified(false)
 , bModified(false)
 , bPreset(false)
@@ -1110,6 +,11 @@ SvxNumOptionsTabPage::~SvxNumOptionsTabPage()
 m_xBulColLB.reset();
 pActNum.reset();
 pSaveNum.reset();
+if (m_pLevelHdlEvent)
+{
+Application::RemoveUserEvent(m_pLevelHdlEvent);
+m_pLevelHdlEvent = nullptr;
+}
 }
 
 void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
@@ -1152,6 +1158,7 @@ voidSvxNumOptionsTabPage::ActivatePage(const 
SfxItemSet& rSet)
 {
 nActNumLvl = nTmpNumLvl;
 sal_uInt16 nMask = 1;
+m_xLevelLB->unselect_all();
 if (nActNumLvl == SAL_MAX_UINT16)
 m_xLevelLB->select(pActNum->GetLevelCount());
 if(nActNumLvl != SAL_MAX_UINT16)
@@ -1547,17 +1554,29 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 
nType )
 m_xOrientLB->set_sensitive(bEnableBitmap);
 }
 
-IMPL_LINK(SvxNumOptionsTabPage, LevelHdl_Impl, weld::TreeView&, rBox, void)
+IMPL_LINK_NOARG(SvxNumOptionsTabPage, LevelHdl_Impl, weld::TreeView&, void)
 {
+if (m_pLevelHdlEvent)
+return;
+// tdf#127112 (borrowing tdf#127120 solution) multiselection may be 
implemented by deselect follow by select so
+// fire off the handler to happen on next event loop and only process the
+// final state
+m_pLevelHdlEvent = Application::PostUserEvent(LINK(this, 
SvxNumOptionsTabPage, LevelHdl));
+}
+
+IMPL_LINK_NOARG(SvxNumOptionsTabPage, LevelHdl, void*, void)
+{
+m_pLevelHdlEvent = nullptr;
+
 sal_uInt16 nSaveNumLvl = nActNumLvl;
 nActNumLvl = 0;
-auto aSelectedRows = rBox.get_selected_rows();
+std::vector aSelectedRows = m_xLevelLB->get_selected_rows();
 if (std::find(aSelectedRows.begin(), aSelectedRows.end(), 
pActNum->GetLevelCount()) != aSelectedRows.end() &&
 (aSelectedRows.size() == 1 || nSaveNumLvl != 0x))
 {
 nActNumLvl = 0x;
 for( sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++ )
-rBox.unselect(i);
+ m_xLevelLB->unselect(i);
 }
 else if (!aSelectedRows.empty())
 {
@@ -1568,7 +1587,7 @@ IMPL_LINK(SvxNumOptionsTabPage, LevelHdl_Impl, 
weld::TreeView&, rBox, void)
 nActNumLvl |= nMask;
 nMask <<= 1;
 }
-rBox.unselect(pActNum->GetLevelCount());
+m_xLevelLB->unselect(pActNum->GetLevelCount());
 }
 else
 {
@@ -1578,7 +1597,7 @@ IMPL_LINK(SvxNumOptionsTabPage, LevelHdl_Impl, 
weld::TreeView&, rBox, void)
 {
 if(nActNumLvl & nMask)
 {
-rBox.select(i);
+m_xLevelLB->select(i);
 break;
 }
 nMask <<=1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/l

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source

2020-01-28 Thread Seth Chaiklin (via logerrit)

 cui/source/inc/numpages.hxx  |3 +++
 cui/source/tabpages/numpages.cxx |   29 -
 2 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit e65aeb1c9fdc84e6b0645bea067cdbe2de28a052
Author: Seth Chaiklin 
AuthorDate: Tue Jan 21 16:38:25 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 22:23:37 2020 +0100

tdf#127112 repair "sticky" levels in Customize numbering style dialog

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

diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 6582a81fc873..008d1a575221 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -223,6 +223,8 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
 SizeaInitSize[SVX_MAX_NUM];
 
+ImplSVEvent*m_pLevelHdlEvent;
+
 boolbLastWidthModified  : 1;
 boolbModified   : 1;
 boolbPreset : 1;
@@ -282,6 +284,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
 DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void);
 DECL_LINK(LevelHdl_Impl, weld::TreeView&, void);
+DECL_LINK(LevelHdl, void *, void);
 DECL_LINK(PopupActivateHdl_Impl, weld::ToggleButton&, void);
 DECL_LINK(GraphicHdl_Impl, const OString&, void);
 DECL_LINK(BulletHdl_Impl, weld::Button&, void);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d7985b5ef5a6..61a1664b728d 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1050,6 +1050,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, 
ClickAddBrowseHdl_Impl, weld::Button&, voi
 SvxNumOptionsTabPage::SvxNumOptionsTabPage(TabPageParent pParent,
const SfxItemSet& rSet)
 : SfxTabPage(pParent, "cui/ui/numberingoptionspage.ui", 
"NumberingOptionsPage", &rSet)
+, m_pLevelHdlEvent(nullptr)
 , bLastWidthModified(false)
 , bModified(false)
 , bPreset(false)
@@ -1151,6 +1152,11 @@ void SvxNumOptionsTabPage::dispose()
 m_xBulColLB.reset();
 pActNum.reset();
 pSaveNum.reset();
+if (m_pLevelHdlEvent)
+{
+Application::RemoveUserEvent(m_pLevelHdlEvent);
+m_pLevelHdlEvent = nullptr;
+}
 SfxTabPage::dispose();
 }
 
@@ -1194,6 +1200,7 @@ voidSvxNumOptionsTabPage::ActivatePage(const 
SfxItemSet& rSet)
 {
 nActNumLvl = nTmpNumLvl;
 sal_uInt16 nMask = 1;
+m_xLevelLB->unselect_all();
 if (nActNumLvl == SAL_MAX_UINT16)
 m_xLevelLB->select(pActNum->GetLevelCount());
 if(nActNumLvl != SAL_MAX_UINT16)
@@ -1589,17 +1596,29 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 
nType )
 m_xOrientLB->set_sensitive(bEnableBitmap);
 }
 
-IMPL_LINK(SvxNumOptionsTabPage, LevelHdl_Impl, weld::TreeView&, rBox, void)
+IMPL_LINK_NOARG(SvxNumOptionsTabPage, LevelHdl_Impl, weld::TreeView&, void)
 {
+if (m_pLevelHdlEvent)
+return;
+// tdf#127112 (borrowing tdf#127120 solution) multiselection may be 
implemented by deselect follow by select so
+// fire off the handler to happen on next event loop and only process the
+// final state
+m_pLevelHdlEvent = Application::PostUserEvent(LINK(this, 
SvxNumOptionsTabPage, LevelHdl));
+}
+
+IMPL_LINK_NOARG(SvxNumOptionsTabPage, LevelHdl, void*, void)
+{
+m_pLevelHdlEvent = nullptr;
+
 sal_uInt16 nSaveNumLvl = nActNumLvl;
 nActNumLvl = 0;
-auto aSelectedRows = rBox.get_selected_rows();
+std::vector aSelectedRows = m_xLevelLB->get_selected_rows();
 if (std::find(aSelectedRows.begin(), aSelectedRows.end(), 
pActNum->GetLevelCount()) != aSelectedRows.end() &&
 (aSelectedRows.size() == 1 || nSaveNumLvl != 0x))
 {
 nActNumLvl = 0x;
 for( sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++ )
-rBox.unselect(i);
+ m_xLevelLB->unselect(i);
 }
 else if (!aSelectedRows.empty())
 {
@@ -1610,7 +1629,7 @@ IMPL_LINK(SvxNumOptionsTabPage, LevelHdl_Impl, 
weld::TreeView&, rBox, void)
 nActNumLvl |= nMask;
 nMask <<= 1;
 }
-rBox.unselect(pActNum->GetLevelCount());
+m_xLevelLB->unselect(pActNum->GetLevelCount());
 }
 else
 {
@@ -1620,7 +1639,7 @@ IMPL_LINK(SvxNumOptionsTabPage, LevelHdl_Impl, 
weld::TreeView&, rBox, void)
 {
 if(nActNumLvl & nMask)
 {
-rBox.select(i);
+m_xLevelLB->select(i);
 break;
 }
 nMask <<=1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Seth Chaiklin (via logerrit)

 include/sfx2/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44690b5548eb2b9c122a9ec282456ca95b605022
Author: Seth Chaiklin 
AuthorDate: Tue Jan 28 12:04:50 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 22:19:14 2020 +0100

tdf#128352  stylistic correction of dialog box title

  - Change template Manager to "Set as Default"

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

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 7e9757e61a78..b024656b4bb6 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -29,7 +29,7 @@
 #define STR_CLOSEDOCNC_("STR_CLOSEDOC", "~Close")
 #define STR_OPENNC_("STR_OPEN", "Open")
 #define STR_EDIT_TEMPLATE   NC_("STR_EDIT_TEMPLATE", 
"Edit")
-#define STR_DEFAULT_TEMPLATENC_("STR_DEFAULT_TEMPLATE", 
"Set As Default")
+#define STR_DEFAULT_TEMPLATENC_("STR_DEFAULT_TEMPLATE", 
"Set as Default")
 #define STR_RESET_DEFAULT   NC_("STR_RESET_DEFAULT", 
"Reset Default")
 #define STR_DELETE  NC_("STR_DELETE", "Delete")
 #define STR_SFX_RENAME  NC_("STR_SFX_RENAME", "Rename")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Seth Chaiklin (via logerrit)

 cui/source/inc/numpages.hxx  |3 +++
 cui/source/tabpages/numpages.cxx |   29 -
 2 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit 62821018c01674e75108898c0f5c9ddbcc66
Author: Seth Chaiklin 
AuthorDate: Tue Jan 21 16:38:25 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 22:18:03 2020 +0100

tdf#127112 repair "sticky" levels in Customize numbering style dialog

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

diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 11e8e1846219..3a3cf0692259 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -203,6 +203,8 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
 SizeaInitSize[SVX_MAX_NUM];
 
+ImplSVEvent*m_pLevelHdlEvent;
+
 boolbLastWidthModified  : 1;
 boolbModified   : 1;
 boolbPreset : 1;
@@ -262,6 +264,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
 DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void);
 DECL_LINK(LevelHdl_Impl, weld::TreeView&, void);
+DECL_LINK(LevelHdl, void *, void);
 DECL_LINK(PopupActivateHdl_Impl, weld::ToggleButton&, void);
 DECL_LINK(GraphicHdl_Impl, const OString&, void);
 DECL_LINK(BulletHdl_Impl, weld::Button&, void);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 222349d0c583..96393cb8c26a 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1013,6 +1013,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, 
ClickAddBrowseHdl_Impl, weld::Button&, voi
 SvxNumOptionsTabPage::SvxNumOptionsTabPage(weld::Container* pPage, 
weld::DialogController* pController,
const SfxItemSet& rSet)
 : SfxTabPage(pPage, pController, "cui/ui/numberingoptionspage.ui", 
"NumberingOptionsPage", &rSet)
+, m_pLevelHdlEvent(nullptr)
 , bLastWidthModified(false)
 , bModified(false)
 , bPreset(false)
@@ -1109,6 +1110,11 @@ SvxNumOptionsTabPage::~SvxNumOptionsTabPage()
 m_xBulColLB.reset();
 pActNum.reset();
 pSaveNum.reset();
+if (m_pLevelHdlEvent)
+{
+Application::RemoveUserEvent(m_pLevelHdlEvent);
+m_pLevelHdlEvent = nullptr;
+}
 }
 
 void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
@@ -1151,6 +1157,7 @@ voidSvxNumOptionsTabPage::ActivatePage(const 
SfxItemSet& rSet)
 {
 nActNumLvl = nTmpNumLvl;
 sal_uInt16 nMask = 1;
+m_xLevelLB->unselect_all();
 if (nActNumLvl == SAL_MAX_UINT16)
 m_xLevelLB->select(pActNum->GetLevelCount());
 if(nActNumLvl != SAL_MAX_UINT16)
@@ -1546,17 +1553,29 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 
nType )
 m_xOrientLB->set_sensitive(bEnableBitmap);
 }
 
-IMPL_LINK(SvxNumOptionsTabPage, LevelHdl_Impl, weld::TreeView&, rBox, void)
+IMPL_LINK_NOARG(SvxNumOptionsTabPage, LevelHdl_Impl, weld::TreeView&, void)
 {
+if (m_pLevelHdlEvent)
+return;
+// tdf#127112 (borrowing tdf#127120 solution) multiselection may be 
implemented by deselect follow by select so
+// fire off the handler to happen on next event loop and only process the
+// final state
+m_pLevelHdlEvent = Application::PostUserEvent(LINK(this, 
SvxNumOptionsTabPage, LevelHdl));
+}
+
+IMPL_LINK_NOARG(SvxNumOptionsTabPage, LevelHdl, void*, void)
+{
+m_pLevelHdlEvent = nullptr;
+
 sal_uInt16 nSaveNumLvl = nActNumLvl;
 nActNumLvl = 0;
-auto aSelectedRows = rBox.get_selected_rows();
+std::vector aSelectedRows = m_xLevelLB->get_selected_rows();
 if (std::find(aSelectedRows.begin(), aSelectedRows.end(), 
pActNum->GetLevelCount()) != aSelectedRows.end() &&
 (aSelectedRows.size() == 1 || nSaveNumLvl != 0x))
 {
 nActNumLvl = 0x;
 for( sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++ )
-rBox.unselect(i);
+ m_xLevelLB->unselect(i);
 }
 else if (!aSelectedRows.empty())
 {
@@ -1567,7 +1586,7 @@ IMPL_LINK(SvxNumOptionsTabPage, LevelHdl_Impl, 
weld::TreeView&, rBox, void)
 nActNumLvl |= nMask;
 nMask <<= 1;
 }
-rBox.unselect(pActNum->GetLevelCount());
+m_xLevelLB->unselect(pActNum->GetLevelCount());
 }
 else
 {
@@ -1577,7 +1596,7 @@ IMPL_LINK(SvxNumOptionsTabPage, LevelHdl_Impl, 
weld::TreeView&, rBox, void)
 {
 if(nActNumLvl & nMask)
 {
-rBox.select(i);
+m_xLevelLB->select(i);
 break;
 }
 nMask <<=1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/l

About First contribution

2020-01-28 Thread Abhishek Pachorkar

I am new at libreoffice organisation. I am aiming to do the project in GSoC
2020. Please suggest me some bugs for solving which will be helpful in
upcoming projects for GSoC.
Thank you!


-- 
*Abhishek Suresh Pachorkar *,
2nd year undergraduate student ,
Mathematics and Computing ,
Indian Institute of Technology Kharagpur.
*Contact : +91 7745854617*
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 filter/source/graphicfilter/icgm/bitmap.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 090cf1e3bbe0ffaf56f22b152b73578483be2f42
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 16:43:28 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 21:36:48 2020 +0100

ofz#20366 OOM

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

diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx 
b/filter/source/graphicfilter/icgm/bitmap.cxx
index e99349c1684d..3075cf733e48 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -330,7 +330,15 @@ bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& 
rDesc )
 rDesc.mbStatus = false;
 
 sal_uInt32 nHeaderSize = 2 + 3 * nPrecision + 3 * 
mpCGM->ImplGetPointSize();
-rDesc.mnScanSize = ( ( rDesc.mnX * rDesc.mnDstBitsPerPixel + 7 ) >> 3 );
+
+sal_uInt32 nWidthBits;
+if (o3tl::checked_multiply(rDesc.mnX, rDesc.mnDstBitsPerPixel, nWidthBits))
+{
+rDesc.mbStatus = false;
+return false;
+}
+
+rDesc.mnScanSize = (nWidthBits + 7) >> 3;
 
 sal_uInt32  nScanSize;
 nScanSize = rDesc.mnScanSize;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 lotuswordpro/source/filter/lwppara.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit ae01adf0747496e8c36f8f30fc2c1a4a6ef8275e
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 13:37:30 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 21:36:19 2020 +0100

ofz#20267 Indirect-leak

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

diff --git a/lotuswordpro/qa/cppunit/data/fail/null-2.lwp 
b/lotuswordpro/qa/cppunit/data/pass/null-2.lwp
similarity index 100%
rename from lotuswordpro/qa/cppunit/data/fail/null-2.lwp
rename to lotuswordpro/qa/cppunit/data/pass/null-2.lwp
diff --git a/lotuswordpro/source/filter/lwppara.cxx 
b/lotuswordpro/source/filter/lwppara.cxx
index 5b92281b0560..b7069aad9c69 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -119,6 +119,11 @@ LwpPara::LwpPara(LwpObjectHeader const & objHdr, 
LwpSvStream* pStrm)
 
 LwpPara::~LwpPara()
 {
+if (m_xXFContainer)
+{
+m_xXFContainer->Reset();
+m_xXFContainer.clear();
+}
 }
 
 void LwpPara::Read()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 sw/uiconfig/swriter/ui/comboboxfragment.ui |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit b67c87134598172f782608ec53984a05d1ec92f0
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 16:10:50 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 21:35:32 2020 +0100

gtk silence warning about parentless widget

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

diff --git a/sw/uiconfig/swriter/ui/comboboxfragment.ui 
b/sw/uiconfig/swriter/ui/comboboxfragment.ui
index d9b9579ef0b4..5f3db90078d8 100644
--- a/sw/uiconfig/swriter/ui/comboboxfragment.ui
+++ b/sw/uiconfig/swriter/ui/comboboxfragment.ui
@@ -2,7 +2,19 @@
 
 
   
-  
+  
+True
 False
+vertical
+
+  
+False
+  
+  
+False
+True
+0
+  
+
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Jim Raykowski (via logerrit)

 sw/source/uibase/utlui/content.cxx |   43 -
 1 file changed, 24 insertions(+), 19 deletions(-)

New commits:
commit 7f59313a1bd88dd142ff0b4c9b8cfc7e4beeabc7
Author: Jim Raykowski 
AuthorDate: Thu Jan 23 17:55:10 2020 -0900
Commit: Jim Raykowski 
CommitDate: Tue Jan 28 21:34:35 2020 +0100

tdf#130122 Make content navigation view collapse uniform

...for root node of all content types

This patch makes content navigation view root collapse to it's immediate
child entries. This fixes the current behavior of outline root collapse
not collapsing and all other content types collapsing to root.

Change-Id: If48b4c9f5f92e7a1843557eec51c516fa42f228f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87316
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 10fffd48c902..06de1fb5302c 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1577,32 +1577,37 @@ bool  SwContentTree::Expand( SvTreeListEntry* pParent )
 
 bool  SwContentTree::Collapse( SvTreeListEntry* pParent )
 {
-if (!m_bIsRoot
-|| (lcl_IsContentType(pParent) && 
static_cast(pParent->GetUserData())->GetType() == 
ContentTypeId::OUTLINE)
-|| (m_nRootType == ContentTypeId::OUTLINE))
+if (!pParent->HasChildren() || pParent->HasChildrenOnDemand())
+return SvTreeListBox::Collapse(pParent);
+
+if(lcl_IsContentType(pParent))
 {
-if(lcl_IsContentType(pParent))
+if(m_bIsRoot)
 {
-if(m_bIsRoot)
-return false;
-SwContentType* pCntType = 
static_cast(pParent->GetUserData());
-const sal_Int32 nAnd = ~(1 << 
static_cast(pCntType->GetType()));
-if (State::HIDDEN != m_eState)
+// collapse to children of root node
+for (SvTreeListEntry* pEntry = FirstChild(pParent); pEntry; pEntry 
= Next(pEntry))
 {
-m_nActiveBlock &= nAnd;
-m_pConfig->SetActiveBlock(m_nActiveBlock);
+Collapse(pEntry);
 }
-else
-m_nHiddenBlock &= nAnd;
+return true;
 }
-else if( lcl_IsContent(pParent) )
+SwContentType* pCntType = 
static_cast(pParent->GetUserData());
+const sal_Int32 nAnd = ~(1 << static_cast(pCntType->GetType()));
+if (State::HIDDEN != m_eState)
 {
-SwWrtShell* pShell = GetWrtShell();
-
assert(dynamic_cast(static_cast(pParent->GetUserData(;
-auto const nPos = 
static_cast(pParent->GetUserData())->GetOutlinePos();
-void* key = 
static_cast(pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( 
nPos ));
-mOutLineNodeMap[key] = false;
+m_nActiveBlock &= nAnd;
+m_pConfig->SetActiveBlock(m_nActiveBlock);
 }
+else
+m_nHiddenBlock &= nAnd;
+}
+else if( lcl_IsContent(pParent) )
+{
+SwWrtShell* pShell = GetWrtShell();
+
assert(dynamic_cast(static_cast(pParent->GetUserData(;
+auto const nPos = 
static_cast(pParent->GetUserData())->GetOutlinePos();
+void* key = 
static_cast(pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( 
nPos ));
+mOutLineNodeMap[key] = false;
 }
 
 return SvTreeListBox::Collapse(pParent);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Hakan Bakacak (via logerrit)

 toolkit/source/controls/tabpagemodel.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7e19348d7e54cf22864f6e14022e28091a576387
Author: Hakan Bakacak 
AuthorDate: Mon Jan 27 15:41:40 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jan 28 21:22:59 2020 +0100

tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: Ifda9d3a4f05ffa9f611512d5d203e40d67d1c542
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87522
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/toolkit/source/controls/tabpagemodel.cxx 
b/toolkit/source/controls/tabpagemodel.cxx
index 34849170bd14..8b9ebbc1036b 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -177,8 +177,7 @@ sal_Bool SAL_CALL 
UnoControlTabPage::supportsService(OUString const & ServiceNam
 
 css::uno::Sequence SAL_CALL 
UnoControlTabPage::getSupportedServiceNames()
 {
-css::uno::Sequence< OUString > aSeq { 
"com.sun.star.awt.tab.UnoControlTabPage" };
-return aSeq;
+return { "com.sun.star.awt.tab.UnoControlTabPage" };
 }
 
 void UnoControlTabPage::dispose()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source extensions/source package/source svl/source

2020-01-28 Thread Onur Yilmaz (via logerrit)

 dbaccess/source/ui/tabledesign/TableController.cxx |3 +--
 dbaccess/source/ui/uno/copytablewizard.cxx |3 +--
 extensions/source/propctrlr/propcontroller.cxx |3 +--
 package/source/zippackage/ZipPackageStream.cxx |3 +--
 svl/source/passwordcontainer/passwordcontainer.cxx |3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 9359d9a94d446fc40c5f98fcdbc3086ecba1f830
Author: Onur Yilmaz 
AuthorDate: Mon Jan 27 23:59:35 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jan 28 21:21:58 2020 +0100

tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: Ie5a381fc5e5b73490ab8b2036ef2a1164e475e8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87557
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx 
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 2b39fc45c477..4d0cb028b148 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -119,8 +119,7 @@ OUString OTableController::getImplementationName_Static()
 
 Sequence< OUString> OTableController::getSupportedServiceNames_Static()
 {
-Sequence aSupported { "com.sun.star.sdb.TableDesign" };
-return aSupported;
+return { "com.sun.star.sdb.TableDesign" };
 }
 
 Sequence< OUString> SAL_CALL OTableController::getSupportedServiceNames()
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx 
b/dbaccess/source/ui/uno/copytablewizard.cxx
index 90fb3cc95b4f..884ad73eef4a 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -435,8 +435,7 @@ css::uno::Sequence SAL_CALL 
CopyTableWizard::getSupportedServiceNames(
 
 css::uno::Sequence CopyTableWizard::getSupportedServiceNames_Static()
 {
-css::uno::Sequence aSupported { 
"com.sun.star.sdb.application.CopyTableWizard" };
-return aSupported;
+return { "com.sun.star.sdb.application.CopyTableWizard" };
 }
 
 Reference< XPropertySetInfo > SAL_CALL CopyTableWizard::getPropertySetInfo()
diff --git a/extensions/source/propctrlr/propcontroller.cxx 
b/extensions/source/propctrlr/propcontroller.cxx
index 3cfd255ad1b7..54b6a1bea66a 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -545,8 +545,7 @@ namespace pcr
 
 Sequence< OUString > 
OPropertyBrowserController::getSupportedServiceNames_static(  )
 {
-Sequence< OUString > aSupported { 
"com.sun.star.inspection.ObjectInspector" };
-return aSupported;
+return { "com.sun.star.inspection.ObjectInspector" };
 }
 
 
diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 745157cfd02e..ab237a15f5e4 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -1321,8 +1321,7 @@ OUString ZipPackageStream::getImplementationName()
 
 Sequence< OUString > ZipPackageStream::getSupportedServiceNames()
 {
-Sequence aNames { "com.sun.star.packages.PackageStream" };
-return aNames;
+return { "com.sun.star.packages.PackageStream" };
 }
 
 sal_Bool SAL_CALL ZipPackageStream::supportsService( OUString const & 
rServiceName )
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx 
b/svl/source/passwordcontainer/passwordcontainer.cxx
index acafd8986f5f..8bdc1adb7314 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -1309,8 +1309,7 @@ Sequence< OUString > SAL_CALL 
PasswordContainer::getSupportedServiceNames(  )
 
 Sequence< OUString > PasswordContainer::impl_getStaticSupportedServiceNames(  )
 {
-Sequence< OUString > aRet { "com.sun.star.task.PasswordContainer" };
-return aRet;
+return { "com.sun.star.task.PasswordContainer" };
 }
 
 OUString PasswordContainer::impl_getStaticImplementationName()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Faruk Demirbaş (via logerrit)

 xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 627e40b9ef7ba8e9b5b06adc4a553d95cd5e5560
Author: Faruk Demirbaş 
AuthorDate: Mon Jan 27 14:58:22 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jan 28 21:18:50 2020 +0100

tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: I0e792603435b7a1d9fcacf67a694ee8c4cc24a7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87516
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 9f2c8e43acdc..834bf57694fa 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -304,8 +304,7 @@ sal_Bool SAL_CALL 
XMLSignature_NssImpl::supportsService(const OUString& rService
 /* XServiceInfo */
 Sequence SAL_CALL XMLSignature_NssImpl::getSupportedServiceNames()
 {
-Sequence seqServiceNames { 
"com.sun.star.xml.crypto.XMLSignature" };
-return seqServiceNames;
+return { "com.sun.star.xml.crypto.XMLSignature" };
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Mesut Çifci (via logerrit)

 connectivity/source/commontools/ParameterSubstitution.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e3bc524629acfdd57898fb11f108fac88ac37be7
Author: Mesut Çifci 
AuthorDate: Tue Jan 28 12:05:53 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jan 28 21:14:19 2020 +0100

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: Ic759fd9e741cb2ca305b9bbf3ce71585c6801057
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87590
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/connectivity/source/commontools/ParameterSubstitution.cxx 
b/connectivity/source/commontools/ParameterSubstitution.cxx
index a5796261c995..9adf63a93a73 100644
--- a/connectivity/source/commontools/ParameterSubstitution.cxx
+++ b/connectivity/source/commontools/ParameterSubstitution.cxx
@@ -62,8 +62,7 @@ namespace connectivity
 
 Sequence< OUString > 
ParameterSubstitution::getSupportedServiceNames_Static(  )
 {
-Sequence aSNS { "com.sun.star.sdb.ParameterSubstitution" };
-return aSNS;
+return { "com.sun.star.sdb.ParameterSubstitution" };
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/sanitizers

2020-01-28 Thread Caolán McNamara (via logerrit)

 solenv/sanitizers/ui/cui.suppr |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 49edbe3651521c030ea3956ee683649e4d158398
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 15:42:36 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 21:13:14 2020 +0100

unused suppression

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

diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index 1274f8319fa4..eb8cbde26600 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -250,7 +250,6 @@ 
cui/uiconfig/ui/personalization_tab.ui://GtkToggleButton[@id='default8'] button-
 cui/uiconfig/ui/pickgraphicpage.ui://GtkLabel[@id='errorft'] orphan-label
 cui/uiconfig/ui/positionpage.ui://GtkLabel[@id='rotateandscale'] orphan-label
 cui/uiconfig/ui/positionpage.ui://GtkLabel[@id='scale'] orphan-label
-cui/uiconfig/ui/rotationtabpage.ui://GtkLabel[@id='FT_ANGLEPRESETS'] 
orphan-label
 cui/uiconfig/ui/securityoptionsdialog.ui://GtkImage[@id='lockwhenprinting'] 
no-labelled-by
 cui/uiconfig/ui/securityoptionsdialog.ui://GtkImage[@id='locksavesenddocs'] 
no-labelled-by
 cui/uiconfig/ui/securityoptionsdialog.ui://GtkImage[@id='lockwhensigning'] 
no-labelled-by
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/inc

2020-01-28 Thread Caolán McNamara (via logerrit)

 sd/inc/pch/precompiled_sd.hxx   |9 -
 sd/inc/pch/precompiled_sdui.hxx |5 -
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 150e0be8377f132952f1cd6195142116a7dcab94
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 15:30:57 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 21:12:51 2020 +0100

update sd pches

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

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index b3c53e6d3828..4627640f0bda 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-01-02 15:15:28 using:
+ Generated on 2020-01-28 15:30:31 using:
  ./bin/update_pch sd sd --cutoff=4 --exclude:system --exclude:module 
--include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -73,17 +73,14 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -99,7 +96,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -260,6 +256,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -317,9 +314,11 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 7b2124a09afa..df0ec0b49088 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-01-02 15:15:40 using:
+ Generated on 2020-01-28 15:30:36 using:
  ./bin/update_pch sd sdui --cutoff=4 --exclude:system --include:module 
--include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -225,6 +225,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 vcl/source/window/builder.cxx |   34 +++---
 1 file changed, 11 insertions(+), 23 deletions(-)

New commits:
commit 1e4cc854a2aa7af0be83fc809e4b37af9e71ac8d
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 15:27:05 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 21:12:24 2020 +0100

the only VclComboBoxNumeric left has a pattern

so the !pattern case is dead

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 3e9c2add65a8..400073bfda8a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2061,29 +2061,17 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 if (bDropdown)
 nBits |= WB_DROPDOWN;
 
-if (!sPattern.isEmpty())
-{
-connectNumericFormatterAdjustment(id, sAdjustment);
-OUString sUnit = extractUnit(sPattern);
-FieldUnit eUnit = detectMetricUnit(sUnit);
-SAL_INFO("vcl.layout", "making metric box for " << name << " " << 
sUnit);
-VclPtrInstance xBox(pParent, nBits);
-xBox->EnableAutoSize(true);
-xBox->SetUnit(eUnit);
-xBox->SetDecimalDigits(extractDecimalDigits(sPattern));
-if (eUnit == FieldUnit::CUSTOM)
-xBox->SetCustomUnitText(sUnit);
-xWindow = xBox;
-}
-else
-{
-SAL_INFO("vcl.layout", "making numeric box for " << name);
-connectNumericFormatterAdjustment(id, sAdjustment);
-VclPtrInstance xBox(pParent, nBits);
-if (bDropdown)
-xBox->EnableAutoSize(true);
-xWindow = xBox;
-}
+connectNumericFormatterAdjustment(id, sAdjustment);
+OUString sUnit = extractUnit(sPattern);
+FieldUnit eUnit = detectMetricUnit(sUnit);
+SAL_INFO("vcl.layout", "making metric box for " << name << " " << 
sUnit);
+VclPtrInstance xBox(pParent, nBits);
+xBox->EnableAutoSize(true);
+xBox->SetUnit(eUnit);
+xBox->SetDecimalDigits(extractDecimalDigits(sPattern));
+if (eUnit == FieldUnit::CUSTOM)
+xBox->SetCustomUnitText(sUnit);
+xWindow = xBox;
 }
 else if (name == "GtkIconView")
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 sd/inc/strings.hrc  |2 
 sd/source/ui/dlg/animobjs.cxx   |  378 ++---
 sd/source/ui/inc/animobjs.hxx   |   79 +-
 sd/uiconfig/simpress/ui/dockinganimation.ui |  775 
 4 files changed, 580 insertions(+), 654 deletions(-)

New commits:
commit cad2485d924a9f766a8e65379bdcd7a42c0228ee
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 14:29:11 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 20:56:33 2020 +0100

weld AnimationWindow

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

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 9c645f7a6250..3d1d90273395 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -487,6 +487,8 @@
 
 #define STR_SD_NONE NC_("STR_SD_NONE", "- 
None -")
 
+#define STR_ANIMATION_DIALOG_TITLE  
NC_("STR_ANIMATION_DIALOG_TITLE", "Animation")
+
 #define RID_SVXSTR_EDIT_GRAPHIC 
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
 
 #endif
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index f2807c71e570..b3f21c63a75a 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -53,13 +54,9 @@ namespace sd {
 /**
  *  SdDisplay - Control
  */
-SdDisplay::SdDisplay(vcl::Window* pWin)
-: Control(pWin, 0)
-, aScale(1, 1)
+SdDisplay::SdDisplay()
+: aScale(1, 1)
 {
-SetMapMode(MapMode(MapUnit::MapPixel));
-const StyleSettings& rStyles = 
Application::GetSettings().GetStyleSettings();
-SetBackground( Wallpaper( rStyles.GetFieldColor() ) );
 }
 
 SdDisplay::~SdDisplay()
@@ -80,10 +77,18 @@ void SdDisplay::SetBitmapEx( BitmapEx const * pBmpEx )
 }
 }
 
-void SdDisplay::Paint( vcl::RenderContext& /*rRenderContext*/, const 
::tools::Rectangle& )
+void SdDisplay::Paint(vcl::RenderContext& rRenderContext, const 
::tools::Rectangle&)
 {
+rRenderContext.Push(PushFlags::MAPMODE);
+
+rRenderContext.SetMapMode(MapMode(MapUnit::MapPixel));
+const StyleSettings& rStyles = 
Application::GetSettings().GetStyleSettings();
+rRenderContext.SetBackground( Wallpaper( rStyles.GetFieldColor() ) );
+rRenderContext.Erase();
+
 Point aPt;
-Size aSize = GetOutputSize();
+Size aSize = GetOutputSizePixel();
+
 Size aBmpSize = aBitmapEx.GetBitmap().GetSizePixel();
 aBmpSize.setWidth( static_cast( 
static_cast(aBmpSize.Width()) * static_cast(aScale) ) );
 aBmpSize.setHeight( static_cast( 
static_cast(aBmpSize.Height()) * static_cast(aScale) ) );
@@ -93,7 +98,9 @@ void SdDisplay::Paint( vcl::RenderContext& 
/*rRenderContext*/, const ::tools::Re
 if( aBmpSize.Height() < aSize.Height() )
 aPt.setY( ( aSize.Height() - aBmpSize.Height() ) / 2 );
 
-aBitmapEx.Draw( this, aPt, aBmpSize );
+aBitmapEx.Draw(&rRenderContext, aPt, aBmpSize);
+
+rRenderContext.Pop();
 }
 
 void SdDisplay::SetScale( const Fraction& rFrac )
@@ -101,23 +108,12 @@ void SdDisplay::SetScale( const Fraction& rFrac )
 aScale = rFrac;
 }
 
-Size SdDisplay::GetOptimalSize() const
+void SdDisplay::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 {
-return LogicToPixel(Size(147, 87), MapMode(MapUnit::MapAppFont));
-}
-
-void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt )
-{
-Control::DataChanged( rDCEvt );
-
-if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && 
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
-{
-const StyleSettings& rStyles = 
Application::GetSettings().GetStyleSettings();
-SetBackground( Wallpaper( rStyles.GetFieldColor() ) );
-SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode()
-? sd::OUTPUT_DRAWMODE_CONTRAST
-: sd::OUTPUT_DRAWMODE_COLOR );
-}
+CustomWidgetController::SetDrawingArea(pDrawingArea);
+Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(147, 87), 
MapMode(MapUnit::MapAppFont)));
+pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
+SetOutputSizePixel(aSize);
 }
 
 const size_t AnimationWindow::EMPTY_FRAMELIST = 
std::numeric_limits::max();
@@ -127,37 +123,33 @@ const size_t AnimationWindow::EMPTY_FRAMELIST = 
std::numeric_limits::max
  */
 AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow 
*pCW, vcl::Window* pParent)
 : SfxDockingWindow(pInBindings, pCW, pParent,
-"DockingAnimation", "modules/simpress/ui/dockinganimation.ui")
+"DockingAnimation", "modules/simpress/ui/dockinganimation.ui", true)
+, m_xCtlDisplay(new SdDisplay)
+, m_xCtlDisplayWin(new weld::CustomWeld(*m_xBuilder, "preview", 
*m_xCtlDisplay))
+, m_xBtnFirst(m_xBuilder->weld_button("first"))
+, m_xBtnReverse(m_xBuilder->we

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - icon-themes/breeze_dark icon-themes/breeze_dark_svg

2020-01-28 Thread rizmut (via logerrit)

 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_All_18x18.png
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Bottom_18x18.png 
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png  
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png   
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Empty_18x18.png  
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_FourBorders_18x18.png
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png  
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png   
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png   
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Left_18x18.png   
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png  
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Right_18x18.png  
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png   
|binary
 
icon-themes/breeze_dark/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png
 |binary
 
icon-themes/breeze_dark/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png 
   |binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Top_18x18.png
|binary
 icon-themes/breeze_dark/svx/res/fr01.png   
|binary
 icon-themes/breeze_dark/svx/res/fr010.png  
|binary
 icon-themes/breeze_dark/svx/res/fr011.png  
|binary
 icon-themes/breeze_dark/svx/res/fr02.png   
|binary
 icon-themes/breeze_dark/svx/res/fr03.png   
|binary
 icon-themes/breeze_dark/svx/res/fr04.png   
|binary
 icon-themes/breeze_dark/svx/res/fr05.png   
|binary
 icon-themes/breeze_dark/svx/res/fr06.png   
|binary
 icon-themes/breeze_dark/svx/res/fr07.png   
|binary
 icon-themes/breeze_dark/svx/res/fr08.png   
|binary
 icon-themes/breeze_dark/svx/res/fr09.png   
|binary
 icon-themes/breeze_dark/svx/res/marker-anchor-pressed.png  
|binary
 icon-themes/breeze_dark/svx/res/marker-anchor.png  
|binary
 icon-themes/breeze_dark/svx/res/markers.png
|binary
 icon-themes/breeze_dark/svx/res/pr01.png   
|binary
 icon-themes/breeze_dark/svx/res/pr010.png  
|binary
 icon-themes/breeze_dark/svx/res/pr011.png  
|binary
 icon-themes/breeze_dark/svx/res/pr012.png  
|binary
 icon-themes/breeze_dark/svx/res/pr014.png  
|binary
 icon-themes/breeze_dark/svx/res/pr015.png  
|binary
 icon-themes/breeze_dark/svx/res/pr016.png  
|binary
 icon-themes/breeze_dark/svx/res/pr017.png  
|binary
 icon-themes/breeze_dark/svx/res/pr018.png  
|binary
 icon-themes/breeze_dark/svx/res/pr019.png  
|binary
 icon-themes/breeze_dark/svx/res/pr02.png   
|binary
 icon-themes/breeze_dark/svx/res/pr020.png  
|binary
 icon-themes/breeze_dark/svx/res/pr021.png  
|binary
 icon-themes/breeze_dark/svx/res/pr03.png   
|binary
 icon-themes/breeze_dark/svx/res/pr04.png   
|binary
 icon-themes/breeze_dark/svx/res/pr05.png   
|binary
 icon-themes/breeze_dark/svx/res/pr06.png   
|binary
 icon-themes/breeze_dark/svx/res/pr09.png   
|binary
 icon-themes/breeze_dark_svg/sc/res/sidebar/CellBorder_All_18x18.svg
|2 +-
 icon-themes/breeze_dark_svg/sc/res/sidebar/CellBorder_Bottom_18x18.svg 
|2 +-
 icon-themes/breeze_dark_svg/sc/res/sidebar/CellBorder_Bottom_Double_18x18.svg  
|2 +-
 icon-themes/breeze_dark_svg/sc/res/sidebar/

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - icon-themes/elementary icon-themes/elementary_svg

2020-01-28 Thread rizmut (via logerrit)

 dev/null  |binary
 icon-themes/elementary_svg/cmd/lc_interactivetransparence.svg |  314 +-
 icon-themes/elementary_svg/cmd/sc_selectcolumn.svg|1 
 icon-themes/elementary_svg/cmd/sc_selectrow.svg   |1 
 4 files changed, 313 insertions(+), 3 deletions(-)

New commits:
commit e3a416c3373aca5b4990d8debf29e1afb39f2a8f
Author: rizmut 
AuthorDate: Tue Jan 28 20:03:22 2020 +0700
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jan 28 20:39:52 2020 +0100

elementary: Move wrong placed icons, delete unnessary icons

Change-Id: Iead17a1815f502f88994bf21570e4c0db938c258
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87620
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit 45dd6e5c23d7f826bd9b9db4bd8b12c864efa9e0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87647
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/elementary/cmd/sc_selectcolumn.png 
b/icon-themes/elementary/cmd/sc_selectcolumn.png
deleted file mode 100644
index 433c680d6ff5..
Binary files a/icon-themes/elementary/cmd/sc_selectcolumn.png and /dev/null 
differ
diff --git a/icon-themes/elementary/cmd/sc_selectrow.png 
b/icon-themes/elementary/cmd/sc_selectrow.png
deleted file mode 100644
index 04ec514b0de6..
Binary files a/icon-themes/elementary/cmd/sc_selectrow.png and /dev/null differ
diff --git a/icon-themes/elementary/svx/res/last_custom_common.png 
b/icon-themes/elementary/svx/res/symphony/last_custom_common.png
similarity index 100%
rename from icon-themes/elementary/svx/res/last_custom_common.png
rename to icon-themes/elementary/svx/res/symphony/last_custom_common.png
diff --git a/icon-themes/elementary/svx/res/last_custom_common_grey.png 
b/icon-themes/elementary/svx/res/symphony/last_custom_common_grey.png
similarity index 100%
rename from icon-themes/elementary/svx/res/last_custom_common_grey.png
rename to icon-themes/elementary/svx/res/symphony/last_custom_common_grey.png
diff --git a/icon-themes/elementary_svg/cmd/lc_interactivetransparence.svg 
b/icon-themes/elementary_svg/cmd/lc_interactivetransparence.svg
index adad289726da..55e01dc09f6f 100644
--- a/icon-themes/elementary_svg/cmd/lc_interactivetransparence.svg
+++ b/icon-themes/elementary_svg/cmd/lc_interactivetransparence.svg
@@ -1 +1,313 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg88"
+   sodipodi:docname="lc_interactivetransparence.svg"
+   inkscape:version="0.92.4 (unknown)">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+  
+
+  
+  
+  
+  
+
+
+
+
+  
+  
+  
+  
+
+
+  
+  
+  
+
+
+
+  
+  
+
+
+  
+  
+  
+
+
+
+
+  
+  
+
+
+  
+  
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+
+
+  
+
diff --git a/icon-themes/elementary_svg/cmd/sc_selectcolumn.svg 
b/icon-themes/elementary_svg/cmd/sc_selectcolumn.svg
deleted file mode 100644
index 7f7d7fde6a1f..
--- a/icon-themes/elementary_svg/cmd/sc_selectcolumn.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_selectrow.svg 
b/icon-themes/elementary_svg/cmd/sc_selectrow.svg
deleted file mode 100644
index bb8737272e50..
--- a/icon-themes/elementary_svg/cmd/sc_selectrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/svx/res/last_custom_common.svg 
b/icon-themes/elementary_svg/svx/res/symphony/last_custom_common.svg
similarity index 100%
rename from icon-themes/elementary_svg/svx/res/last_custom_common.svg
rename to icon-themes/elementary_svg/svx/res/symphony/last_custom_common.svg
diff --git a/icon-themes/elementary_svg/svx/res/last_custom_common_grey.svg 
b/icon-themes/elementary_svg/svx/res/symphony/last_custom_common_grey.svg
similarity index 100%
rename from icon-themes/elementary_svg/svx/res/last_custom_common_grey.svg
rename to 
icon-themes/elementary_svg/svx/res/symphony/last_custom_common_grey.svg
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/

[Libreoffice-commits] core.git: helpcontent2

2020-01-28 Thread Adolfo Jayme Barrientos (via logerrit)

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

New commits:
commit b8f787a1a8e9f302a645931485c8c453abd2d883
Author: Adolfo Jayme Barrientos 
AuthorDate: Tue Jan 28 13:36:07 2020 -0600
Commit: Gerrit Code Review 
CommitDate: Tue Jan 28 20:36:07 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to c4e6caecb8dd4a8b7f4f97b54eebc48a6987d1f8
  - The twentieth major version of LibreOffice will be numbered 7.0

Change-Id: I89bb5ea9ed21faea5bca74b3d1d7ce79817e85ed
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87498
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 3e3457dd2194..c4e6caecb8dd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3e3457dd21940c5513d95dbe081cdc1a3ac9a6ef
+Subproject commit c4e6caecb8dd4a8b7f4f97b54eebc48a6987d1f8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Adolfo Jayme Barrientos (via logerrit)

 source/text/scalc/00/avail_release.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c4e6caecb8dd4a8b7f4f97b54eebc48a6987d1f8
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Jan 27 03:02:58 2020 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jan 28 20:36:07 2020 +0100

The twentieth major version of LibreOffice will be numbered 7.0

Change-Id: I89bb5ea9ed21faea5bca74b3d1d7ce79817e85ed
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87498
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/00/avail_release.xhp 
b/source/text/scalc/00/avail_release.xhp
index fa0baddf8..27ed7b2a7 100644
--- a/source/text/scalc/00/avail_release.xhp
+++ b/source/text/scalc/00/avail_release.xhp
@@ -74,8 +74,8 @@
 
 This function is available since 
%PRODUCTNAME 6.4
 
-
-This function is available since 
%PRODUCTNAME 6.5
+
+This function is available since 
%PRODUCTNAME 7.0
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Andrea Gelmini (via logerrit)

 compilerplugins/clang/unsignedcompare.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f0c86a068550bc6aaa16aea5c77be3a823cea68
Author: Andrea Gelmini 
AuthorDate: Tue Jan 28 17:53:48 2020 +0100
Commit: Julien Nabet 
CommitDate: Tue Jan 28 20:11:45 2020 +0100

Fix typo

Change-Id: I87ffb70c16efe356981e3f0312f9e8fbce9cd04b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87653
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/compilerplugins/clang/unsignedcompare.cxx 
b/compilerplugins/clang/unsignedcompare.cxx
index beac09f07f7d..d9b8f144ca77 100644
--- a/compilerplugins/clang/unsignedcompare.cxx
+++ b/compilerplugins/clang/unsignedcompare.cxx
@@ -9,7 +9,7 @@
 
 // Find explicit casts from signed to unsigned integer in comparison against 
unsigned integer, where
 // the cast is presumably used to avoid warnings about signed vs. unsigned 
comparisons, and could
-// thus be replaced with o3tl::make_unsigned for clairty.
+// thus be replaced with o3tl::make_unsigned for clarity.
 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Miklos Vajna (via logerrit)

 dtrans/source/win32/dtobj/DOTransferable.cxx |   47 ++-
 1 file changed, 46 insertions(+), 1 deletion(-)

New commits:
commit 5d1a540963d1c5b952655414fc77367f67db968d
Author: Miklos Vajna 
AuthorDate: Tue Jan 28 17:57:30 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Jan 28 20:08:46 2020 +0100

dtrans win32: implement support for pasting when the handle type is stream

Steps to reproduce the problem: select an image in Word on Windows,
copy, paste into Writer -> nothing happens. A workaround is to use paste
special, and select the metafile paste, not the bitmap one.

The root cause was that clipboard contents on Windows can have different
handle types and we only supported the memory and the metafile cases.

An alternative fix would be to handle this at a higher level, e.g.
TransferableDataHelper::GetBitmapEx() in vcl could fall back to EMF when
the bitmap formats fail, but that would not work for other applications
that only offer bitmap formats with a stream handle type.

Change-Id: Iccaaf33df949ee73185acbd55b61d00a12d210ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87649
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx 
b/dtrans/source/win32/dtobj/DOTransferable.cxx
index afa705abfc56..c331b1d95b90 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "DOTransferable.hxx"
 #include "../misc/ImplHelper.hxx"
@@ -59,6 +60,7 @@ namespace
 void clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, 
CDOTransferable::ByteSequence_t& aByteSequence )
 {
 CStgTransferHelper memTransferHelper;
+LPSTREAM pStream = nullptr;
 
 switch( stgmedium.tymed )
 {
@@ -75,7 +77,7 @@ void clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM 
stgmedium, CDOTransferable::
 break;
 
 case TYMED_ISTREAM:
-//TODO: Has to be implemented
+pStream = stgmedium.pstm;
 break;
 
 default:
@@ -83,6 +85,41 @@ void clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM 
stgmedium, CDOTransferable::
 break;
 }
 
+if (pStream)
+{
+// We have a stream, read from it.
+STATSTG aStat;
+HRESULT hr = pStream->Stat(&aStat, STATFLAG_NONAME);
+if (FAILED(hr))
+{
+SAL_WARN("dtrans", "clipDataToByteStream: Stat() failed");
+return;
+}
+
+size_t nMemSize = aStat.cbSize.QuadPart;
+aByteSequence.realloc(nMemSize);
+LARGE_INTEGER li;
+li.QuadPart = 0;
+hr = pStream->Seek(li, STREAM_SEEK_SET, NULL);
+if (FAILED(hr))
+{
+SAL_WARN("dtrans", "clipDataToByteStream: Seek() failed");
+}
+
+ULONG nRead = 0;
+hr = pStream->Read(aByteSequence.getArray(), nMemSize, &nRead);
+if (FAILED(hr))
+{
+SAL_WARN("dtrans", "clipDataToByteStream: Read() failed");
+}
+if (nRead < nMemSize)
+{
+SAL_WARN("dtrans", "clipDataToByteStream: Read() was partial");
+}
+
+return;
+}
+
 int nMemSize = memTransferHelper.memSize( cf );
 aByteSequence.realloc( nMemSize );
 memTransferHelper.read( aByteSequence.getArray( ), nMemSize );
@@ -393,6 +430,14 @@ CDOTransferable::ByteSequence_t 
CDOTransferable::getClipboardData( CFormatEtc& a
 hr = m_rDataObject->GetData( aTempFormat, &stgmedium );
 }
 
+if (FAILED(hr) && aFormatEtc.getTymed() == TYMED_HGLOBAL)
+{
+// Handle type is not memory, try stream.
+CFormatEtc aTempFormat(aFormatEtc);
+aTempFormat.setTymed(TYMED_ISTREAM);
+hr = m_rDataObject->GetData(aTempFormat, &stgmedium);
+}
+
 if ( FAILED( hr ) )
 {
 OSL_ASSERT( (hr != E_INVALIDARG) &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Luboš Luňák (via logerrit)

 compilerplugins/clang/sharedvisitor/generator.cxx |   28 ++
 1 file changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 1565bcaff401366937c800d8f4617df2b4f68271
Author: Luboš Luňák 
AuthorDate: Tue Jan 28 15:55:33 2020 +0100
Commit: Luboš Luňák 
CommitDate: Tue Jan 28 19:33:54 2020 +0100

avoid compilerplugin's sharedvisitor bailing out prematurely

The simplifyconstruct test can return false from a Visit*() function
(thus ending the whole traversal) because anyPluginActive() would
return false just because a plugin would be temporarily disabled
in Traverse*() because of its PreTraverse*() returning false. Keep
a count of temporarily disabled plugins to prevent this.

Change-Id: I413d88749257acff2220182d13e8fcd0f7289540
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87636
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/compilerplugins/clang/sharedvisitor/generator.cxx 
b/compilerplugins/clang/sharedvisitor/generator.cxx
index 38e6527a7bb3..e62b27fd6422 100644
--- a/compilerplugins/clang/sharedvisitor/generator.cxx
+++ b/compilerplugins/clang/sharedvisitor/generator.cxx
@@ -141,7 +141,15 @@ void generateVisitor( PluginType type )
 ": FilteringPlugin(rData)\n";
 for( const PluginInfo& plugin : plugins[ type ] )
 output << ", " << plugin.variableName << "( nullptr )\n";
-output << "{}\n";
+output << ", activeRefCount( 0 )\n";
+output << "{}\n";
+
+output <<
+"~SharedRecursiveASTVisitor" << pluginTypeNames[ type ] << "()\n"
+"{\n"
+"if( activeRefCount != 0 )\n"
+"abort();\n"
+"}\n";
 
 output <<
 "virtual bool preRun() override\n"
@@ -251,7 +259,10 @@ void generateVisitor( PluginType type )
 output << "if( !" << plugin.variableName << 
"->Pre" << traverse.name << "( arg ))\n";
 // This will disable the plugin for the time of the traverse, 
until restored later,
 // just like directly returning from Traverse* would skip that 
part.
+output << "{\n";
 output << "" << plugin.variableName << " = 
nullptr;\n";
+output << "++activeRefCount;\n";
+output << "}\n";
 output << "}\n";
 }
 }
@@ -271,6 +282,8 @@ void generateVisitor( PluginType type )
 output << "save" << plugin.className << " = 
nullptr;\n";
 output << "}\n";
 }
+output << "if( " << plugin.variableName << " == nullptr && 
save" << plugin.className << " != nullptr )\n";
+output << "--activeRefCount;\n";
 output << "" << plugin.variableName << " = save" << 
plugin.className << ";\n";
 }
 output << "return ret;\n";
@@ -282,21 +295,16 @@ void generateVisitor( PluginType type )
 
 output <<
 "bool anyPluginActive() const\n"
-"{\n";
-first = true;
+"{\n"
+"return activeRefCount > 0";
 for( const PluginInfo& plugin : plugins[ type ] )
-{
-if( first )
-output << "return " << plugin.variableName << " != 
nullptr";
-else
-output << "\n|| " << plugin.variableName << " != 
nullptr";
-first = false;
-}
+output << "\n|| " << plugin.variableName << " != nullptr";
 output << ";\n";
 output << "}\n";
 
 for( const PluginInfo& plugin : plugins[ type ] )
 output << "" << plugin.className << "* " << plugin.variableName << 
";\n";
+output << "int activeRefCount;\n";
 
 output <<
 "};\n"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/cp-4.2.0-4'

2020-01-28 Thread Andras Timar (via logerrit)

Tag 'cp-4.2.0-4' created by Andras Timar  at 
2020-01-28 18:06 +

cp-4.2.0-4

Changes since co-4-2-0-branch-point-371:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/CODE-4.2.0-4'

2020-01-28 Thread Andras Timar (via logerrit)

Tag 'CODE-4.2.0-4' created by Andras Timar  at 
2020-01-28 18:05 +

CODE-4.2.0-4

Changes since co-4-2-0-branch-point-371:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/code-4.2.0-4' - configure.ac debian/changelog debian/control debian/rules loolwsd.spec.in

2020-01-28 Thread Andras Timar (via logerrit)

Rebased ref, commits from common ancestor:
commit 55b3f01adfb798848a8b3c83f51f2174e5b20779
Author: Andras Timar 
AuthorDate: Mon Dec 9 18:09:48 2019 +0100
Commit: Andras Timar 
CommitDate: Tue Jan 28 19:04:56 2020 +0100

Bump package version to 4.2.0-4 and update deb/rpm package files

Change-Id: I935425f644f373acdd4bf8d073ec8be3f29313b8

diff --git a/configure.ac b/configure.ac
index 8e769ff35..402acde1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index 56cbc5563..1f9ce94ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,23 @@
-loolwsd (1.8.2-1) unstable; urgency=medium
+loolwsd (4.2.0-4) unstable; urgency=medium
 
-  * Fix crash in Impress.
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-4
 
- -- Jan Holesovsky   Thu, 11 Aug 2016 16:46:00 +0100
+ -- Andras Timar   Tue, 28 Jan 2020 18:58:00 +0100
 
-loolwsd (1.8.0-1) unstable; urgency=medium
+loolwsd (4.2.0-3) unstable; urgency=medium
 
-  [ Tor Lillqvist ]
-  * Back to packaging this for Debian.
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-3
 
-  [ Jan Holesovsky ]
-  * Update to match Collabora Office 5.1
+ -- Andras Timar   Thu, 09 Jan 2020 22:12:00 +0100
 
- -- Jan Holesovsky   Fri, 05 Aug 2016 16:51:54 +0100
+loolwsd (4.2.0-2) unstable; urgency=medium
 
-loolwsd (1.0.0-1) unstable; urgency=low
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-2
 
-  * Initial release
+ -- Andras Timar   Fri, 20 Dec 2019 13:27:00 +0100
 
-  * Local Variables:
-  * Mode: fundamental
-  * End:
+loolwsd (4.2.0-1) unstable; urgency=medium
 
- -- Tor Lillqvist   Fri, 15 May 2015 11:10:20 +0300
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-1
+
+ -- Andras Timar   Tue, 10 Dec 2019 20:47:00 +0100
diff --git a/debian/control b/debian/control
index 532367872..a4dc03ff6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,27 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Andras Timar 
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, 
python-polib, python-lxml, python3-polib, python3-lxml, fontconfig, libpam-dev, 
libcppunit-dev, pkg-config, devscripts, m4
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, 
python3-polib, python3-lxml, fontconfig, libpam-dev, libcppunit-dev, 
pkg-config, devscripts, m4
 Standards-Version: 3.9.7
 
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libodbc1, libxinerama1, libxrender1, libcairo2, libgl1-mesa-glx, 
libcups2, libdbus-glib-1-2, cpio, libcap2-bin, ${lo:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ locales-all, adduser, expat, fontconfig, cpio, libcap2-bin,
+ collaboraofficebasis6.2-calc,
+ collaboraofficebasis6.2-core,
+ collaboraofficebasis6.2-graphicfilter,
+ collaboraofficebasis6.2-images,
+ collaboraofficebasis6.2-impress,
+ collaboraofficebasis6.2-ooofonts,
+ collaboraofficebasis6.2-writer,
+ collaboraoffice6.2,
+ collaboraoffice6.2-ure,
+ collaboraofficebasis6.2-en-us,
+ collaboraofficebasis6.2-draw,
+ collaboraofficebasis6.2-extension-pdf-import,
+ collaboraofficebasis6.2-ooolinguistic
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/debian/rules b/debian/rules
index d675675c0..feb980c95 100644
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,3 @@ override_dh_auto_test:
 
 override_dh_installinit:
# no init.d scripts here, assume systemd
-
-override_dh_gencontrol:
-   # put package names of LibreOffice here
-   # dh_gencontrol -- -Vlo:Depends=""
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index d78760e82..5b2147216 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,39 +12,45 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:1%{?dist}
+Release:4%{?dist}
 Vendor: %{vendor}
 Summary:LibreOffice Online WebSocket Daemon
 License:MPL
 Source0:loolwsd-@package_vers...@.tar.gz
-BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.5 m4
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires:  libpcap kernel-headers
-%else
-%if 0%{?suse_version}
-BuildRequires:  libcap-progs linux-glibc-devel systemd-rpm-macros
+BuildRequires:  libcap-devel libpng-devel pam-devel gcc-c++ cppunit-devel 
pam-devel fontconfig

[Libreoffice-commits] online.git: Branch 'distro/collabora/code-4.2.0-4' - 4 commits - configure.ac debian/changelog debian/control debian/rules .gitreview loolkitconfig.xcu loolwsd.spec.in

2020-01-28 Thread Andras Timar (via logerrit)

 .gitreview|2 
 configure.ac  |2 
 debian/changelog  |   28 +---
 debian/control|   18 ++-
 debian/rules  |4 -
 loolkitconfig.xcu |9 ++-
 loolwsd.spec.in   |  125 +-
 7 files changed, 115 insertions(+), 73 deletions(-)

New commits:
commit fd0627eb8e653ea6f978d5fadc92bb4efd2f042c
Author: Andras Timar 
AuthorDate: Mon Dec 9 18:09:48 2019 +0100
Commit: Andras Timar 
CommitDate: Tue Jan 28 19:03:11 2020 +0100

Bump package version to 4.2.0-3 and update deb/rpm package files

Change-Id: I935425f644f373acdd4bf8d073ec8be3f29313b8

diff --git a/configure.ac b/configure.ac
index 8e769ff35..402acde1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index 56cbc5563..1f9ce94ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,23 @@
-loolwsd (1.8.2-1) unstable; urgency=medium
+loolwsd (4.2.0-4) unstable; urgency=medium
 
-  * Fix crash in Impress.
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-4
 
- -- Jan Holesovsky   Thu, 11 Aug 2016 16:46:00 +0100
+ -- Andras Timar   Tue, 28 Jan 2020 18:58:00 +0100
 
-loolwsd (1.8.0-1) unstable; urgency=medium
+loolwsd (4.2.0-3) unstable; urgency=medium
 
-  [ Tor Lillqvist ]
-  * Back to packaging this for Debian.
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-3
 
-  [ Jan Holesovsky ]
-  * Update to match Collabora Office 5.1
+ -- Andras Timar   Thu, 09 Jan 2020 22:12:00 +0100
 
- -- Jan Holesovsky   Fri, 05 Aug 2016 16:51:54 +0100
+loolwsd (4.2.0-2) unstable; urgency=medium
 
-loolwsd (1.0.0-1) unstable; urgency=low
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-2
 
-  * Initial release
+ -- Andras Timar   Fri, 20 Dec 2019 13:27:00 +0100
 
-  * Local Variables:
-  * Mode: fundamental
-  * End:
+loolwsd (4.2.0-1) unstable; urgency=medium
 
- -- Tor Lillqvist   Fri, 15 May 2015 11:10:20 +0300
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-1
+
+ -- Andras Timar   Tue, 10 Dec 2019 20:47:00 +0100
diff --git a/debian/control b/debian/control
index 532367872..a4dc03ff6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,27 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Andras Timar 
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, 
python-polib, python-lxml, python3-polib, python3-lxml, fontconfig, libpam-dev, 
libcppunit-dev, pkg-config, devscripts, m4
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, 
python3-polib, python3-lxml, fontconfig, libpam-dev, libcppunit-dev, 
pkg-config, devscripts, m4
 Standards-Version: 3.9.7
 
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libodbc1, libxinerama1, libxrender1, libcairo2, libgl1-mesa-glx, 
libcups2, libdbus-glib-1-2, cpio, libcap2-bin, ${lo:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ locales-all, adduser, expat, fontconfig, cpio, libcap2-bin,
+ collaboraofficebasis6.2-calc,
+ collaboraofficebasis6.2-core,
+ collaboraofficebasis6.2-graphicfilter,
+ collaboraofficebasis6.2-images,
+ collaboraofficebasis6.2-impress,
+ collaboraofficebasis6.2-ooofonts,
+ collaboraofficebasis6.2-writer,
+ collaboraoffice6.2,
+ collaboraoffice6.2-ure,
+ collaboraofficebasis6.2-en-us,
+ collaboraofficebasis6.2-draw,
+ collaboraofficebasis6.2-extension-pdf-import,
+ collaboraofficebasis6.2-ooolinguistic
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/debian/rules b/debian/rules
index d675675c0..feb980c95 100644
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,3 @@ override_dh_auto_test:
 
 override_dh_installinit:
# no init.d scripts here, assume systemd
-
-override_dh_gencontrol:
-   # put package names of LibreOffice here
-   # dh_gencontrol -- -Vlo:Depends=""
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index d78760e82..5b2147216 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,39 +12,45 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:1%{?dist}
+Release:4%{?dist}
 Vendor: %{vendor}
 Summary:LibreOffice Online WebSocket Daemon
 License:MPL
 Source0:loolwsd-@package_vers...@.tar.gz
-BuildRequires:  libcap-devel libpng-devel p

[Libreoffice-commits] online.git: Changes to 'distro/collabora/code-4.2.0-4'

2020-01-28 Thread Pranam Lashkari (via logerrit)

New branch 'distro/collabora/code-4.2.0-4' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/code-4.2.0-4' - 0 commits -

2020-01-28 Thread (via logerrit)

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Pranam Lashkari (via logerrit)

 loleaflet/src/control/Control.RowHeader.js |   22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 2fb7bc633cef872fc45c8b130f4bf605b12f2e40
Author: Pranam Lashkari 
AuthorDate: Tue Jan 28 20:48:12 2020 +0530
Commit: Jan Holesovsky 
CommitDate: Tue Jan 28 18:50:13 2020 +0100

Added option in context menu/mobile wizard for "Add row below"

Change-Id: Ib650a4aa5175e73a41dbdb6f203fc36e70c860c7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87642
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.RowHeader.js 
b/loleaflet/src/control/Control.RowHeader.js
index f4330e59a..264d1bf76 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -65,6 +65,10 @@ L.Control.RowHeader = L.Control.Header.extend({
name: _UNO('.uno:InsertRowsBefore', 
'spreadsheet', true),
callback: (this._insertRowAbove).bind(this)
},
+   'insertrowbelow': {
+   name: _UNO('.uno:InsertRowsAfter', 
'spreadsheet', true),
+   callback: (this._insertRowBelow).bind(this)
+   },
'deleteselectedrow': {
name: _UNO('.uno:DeleteRows', 'spreadsheet', 
true),
callback: (this._deleteSelectedRow).bind(this)
@@ -110,7 +114,7 @@ L.Control.RowHeader = L.Control.Header.extend({
this._map.sendUnoCommand('.uno:SetOptimalRowHeight');
},
 
-   insertRow: function(index) {
+   insertRowAbove: function(index) {
// First select the corresponding row because
// .uno:InsertRows doesn't accept any row number
// as argument and just inserts before the selected row
@@ -120,6 +124,13 @@ L.Control.RowHeader = L.Control.Header.extend({
this._map.sendUnoCommand('.uno:InsertRows');
},
 
+   insertRowBelow: function(index) {
+   if (this._map._docLayer._selections.getLayers().length === 0) {
+   this._selectRow(index, 0);
+   }
+   this._map.sendUnoCommand('.uno:InsertRowsAfter');
+   },
+
deleteRow: function(index) {
if (this._map._docLayer._selections.getLayers().length === 0) {
this._selectRow(index, 0);
@@ -611,7 +622,14 @@ L.Control.RowHeader = L.Control.Header.extend({
_insertRowAbove: function() {
var index = this._lastMouseOverIndex;
if (index) {
-   this.insertRow.call(this, index);
+   this.insertRowAbove.call(this, index);
+   }
+   },
+
+   _insertRowBelow: function() {
+   var index = this._lastMouseOverIndex;
+   if (index) {
+   this.insertRowBelow.call(this, index);
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Pranam Lashkari (via logerrit)

 loleaflet/src/control/Control.ColumnHeader.js |   23 +--
 1 file changed, 21 insertions(+), 2 deletions(-)

New commits:
commit c9ee98d4d311a35702093b6a4a9bd0e6e43c7b76
Author: Pranam Lashkari 
AuthorDate: Tue Jan 28 23:15:03 2020 +0530
Commit: Jan Holesovsky 
CommitDate: Tue Jan 28 18:49:25 2020 +0100

Added option in context menu/mobile wizard for "Add column after"

Change-Id: I4325fbdb14ef7277441e616f854116b8a3a0e0d8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87651
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index de58741fb..6ef875dc6 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -68,6 +68,10 @@ L.Control.ColumnHeader = L.Control.Header.extend({
name: _UNO('.uno:InsertColumnsBefore', 
'spreadsheet', true),
callback: (this._insertColBefore).bind(this)
},
+   'insertcolafter': {
+   name: _UNO('.uno:InsertColumnsAfter', 
'spreadsheet', true),
+   callback: (this._insertColAfter).bind(this)
+   },
'deleteselectedcol': {
name: _UNO('.uno:DeleteColumns', 'spreadsheet', 
true),
callback: (this._deleteSelectedCol).bind(this)
@@ -112,7 +116,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
this._map.sendUnoCommand('.uno:SetOptimalColumnWidth');
},
 
-   insertColumn: function(index) {
+   insertColumnBefore: function(index) {
// First select the corresponding column because
// .uno:InsertColumn doesn't accept any column number
// as argument and just inserts before the selected column
@@ -123,6 +127,14 @@ L.Control.ColumnHeader = L.Control.Header.extend({
this._updateColumnHeader();
},
 
+   insertColumnAfter: function(index) {
+   if (this._map._docLayer._selections.getLayers().length === 0) {
+   this._selectColumn(index, 0);
+   }
+   this._map.sendUnoCommand('.uno:InsertColumnsAfter');
+   this._updateColumnHeader();
+   },
+
deleteColumn: function(index) {
if (this._map._docLayer._selections.getLayers().length === 0) {
this._selectColumn(index, 0);
@@ -646,7 +658,14 @@ L.Control.ColumnHeader = L.Control.Header.extend({
_insertColBefore: function() {
var index = this._lastMouseOverIndex;
if (index) {
-   this.insertColumn.call(this, index);
+   this.insertColumnBefore.call(this, index);
+   }
+   },
+
+   _insertColAfter: function() {
+   var index = this._lastMouseOverIndex;
+   if (index) {
+   this.insertColumnAfter.call(this, index);
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'distro/collabora/code-4.2.0-4'

2020-01-28 Thread Aron Budea (via logerrit)

New branch 'distro/collabora/code-4.2.0-4' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Aron Budea (via logerrit)

 loleaflet/src/control/Control.Toolbar.js |   10 --
 loleaflet/src/map/Map.js |8 
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit db2ae7432ddc432e42811bb125bd0d5a39a4087e
Author: Aron Budea 
AuthorDate: Tue Jan 28 02:21:29 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Jan 28 18:44:26 2020 +0100

tdf#130223: Revert "Some menubar folding/unfolding cleanups"

This reverts commit 2f861612e9aac7e92722597f345a6ab4f4e00d02,
which caused the formula bar to be hidden, and rows to get
misaligned on tablets.

Change-Id: I14826fccb23283e3f7462eee7aeb43fb6d2eaeaa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87568
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 8bb1e3e05..80c4bd57f 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1714,10 +1714,16 @@ function onDocLayerInit() {
}
 
if (!window.ThisIsTheiOSApp && window.mode.isTablet()) {
-   map.hideMenubar();
-
+   // Fold menubar by default
+   // FIXME: reuse toogleMenubar / use css
+   $('.main-nav').css({'display': 'none'});
+   $('#closebuttonwrapper').css({'display': 'none'});
+   var obj = $('.fold');
+   obj.removeClass('w2ui-icon fold');
+   obj.addClass('w2ui-icon unfold');
$(map.options.documentContainer).addClass('tablet');
$('#spreadsheet-row-column-frame').addClass('tablet');
+   $('#presentation-controls-wrapper').css({'top': '41px'});
 
$('#tb_editbar_item_fonts').css({'display': 'none'});
$('#tb_editbar_item_fontsizes').css({'display': 'none'});
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 45ab9273a..4ee77558e 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1687,8 +1687,8 @@ L.Map = L.Evented.extend({
}
 
var obj = $('.unfold');
-   obj.removeClass('unfold');
-   obj.addClass('fold');
+   obj.removeClass('w2ui-icon unfold');
+   obj.addClass('w2ui-icon fold');
 
moveObjectVertically($('#spreadsheet-row-column-frame'), 36);
moveObjectVertically($(this.options.documentContainer), 36);
@@ -1705,8 +1705,8 @@ L.Map = L.Evented.extend({
}
 
var obj = $('.fold');
-   obj.removeClass('fold');
-   obj.addClass('unfold');
+   obj.removeClass('w2ui-icon fold');
+   obj.addClass('w2ui-icon unfold');
 
moveObjectVertically($('#spreadsheet-row-column-frame'), -36);
moveObjectVertically($(this.options.documentContainer), -36);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_global.h.in configure.ac include/sal

2020-01-28 Thread Stephan Bergmann (via logerrit)

 config_host/config_global.h.in |2 --
 configure.ac   |8 
 include/sal/types.h|2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 6171812c5520b80dabd007c709143fbf43b527fb
Author: Stephan Bergmann 
AuthorDate: Tue Jan 28 14:05:12 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 18:35:49 2020 +0100

HAVE_GCC_ATTRIBUTE_WARN_UNUSED should always be true now for Clang/GCC

...but for safety, leave the configure.ac check in for some longer.

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

diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index f7672d211647..aa5863f73b6a 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -18,8 +18,6 @@ Any change in this header will cause a rebuild of almost 
everything.
 #define HAVE_GCC_PRAGMA_OPERATOR 0
 #define HAVE_GCC_DEPRECATED_MESSAGE 0
 #define HAVE_SYSLOG_H 0
-/* Compiler supports __attribute__((warn_unused)). */
-#define HAVE_GCC_ATTRIBUTE_WARN_UNUSED 0
 
 /* Guaranteed copy elision (C++17), __cpp_guaranteed_copy_elision (C++2a): */
 #define HAVE_CPP_GUARANTEED_COPY_ELISION 0
diff --git a/configure.ac b/configure.ac
index 4b25ed9bf662..d16b49a69c83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6445,17 +6445,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 ], [AC_MSG_RESULT([no])])
 AC_LANG_POP([C++])
 
-dnl Available in GCC 4.9 and at least since Clang 3.4:
-AC_MSG_CHECKING([whether $CXX_BASE supports __attribute__((warn_unused))])
+dnl Available in GCC 4.9 and at least since Clang 3.4; this check can 
eventually be removed
+dnl completely (e.g., aftger libreoffice-6-5 branch off):
+AC_MSG_CHECKING([that $CXX_BASE supports __attribute__((warn_unused))])
 AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS -Werror"
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 struct __attribute__((warn_unused)) dummy {};
 ])], [
-AC_DEFINE([HAVE_GCC_ATTRIBUTE_WARN_UNUSED],[1])
 AC_MSG_RESULT([yes])
-], [AC_MSG_RESULT([no])])
+], [AC_MSG_ERROR([no])])
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
 fi
diff --git a/include/sal/types.h b/include/sal/types.h
index 1a8ba255b4b7..53cbd687497a 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -572,7 +572,7 @@ template< typename T1, typename T2 > inline T1 
static_int_cast(T2 n) {
 
 */
 
-#if HAVE_GCC_ATTRIBUTE_WARN_UNUSED
+#if defined LIBO_INTERNAL_ONLY && (defined __GNUC__ || defined __clang__)
 #define SAL_WARN_UNUSED __attribute__((warn_unused))
 #else
 #define SAL_WARN_UNUSED
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Stephan Bergmann (via logerrit)

 include/vcl/ppdparser.hxx  |7 +--
 vcl/unx/generic/print/printerjob.cxx   |5 +++--
 vcl/unx/generic/printer/cpdmgr.cxx |7 +--
 vcl/unx/generic/printer/cupsmgr.cxx|5 +++--
 vcl/unx/generic/printer/ppdparser.cxx  |6 ++
 vcl/unx/generic/printer/printerinfomanager.cxx |   17 +++--
 6 files changed, 29 insertions(+), 18 deletions(-)

New commits:
commit 545f198a3baa5544919454054d591d1a331498f7
Author: Stephan Bergmann 
AuthorDate: Tue Jan 28 15:00:07 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 18:36:14 2020 +0100

Use better types for PPDContext::countValuesModified/getModifiedKey

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

diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 2d0701c4a859..a0a59c4a8d80 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -19,6 +19,9 @@
 #ifndef INCLUDED_VCL_PPDPARSER_HXX
 #define INCLUDED_VCL_PPDPARSER_HXX
 
+#include 
+
+#include 
 #include 
 #include 
 #include 
@@ -246,8 +249,8 @@ public:
 const PPDValue* getValue( const PPDKey* ) const;
 const PPDValue* setValue( const PPDKey*, const PPDValue*, bool 
bDontCareForConstraints = false );
 
-int countValuesModified() const { return m_aCurrentValues.size(); }
-const PPDKey* getModifiedKey( int n ) const;
+std::size_t countValuesModified() const { return m_aCurrentValues.size(); }
+const PPDKey* getModifiedKey( std::size_t n ) const;
 
 // public wrapper for the private method
 bool checkConstraints( const PPDKey*, const PPDValue* );
diff --git a/vcl/unx/generic/print/printerjob.cxx 
b/vcl/unx/generic/print/printerjob.cxx
index 5a5bc6d9e6b3..8269b8d4be01 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -38,6 +38,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -682,8 +683,8 @@ bool PrinterJob::writeFeatureList( osl::File* pFile, const 
JobData& rJob, bool b
 ( m_aLastJobData.m_pParser == rJob.m_pParser || 
m_aLastJobData.m_pParser == nullptr )
 )
 {
-int i;
-int nKeys = rJob.m_aContext.countValuesModified();
+std::size_t i;
+std::size_t nKeys = rJob.m_aContext.countValuesModified();
 ::std::vector< const PPDKey* > aKeys( nKeys );
 for(  i = 0; i < nKeys; i++ )
 aKeys[i] = rJob.m_aContext.getModifiedKey( i );
diff --git a/vcl/unx/generic/printer/cpdmgr.cxx 
b/vcl/unx/generic/printer/cpdmgr.cxx
index cae2a4e1ab03..bebd568330c5 100644
--- a/vcl/unx/generic/printer/cpdmgr.cxx
+++ b/vcl/unx/generic/printer/cpdmgr.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
 #include 
 
 #include 
@@ -604,8 +607,8 @@ void CPDManager::getOptionsFromDocumentSetup( const 
JobData& rJob, bool bBanner,
 builder = g_variant_builder_new(G_VARIANT_TYPE("a(ss)"));
 g_variant_builder_add(builder, "(ss)", "job-name", rJobName.getStr());
 if( rJob.m_pParser ==  rJob.m_aContext.getParser() &&  rJob.m_pParser ) {
-int i;
-int nKeys = rJob.m_aContext.countValuesModified();
+std::size_t i;
+std::size_t nKeys = rJob.m_aContext.countValuesModified();
 ::std::vector< const PPDKey* > aKeys( nKeys );
 for(  i = 0; i < nKeys; i++ )
 aKeys[i] = rJob.m_aContext.getModifiedKey( i );
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx 
b/vcl/unx/generic/printer/cupsmgr.cxx
index 17e8112f4bff..f2251cb886f3 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -40,6 +40,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace psp;
 using namespace osl;
@@ -618,8 +619,8 @@ void CUPSManager::getOptionsFromDocumentSetup( const 
JobData& rJob, bool bBanner
 // sanity check
 if( rJob.m_pParser == rJob.m_aContext.getParser() && rJob.m_pParser )
 {
-int i;
-int nKeys = rJob.m_aContext.countValuesModified();
+std::size_t i;
+std::size_t nKeys = rJob.m_aContext.countValuesModified();
 ::std::vector< const PPDKey* > aKeys( nKeys );
 for(  i = 0; i < nKeys; i++ )
 aKeys[i] = rJob.m_aContext.getModifiedKey( i );
diff --git a/vcl/unx/generic/printer/ppdparser.cxx 
b/vcl/unx/generic/printer/ppdparser.cxx
index ec9960eab94b..ffa6c873c13f 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -19,7 +19,6 @@
 
 #include 
 
-#include 
 #include 
 
 #include 
@@ -1648,10 +1647,9 @@ PPDContext& PPDContext::operator=( PPDContext&& rCopy )
 return *this;
 }
 
-const PPDKey* PPDContext::getModifiedKey( int n ) const
+const PPDKey* PPDContext::getModifiedKey( std::size_t n ) const
 {
-assert(n >= 0);
-if( m_aCurren

[Libreoffice-commits] core.git: Changes to 'libreoffice-6-3-5'

2020-01-28 Thread Christian Lohmaier (via logerrit)

New branch 'libreoffice-6-3-5' available with the following commits:
commit 70989580ea691fd347a8b39d1d3f659fe4fe31d2
Author: Christian Lohmaier 
Date:   Tue Jan 28 18:25:47 2020 +0100

bump product version to 6.3.5.1.0+

Change-Id: I8e1d44beb172d20cdba72c180bd460f24112bbbd

commit 1b05ed857f0f6a0b8faa0dcda108b71092cde50c
Author: Christian Lohmaier 
Date:   Tue Jan 28 18:21:40 2020 +0100

Branch libreoffice-6-3-5

This is 'libreoffice-6-3-5' - the stable branch for the 6.3.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

If you want to build something cool, unstable, and risky, use master.

commit 3ef59190c34a7628c6e0156a2913deefe93116af
Author: Christian Lohmaier 
Date:   Tue Jan 28 18:16:24 2020 +0100

Update git submodules

* Update translations from branch 'libreoffice-6-3'
  to 1a20bc7121f96500463e181bbcead205b6e84254
  - update translations for 6.3.5 rc1

and force-fix errors using pocheck

Change-Id: I6e50ec78c3642b59d397c2b243639e8d159b22e5

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.3.5.1'

2020-01-28 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-6.3.5.1' created by Christian Lohmaier 
 at 2020-01-28 17:25 +

Tag libreoffice-6.3.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4wboQACgkQ9DSh76/u
rqOe1xAAs4h/cYQ5FSUwoARbXw+YAxQW3FPKqk7GX+QWp+6vUTWade0TJJZvv2Ux
MtHBcmAydjFgteyL2vV1C4p1mTo5rQjC7ed/Exbr0sdZIQ2XONu6yJS5Bcw63GiS
imVMIcuIN95Nl77xSp6ce9iVBq64woiChhmz9Xalzs71Kv3yKhKtJbhMkT6dKZFd
z9/SBDQXw4iM9/+iSHzXh5D/KEmJ83UstBFQZuAqCcPMuU5qXFVoDwUjGmwBIM0b
nw0h8I3hcJTfz5dG07AW2onrbgBpLVeMYYPmdZf09IN1mu2InaKCgzhUbJu2/Obo
VeiNoGxhKsa7WEfQFuBzzxnnSOuFVk0RU0W+KakF0cSFJZzOByk8clA/85rOQjpp
+W+9zqRXAlhGak4HZvSLWf48tqMLg71fGC0cdYjTLOhkZyO0VGRKaLk+NjlsgQwb
gFT1fp6z9Bmu4oMa+C3kKslMotuGclO8mlCOEu4bItf3r+Vw04MVP0JUP86T7NGp
LFJTkTYUdiWhlD3DHV9ZiNZlGLT+mVyQCSpZ/LrvgI5x9Dhg/GoSXraex5CW32X5
CdtZE+Sz2wJZU34l1pZygOBmBgpu0uPYyH7G/R7BZ/hzwe3EPfP9AUN2px0AZvep
+fR3z4As69qCa3V/xplCUF/MDMuUK/7mEH5EgV7k65Z47YWILCY=
=FEo4
-END PGP SIGNATURE-

Changes since libreoffice-6-3-branch-point-1060:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.3.5.1'

2020-01-28 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-6.3.5.1' created by Christian Lohmaier 
 at 2020-01-28 17:25 +

Tag libreoffice-6.3.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4wboQACgkQ9DSh76/u
rqOjUA//d68dL4DRKg8rKynC+dxD8FnnSrUrlr5S66xIMLCw/i/vQmIHrpMAn+Pu
+GiLsqcdg78UXAiezBMGxDOtgLFTXQDK4b7U9ryBRZ/PcxQPX4F9pIoj/8sHtaOM
+DLwKx+HZTR5zZnTHhRyaV+CKDi2EiFkM1S/tg2R9CBxCoppeXFrsMKnK5fSQPwC
2R/3ann4KYyT+SFH6H75zebPH16nqZD4l4b+zdHDcTPL4jcqVe7r5JVov2yCdm+c
yFB9B4Wi/6bg9uyPAO5ERYbSyGWGja1GlWOAOZ/9EhNN5NzR3jEx28vSFZij0/Qg
MsuE159hCWREg3yWbhHgeTzj58xskCUL7Rhpusb3sBgVe23V/r1+DAtPGSedOmYx
G2DZFC8pvs2DR/OmpE1JHTB1HzRoLjyUGKJdRsAaJZDjy4kYWwrIgXcZ/ZkXZwRa
M2TKGiuQxsSmj1iN4PK3QY3IL1ly+8RZ4WUJ56IGN/kRsB3KFqQbfH7IOrWEQAFR
RWSF0CHjJZ1iY3QvxM9S9inK+cFnSHDMsyAhRJB7olTKqyRiGv59HNTDw/ZioMDI
8yZ2VBVN/X9EGFOC2XuVKkhjzXSf6PehbojTKKt7LiCccVeug+RNACYnLZSYLwhs
qlFAQz0+ufNCjqIWuQc9bC0oHyewamAJKURLLgjS+fWlvyUP63A=
=fCcJ
-END PGP SIGNATURE-

Changes since libreoffice-6-3-branch-point-25:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 7 commits - loleaflet/src wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/Storage.cpp wsd/Storage.hpp

2020-01-28 Thread Ashod Nakashian (via logerrit)

 loleaflet/src/control/Control.LokDialog.js|   20 
 loleaflet/src/control/Control.Toolbar.js  |   12 ++---
 loleaflet/src/layer/tile/TileLayer.js |4 -
 loleaflet/src/map/Map.js  |   47 +++-
 loleaflet/src/map/handler/Map.TouchGesture.js |   17 ---
 wsd/ClientSession.cpp |   14 +-
 wsd/ClientSession.hpp |5 ++
 wsd/DocumentBroker.cpp|   17 +++
 wsd/Storage.cpp   |   53 ---
 wsd/Storage.hpp   |   59 +++---
 10 files changed, 153 insertions(+), 95 deletions(-)

New commits:
commit 7c1153d30a96320a72ddb7de96f0011e7058be32
Author: Ashod Nakashian 
AuthorDate: Sun Jan 26 17:21:51 2020 -0500
Commit: Jan Holesovsky 
CommitDate: Tue Jan 28 18:10:14 2020 +0100

leaflet: double-tap to show keyboard on mobile

On mobile, we now do not show the keyboard by default
when the user taps the cell in Calc or a text-area in Impress.
Instead, the user should double-tap. This is especially useful
when the user selects the cell on first tap, then double-tap to edit.
As for Impress, editing-mode is enabled only by double-clicking,
so showing the keyboard on mobile on single tap is not helpful
as the user can't edit just yet. So it makes sense to show
the keyboard only on double-tap, when the slide is in text
editing mode.

On desktop and for other document the behavior is unchanged.

Change-Id: I4206291f60656391d061387f7bbad1b6e3caf80d

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 9804e5d65..4779f4ed9 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -411,8 +411,6 @@ L.Control.LokDialog = L.Control.extend({
this._map.setWinId(dlgId);
if (dlgId in this._dialogs) {
this._map.focus();
-   } else {
-   this._map.blur();
}
},
 
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index f5fb704a8..0b4926a43 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2091,8 +2091,8 @@ L.TileLayer = L.GridLayer.extend({
 
this._map._textInput.showCursor();
if (this._map.editorHasFocus() /* && !L.Browser.mobile */) {
-   // On mobile, this is causing some key input to get 
lost.
-   this._map.focus();
+   // User is editing, show the keyboard.
+   this._map.focus(true);
}
},
 
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 6a2e99f3e..45ab9273a 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -904,12 +904,13 @@ L.Map = L.Evented.extend({
return this.layerPointToLatLng(this.mouseEventToLayerPoint(e));
},
 
-   // Give the focus to the text input to accept keyboard input.
-   // On mobile, it will show the virtual keyboard.
-   focus: function () {
-   //TODO: we should check if focus is going to edit the doc in
-   //TODO: read-only mode and prevent it (but allow for searching).
+   // Give the focus to the text input.
+   // @acceptInput (on mobile only) true if we want to
+   // accept key input, and show the virtual keyboard.
+   focus: function (acceptInput) {
this._textInput.focus();
+   if (window.mode.isMobile() && acceptInput !== true)
+   this.blur();
},
 
// Lose focus to stop accepting keyboard input.
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 78fa4affc..7d9d07f5d 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -322,11 +322,8 @@ L.Map.TouchGesture = L.Handler.extend({
docLayer._postMouseEvent('buttondown', mousePos.x, 
mousePos.y, 1, 1, 0);
docLayer._postMouseEvent('buttonup', mousePos.x, 
mousePos.y, 1, 1, 0);
 
-   if (this._state === L.Map.TouchGesture.MARKER || 
(this._state === L.Map.TouchGesture.GRAPHIC && !docLayer._isCursorVisible)) {
-   this._map.blur();
-   } else if (!this._map.hasFocus()) {
-   this._map.focus();
-   }
+   // Take focus, but keyboard show only in Writer 
(double-tap to edit Calc/Impress).
+   this._map.focus(this._map._docLayer._docType === 
'text');
}
},
 
@@ -337,8 +334,14 @@ L.Map.TouchGesture = L.Handler.ext

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-6-3-5'

2020-01-28 Thread Christian Lohmaier (via logerrit)

New branch 'libreoffice-6-3-5' available with the following commits:
commit 168a02fe27c1d28ee4919fb96119aaedac9556c7
Author: Christian Lohmaier 
Date:   Tue Jan 28 18:21:11 2020 +0100

Branch libreoffice-6-3-5

This is 'libreoffice-6-3-5' - the stable branch for the 6.3.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Idf0b73e3c42a547fc06135e914561f246015f3aa

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.3.5.1'

2020-01-28 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-6.3.5.1' created by Christian Lohmaier 
 at 2020-01-28 17:25 +

Tag libreoffice-6.3.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4wbn8ACgkQ9DSh76/u
rqNUhw//Yn45BjP1GMObNuulITcshfGpp+WKH7JMqgTcWQ3ZfBOY09gHibU80oVm
Qxt/66yhXaMh1T1B9FWyfXqs8Y3vCnrJckmYL/nu1l3VvpZouNTVk0AzPmq1vjW2
Ezg01NgwNNFfWpznOTNPJQZS5ckULuRYfv91k2jEjPGN5bcUVlGMlKIV7u4S+qaY
D0fwZH1OUrhsKIop/yP+PzK+CVOSwZjSV0+j+NeTuxKIHuUgwXTfPk7nBn80nwv6
3YAgk8Cr9+xlDmqq2jq1eD+ir7Ad6L7wardHihVK8UD+nuHsREca8tzFDkhtYoOq
gpg7lA1mLdqhMJuEXAXk8/lDcICgKKdAPkDw9PwSJrRJci/N1r2tk0rEeOKgyBha
H3s3XZcbYXLBWwKVk5xljOPa27o995e8WtocwgPLdOymhBCHM4L0iShKRHv+Wlp6
gP/rlGq+jyMwTQhX66lCTEUesBnKpSMJ/QdfJ58qXzOssm2VcAeTZpCN9ZjYXD1P
TDOJDwHvM/Cn+8Cij1qoPr2U1jw0MTCLGr1bY9co4m5p2pNiVaOK3BTx6DxvIrAJ
UAGaM2cmRz/lxorWGxFdelepyix3CG0UPFP1G5jgVW9+aYX7YHGg+3faeYjghHYN
wYKMmjodv8QUP+d4fEr7EFK9p7Ei6y2aCtfUe+bERfkyHbhl0p0=
=NlFC
-END PGP SIGNATURE-

Changes since libreoffice-6-3-branch-point-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-6-3-5'

2020-01-28 Thread Christian Lohmaier (via logerrit)

New branch 'libreoffice-6-3-5' available with the following commits:
commit 9e0fcd06182e3b95eb900af5155dfa03f60704ae
Author: Christian Lohmaier 
Date:   Tue Jan 28 18:21:12 2020 +0100

Branch libreoffice-6-3-5

This is 'libreoffice-6-3-5' - the stable branch for the 6.3.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I23b3e0572042b35b596353f3307f0e2eb0129564

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - configure.ac translations

2020-01-28 Thread Christian Lohmaier (via logerrit)

 configure.ac |2 +-
 translations |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 43364a729080789982c325f4c9a1361bdec3b4e5
Author: Christian Lohmaier 
AuthorDate: Tue Jan 28 18:23:22 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Jan 28 18:23:22 2020 +0100

bump product version to 6.3.6.0.0+

Change-Id: I48cc8bd5c171e989fa952008aec3f21b7c9bd455

diff --git a/configure.ac b/configure.ac
index ed0aa7df8cd5..c62f88352543 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.3.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.6.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit 3ef59190c34a7628c6e0156a2913deefe93116af
Author: Christian Lohmaier 
AuthorDate: Tue Jan 28 18:16:24 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Jan 28 18:16:24 2020 +0100

Update git submodules

* Update translations from branch 'libreoffice-6-3'
  to 1a20bc7121f96500463e181bbcead205b6e84254
  - update translations for 6.3.5 rc1

and force-fix errors using pocheck

Change-Id: I6e50ec78c3642b59d397c2b243639e8d159b22e5

diff --git a/translations b/translations
index 4115fb4aaac9..1a20bc7121f9 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4115fb4aaac9821b3aeb5fec1809f64143ca287f
+Subproject commit 1a20bc7121f96500463e181bbcead205b6e84254
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-6-3-5'

2020-01-28 Thread Christian Lohmaier (via logerrit)

New branch 'libreoffice-6-3-5' available with the following commits:
commit 059c641292e22c3ac6fd18a01b1d3a194017c5e2
Author: Christian Lohmaier 
Date:   Tue Jan 28 18:21:11 2020 +0100

Branch libreoffice-6-3-5

This is 'libreoffice-6-3-5' - the stable branch for the 6.3.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I0a3582d1611ff19e9100ea24a568ec1153286e09

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.3.5.1'

2020-01-28 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-6.3.5.1' created by Christian Lohmaier 
 at 2020-01-28 17:25 +

Tag libreoffice-6.3.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4wboQACgkQ9DSh76/u
rqOmlxAAs4Jq349Nn5/qbuW48KN+vJHLaYLzR7U00McW/qZVIoDLbXZ1NAjMHLND
1NiFSe0EwmtPkRGGczi2wDchBZPeNClQlbdB4YgVVvPzlbZyAoaFA466nQblWHNM
fcDS4HENkisfPcsulDi8w0cvpE5iZL7M7ZwtLvEhb+yy/muhClGA3e42LqwtPjHj
yrWKSNMlUw9ina3qBRaZOpwVjpGzoMVW9nJqW3ffOiBiZDqLi4T6CWXUmdBzlb1p
8BfDw7GagQyQm50I16e1oTM7QNVw0TCyLaooCCvBHt3vBqt0SZJNZ4BQo4Xp0QHd
fNWyULawBV1smQZTDwN/wT2cUNWdP3r3x9tA0tjbiiNa4Bs4eQoi2rtNZwLCbeRn
Ryn0c8Kp+SWObTk9eLO7yqqtiWUcHXgAIDOBt10E5qbl6gJvCbBHCsz081m7PTwL
3J0J+j5pgekoMW1F6QHBejmptXaen6ylUbPRytjqDysZXJom4ktT8gpg5E1dP95A
l9q7+2pngX5RcaVAUujYeKzFW88JSAGXMDjBOBJQrBdWR4BRUX265fVdESztNqjl
VR9KDGwzAGRuzpi/WVDR4j2cJXHWYry0CeopCVebGSNRZwVDEv5PD9BmG46+HAKI
cMK223T6LpieBeLDnG8fGbfU1L54YvBl+vk6hDhCfrU/hVmqzsI=
=+Edt
-END PGP SIGNATURE-

Changes since libreoffice-6-3-branch-point-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - cypress_test/data cypress_test/integration_tests cypress_test/Makefile.am loleaflet/src

2020-01-28 Thread Tamás Zolnai (via logerrit)

 cypress_test/Makefile.am |7 
 cypress_test/data/mobile/simple.odt  |binary
 cypress_test/integration_tests/mobile/apply_font_spec.js |  359 +++
 loleaflet/src/control/Control.Toolbar.js |2 
 loleaflet/src/core/Browser.js|8 
 loleaflet/src/map/Clipboard.js   |7 
 6 files changed, 372 insertions(+), 11 deletions(-)

New commits:
commit 17553b691f75c0c7980fec172b64b98c56fab0a5
Author: Tamás Zolnai 
AuthorDate: Tue Jan 28 17:08:06 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Tue Jan 28 18:01:36 2020 +0100

cypress: mobile: More font changes related tests.

Change-Id: I100b5904db47af1f1f612650f280bf2518c7fae7

diff --git a/cypress_test/data/mobile/simple.odt 
b/cypress_test/data/mobile/simple.odt
index 833aa18fa..f7494e82f 100644
Binary files a/cypress_test/data/mobile/simple.odt and 
b/cypress_test/data/mobile/simple.odt differ
diff --git a/cypress_test/integration_tests/mobile/apply_font_spec.js 
b/cypress_test/integration_tests/mobile/apply_font_spec.js
index 55f268e45..ad8153e8f 100644
--- a/cypress_test/integration_tests/mobile/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/apply_font_spec.js
@@ -21,6 +21,18 @@ describe('Apply font changes.', function() {
});
 
function generateTextHTML() {
+   // Do a new selection
+   cy.get('#document-container').click();
+   cy.get('.leaflet-marker-icon')
+   .should('not.exist');
+
+   cy.wait(200);
+
+   cy.get('body').type('{shift}{home}');
+   cy.get('.leaflet-marker-icon');
+
+   cy.wait(200);
+
// Open context menu
cy.get('.leaflet-marker-icon')
.then(function(marker) {
@@ -69,5 +81,279 @@ describe('Apply font changes.', function() {
cy.get('#copy-paste-container p font')
.should('have.attr', 'face', 'Linux Libertine G');
});
+
+   it('Apply font size.', function() {
+   // Select text
+   cy.get('#document-container').dblclick();
+   cy.get('.leaflet-marker-icon');
+
+   // Change font size
+   cy.get('#fontsizecombobox')
+   .click();
+
+   cy.get('.mobile-wizard.ui-combobox-text')
+   .contains('36')
+   .click();
+
+   cy.get('#mobile-wizard-back')
+   .click();
+
+   // Combobox entry contains the selected font name
+   cy.get('#fontsizecombobox .ui-header-right')
+   .contains('36');
+
+   // Close mobile wizard
+   cy.get('#tb_actionbar_item_mobile_wizard')
+   .click();
+
+   generateTextHTML();
+
+   cy.get('#copy-paste-container p font')
+   .should('have.attr', 'style', 'font-size: 36pt');
+   });
+
+   it('Apply bold font.', function() {
+   // Select text
+   cy.get('#document-container').dblclick();
+   cy.get('.leaflet-marker-icon');
+
+   // Apply bold
+   cy.get('#Bold')
+   .click();
+
+   // Close mobile wizard
+   cy.get('#tb_actionbar_item_mobile_wizard')
+   .click();
+
+   generateTextHTML();
+
+   cy.get('#copy-paste-container p b')
+   .should('exist');
+   });
+
+   it('Apply italic font.', function() {
+   // Select text
+   cy.get('#document-container').dblclick();
+   cy.get('.leaflet-marker-icon');
+
+   // Apply italic
+   cy.get('#Italic')
+   .click();
+
+   // Close mobile wizard
+   cy.get('#tb_actionbar_item_mobile_wizard')
+   .click();
+
+   generateTextHTML();
+
+   cy.get('#copy-paste-container p i')
+   .should('exist');
+   });
+
+   it('Apply underline.', function() {
+   // Select text
+   cy.get('#document-container').dblclick();
+   cy.get('.leaflet-marker-icon');
+
+   // Change underline
+   cy.get('#Underlineimg')
+   .click();
+
+   // Close mobile wizard
+   cy.get('#tb_actionbar_item_mobile_wizard')
+   .click();
+   cy.get('#mobile-wizard-content')
+   .should('not.be.visible');
+
+   generateTextHTML();
+
+   cy.get('#copy-paste-container p u')
+   .should('exist');
+   });
+
+   it('Apply strikeout.', function() {
+   // Select text
+

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 sc/source/core/data/dpobject.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 160946f5e6e42080e5d7d7f5a56b39fa8abcf4a9
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 12:24:51 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jan 28 17:57:15 2020 +0100

Resolves: tdf#130239 set an explicit parent for the message dialog

Change-Id: If6e4bdf674f1aa5ceaa7cda5715af1aa7ce6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87611
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 28de482413e5..73762cc70c54 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -3259,7 +3260,7 @@ uno::Reference 
ScDPCollection::DBCaches::createRowSet(
 catch ( const sdbc::SQLException& rError )
 {
 //! store error message
-std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(nullptr,
+std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(ScDocShell::GetActiveDialogParent(),
   VclMessageType::Info, 
VclButtonsType::Ok,
   rError.Message));
 xInfoBox->run();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Pedro Pinto Silva (via logerrit)

 loleaflet/css/mobilewizard.css   |3 ++
 loleaflet/images/lc_inserttable_mono.svg |1 
 loleaflet/src/control/Control.JSDialogBuilder.js |   26 +++
 3 files changed, 26 insertions(+), 4 deletions(-)

New commits:
commit 5b44398bccecfe1865e75c1256aad8012d275dcb
Author: Pedro Pinto Silva 
AuthorDate: Tue Jan 28 15:37:25 2020 +0100
Commit: Pedro Pinto da Silva 
CommitDate: Tue Jan 28 17:47:34 2020 +0100

MobileWizard: Insert: Table:

- Add exeption
- Even if there is no image passed add it manually and adjust HTML 
sctructure so to be consistent with other menu-entry-with-icon elements
- Add inserttable monochrome icon
- pass optional argument data.id

Change-Id: I34536272d3ef5742895c4db5a52058fe6558f837
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87633
Reviewed-by: Pedro Pinto da Silva 
Tested-by: Pedro Pinto da Silva 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index aaae8b01c..d5d67b8e9 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -363,6 +363,9 @@
.ui-header.level-1.mobile-wizard.ui-widget .ui-header-left 
span.menu-entry-with-icon {
vertical-align: middle;
}
+   .flex-fullwidth {
+   flex-grow: 100;
+   }
 
.ui-tabs.mobile-wizard {
text-align: center;
diff --git a/loleaflet/images/lc_inserttable_mono.svg 
b/loleaflet/images/lc_inserttable_mono.svg
new file mode 100644
index 0..13c8fca45
--- /dev/null
+++ b/loleaflet/images/lc_inserttable_mono.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 
24">
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index a3dcdb844..027934cb5 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -343,12 +343,30 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
},
 
-   _explorableMenu: function(parentContainer, title, children, builder, 
customContent) {
+   _explorableMenu: function(parentContainer, title, children, builder, 
customContent, dataid) {
+   dataid = dataid || 0;
+   var icon = null;
var sectionTitle = L.DomUtil.create('div', 'ui-header level-' + 
builder._currentDepth + ' mobile-wizard ui-widget', parentContainer);
$(sectionTitle).css('justify-content', 'space-between');
 
-   var titleSpan = L.DomUtil.create('span', 'sub-menu-title', 
sectionTitle);
-   titleSpan.innerHTML = title;
+
+   if (dataid === 'inserttable') {
+   var iconSpan = L.DomUtil.create('span', 
'menu-entry-icon inserttable', sectionTitle);
+   var iconPath = 'images/lc_inserttable_mono.svg';
+   icon = L.DomUtil.create('img', '', iconSpan);
+   icon.src = iconPath;
+   icon.alt = '';
+   icon.addEventListener('error', function() {
+   icon.style.display = 'none';
+   });
+
+   var titleSpan2 = L.DomUtil.create('span', 
'menu-entry-with-icon flex-fullwidth', sectionTitle);
+   titleSpan2.innerHTML = title;
+   }
+   else {
+   var titleSpan = L.DomUtil.create('span', 
'sub-menu-title', sectionTitle);
+   titleSpan.innerHTML = title;
+   }
var arrowSpan = L.DomUtil.create('span', 'sub-menu-arrow', 
sectionTitle);
arrowSpan.innerHTML = '>';
 
@@ -1509,7 +1527,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
builder.map.fire('closemobilewizard');
});
 
-   builder._explorableMenu(parentContainer, title, data.children, 
builder, content);
+   builder._explorableMenu(parentContainer, title, data.children, 
builder, content, data.id);
},
 
build: function(parent, data) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

2020-01-28 Thread rizmut (via logerrit)

 dev/null  |binary
 icon-themes/elementary_svg/cmd/lc_interactivetransparence.svg |  314 +-
 icon-themes/elementary_svg/cmd/sc_selectcolumn.svg|1 
 icon-themes/elementary_svg/cmd/sc_selectrow.svg   |1 
 4 files changed, 313 insertions(+), 3 deletions(-)

New commits:
commit 45dd6e5c23d7f826bd9b9db4bd8b12c864efa9e0
Author: rizmut 
AuthorDate: Tue Jan 28 20:03:22 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Jan 28 17:40:48 2020 +0100

elementary: Move wrong placed icons, delete unnessary icons

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

diff --git a/icon-themes/elementary/cmd/sc_selectcolumn.png 
b/icon-themes/elementary/cmd/sc_selectcolumn.png
deleted file mode 100644
index 433c680d6ff5..
Binary files a/icon-themes/elementary/cmd/sc_selectcolumn.png and /dev/null 
differ
diff --git a/icon-themes/elementary/cmd/sc_selectrow.png 
b/icon-themes/elementary/cmd/sc_selectrow.png
deleted file mode 100644
index 04ec514b0de6..
Binary files a/icon-themes/elementary/cmd/sc_selectrow.png and /dev/null differ
diff --git a/icon-themes/elementary/svx/res/last_custom_common.png 
b/icon-themes/elementary/svx/res/symphony/last_custom_common.png
similarity index 100%
rename from icon-themes/elementary/svx/res/last_custom_common.png
rename to icon-themes/elementary/svx/res/symphony/last_custom_common.png
diff --git a/icon-themes/elementary/svx/res/last_custom_common_grey.png 
b/icon-themes/elementary/svx/res/symphony/last_custom_common_grey.png
similarity index 100%
rename from icon-themes/elementary/svx/res/last_custom_common_grey.png
rename to icon-themes/elementary/svx/res/symphony/last_custom_common_grey.png
diff --git a/icon-themes/elementary_svg/cmd/lc_interactivetransparence.svg 
b/icon-themes/elementary_svg/cmd/lc_interactivetransparence.svg
index adad289726da..55e01dc09f6f 100644
--- a/icon-themes/elementary_svg/cmd/lc_interactivetransparence.svg
+++ b/icon-themes/elementary_svg/cmd/lc_interactivetransparence.svg
@@ -1 +1,313 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg88"
+   sodipodi:docname="lc_interactivetransparence.svg"
+   inkscape:version="0.92.4 (unknown)">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+  
+
+  
+  
+  
+  
+
+
+
+
+  
+  
+  
+  
+
+
+  
+  
+  
+
+
+
+  
+  
+
+
+  
+  
+  
+
+
+
+
+  
+  
+
+
+  
+  
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+
+
+  
+
diff --git a/icon-themes/elementary_svg/cmd/sc_selectcolumn.svg 
b/icon-themes/elementary_svg/cmd/sc_selectcolumn.svg
deleted file mode 100644
index 7f7d7fde6a1f..
--- a/icon-themes/elementary_svg/cmd/sc_selectcolumn.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_selectrow.svg 
b/icon-themes/elementary_svg/cmd/sc_selectrow.svg
deleted file mode 100644
index bb8737272e50..
--- a/icon-themes/elementary_svg/cmd/sc_selectrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/svx/res/last_custom_common.svg 
b/icon-themes/elementary_svg/svx/res/symphony/last_custom_common.svg
similarity index 100%
rename from icon-themes/elementary_svg/svx/res/last_custom_common.svg
rename to icon-themes/elementary_svg/svx/res/symphony/last_custom_common.svg
diff --git a/icon-themes/elementary_svg/svx/res/last_custom_common_grey.svg 
b/icon-themes/elementary_svg/svx/res/symphony/last_custom_common_grey.svg
similarity index 100%
rename from icon-themes/elementary_svg/svx/res/last_custom_common_grey.svg
rename to 
icon-themes/elementary_svg/svx/res/symphony/last_custom_common_grey.svg
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/rtl

2020-01-28 Thread Stephan Bergmann (via logerrit)

 sal/rtl/cipher.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 28f66527c5fc5325582e8b716481584a9f711815
Author: Stephan Bergmann 
AuthorDate: Tue Jan 28 13:53:53 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 17:16:00 2020 +0100

loplugin:unsignedcompare (--enable-cipher-openssl-backend)

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

diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx
index 9bc438114651..be69d045a0ec 100644
--- a/sal/rtl/cipher.cxx
+++ b/sal/rtl/cipher.cxx
@@ -19,6 +19,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -725,7 +726,7 @@ static rtlCipherError BF_update(
 assert(eMode == rtl_Cipher_ModeStream);
 (void) eMode;
 (void) eDirection;
-while (nDatLen > static_cast(std::numeric_limits::max())) {
+while (nDatLen > o3tl::make_unsigned(std::numeric_limits::max())) {
 int outl;
 if (EVP_CipherUpdate(ctx->m_context, pBuffer, &outl, pData, 
std::numeric_limits::max())
 == 0)
@@ -1051,7 +1052,7 @@ rtlCipherError SAL_CALL rtl_cipher_initBF(
 // Cannot easily support DirectionBoth, and it isn't used in the LO 
code at least:
 return rtl_Cipher_E_Direction;
 }
-if (nKeyLen > static_cast(std::numeric_limits::max())) {
+if (nKeyLen > o3tl::make_unsigned(std::numeric_limits::max())) {
 return rtl_Cipher_E_BufferSize;
 }
 if (pImpl->m_context.m_context != nullptr) {
@@ -1188,7 +1189,7 @@ static rtlCipherError rtl_cipherARCFOUR_init_Impl(
 const sal_uInt8 *pKeyData, sal_Size nKeyLen)
 {
 #if defined LIBO_CIPHER_OPENSSL_BACKEND
-if (nKeyLen > static_cast(std::numeric_limits::max())) {
+if (nKeyLen > o3tl::make_unsigned(std::numeric_limits::max())) {
 return rtl_Cipher_E_BufferSize;
 }
 if (ctx->m_context != nullptr) {
@@ -1268,7 +1269,7 @@ static rtlCipherError rtl_cipherARCFOUR_update_Impl(
 return rtl_Cipher_E_BufferSize;
 
 #if defined LIBO_CIPHER_OPENSSL_BACKEND
-while (nDatLen > static_cast(std::numeric_limits::max())) {
+while (nDatLen > o3tl::make_unsigned(std::numeric_limits::max())) {
 int outl;
 if (EVP_CipherUpdate(ctx->m_context, pBuffer, &outl, pData, 
std::numeric_limits::max())
 == 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2020-01-28 Thread Stephan Bergmann (via logerrit)

 configure.ac |   32 +---
 1 file changed, 1 insertion(+), 31 deletions(-)

New commits:
commit c78d699b491a56d838ed1550c72a4f0a9507556e
Author: Stephan Bergmann 
AuthorDate: Tue Jan 28 13:54:54 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 17:01:30 2020 +0100

Remove obsolete Clang <= 3.8 __float128 check

According to README.md, for Linux the baseline is Clang 5.0.2, and for 
macOS and
iOS (should this libstdc++ __float128 stuff be relevant for either of them 
at
all) the baseline is Xcode 9.3 which maps to ca. LLVM 5.0.2 according to
.

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

diff --git a/configure.ac b/configure.ac
index b31adb15b8b5..4b25ed9bf662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6556,36 +6556,6 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 CXXFLAGS="$CXXFLAGS -DSYSTEM_LIBCMIS $LIBCMIS_CFLAGS"
 fi
 AC_LANG_PUSH([C++])
-dnl Clang 3.9 supports __float128 since
-dnl 
 "Enable 
support for
-dnl __float128 in Clang and enable it on pertinent platforms", but 
Clang 3.8 may need a
-dnl hacky workaround to be able to include  (as is done in the 
main check whether
-dnl $flag is supported below, so check this first):
-my_float128hack=
-my_float128hack_impl=-D__float128=void
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include 
-// some Clang fail when compiling against libstdc++ headers with 
-std=gnu++0x
-// (__float128)
-]])
-],,[
-dnl The only reason why libstdc++ headers fail with Clang in C++11 
mode is because they
-dnl use the __float128 type that Clang doesn't know (libstdc++ 
checks whether __float128
-dnl is available during its build, but it's usually built using 
GCC, and so c++config.h
-dnl hardcodes __float128 being supported). At least for some older 
libstdc++, the only
-dnl place where __float128 is used is in a template 
specialization, -D__float128=void
-dnl will avoid the problem there while still causing a problem if 
somebody actually uses
-dnl the type. (But some later libstdc++ are known to use 
__float128 also in algorithm ->
-dnl bits/stl_alog.h -> cstdlib -> bits/std_abs.h, in a way that 
unfortunately cannot be
-dnl "fixed" with this hack):
-CXXFLAGS="$CXXFLAGS $my_float128hack_impl"
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include 
-// some Clang fail when compiling against libstdc++ headers 
with -std=gnu++0x
-// (__float128)
-]])
-],[my_float128hack=$my_float128hack_impl])
-])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include 
 #include 
@@ -6607,7 +6577,7 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 void f(std::vector & v, std::function fn) {
 std::sort(v.begin(), v.end(), fn);
 }
-]])],[CXXFLAGS_CXX11=$flag $my_float128hack])
+]])],[CXXFLAGS_CXX11=$flag])
 AC_LANG_POP([C++])
 CXXFLAGS=$save_CXXFLAGS
 if test -n "$CXXFLAGS_CXX11"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Onur Yilmaz (via logerrit)

 svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx |2 +-
 svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx|4 ++--
 svx/source/stbctrls/pszctrl.cxx  |2 +-
 svx/source/svdraw/svdedtv1.cxx   |2 +-
 svx/source/svdraw/svdedtv2.cxx   |2 +-
 svx/source/svdraw/svdmark.cxx|2 +-
 svx/source/svdraw/svdopath.cxx   |6 +++---
 svx/source/svdraw/svdotextdecomposition.cxx  |8 
 svx/source/svdraw/svdotextpathdecomposition.cxx  |2 +-
 svx/source/svdraw/svdpagv.cxx|2 +-
 svx/source/svdraw/svdxcgv.cxx|2 +-
 svx/source/unodraw/unoshape.cxx  |2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 4a88e0c6e90c1c2cba33b8626564429f54b74c0b
Author: Onur Yilmaz 
AuthorDate: Mon Jan 27 12:20:31 2020 +0300
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 17:00:45 2020 +0100

tdf#96505: Get rid of cargo cult long integer literals

I checked return values.
Long variables didn't affect the calculation.

Change-Id: I0c33c20b872ff6b1dc6c87c4032ccf19705db8e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87503
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx 
b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
index d09c03dff575..76b5aa716330 100644
--- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
@@ -153,7 +153,7 @@ namespace drawinglayer::primitive2d
 {
 // for compatibility, insert the center point at polygon 
start to get the same
 // line stroking pattern as the old painting mechanisms.
-aUnitOutline.insert(0L, basegfx::B2DPoint(0.0, 0.0));
+aUnitOutline.insert(0, basegfx::B2DPoint(0.0, 0.0));
 }
 
 aUnitOutline.setClosed(true);
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx 
b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index 837df2f3bc13..4de23bd5c780 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -51,7 +51,7 @@ namespace drawinglayer::primitive2d
 }
 
 // add graphic content
-if(255L != getGraphicAttr().GetTransparency())
+if(255 != getGraphicAttr().GetTransparency())
 {
 // standard graphic fill
 const Primitive2DReference xGraphicContentPrimitive(
@@ -158,7 +158,7 @@ namespace drawinglayer::primitive2d
 
 bool SdrGrafPrimitive2D::isTransparent() const
 {
-return ((0L != getGraphicAttr().GetTransparency())
+return ((0 != getGraphicAttr().GetTransparency())
 || (getGraphicObject().IsTransparent()));
 }
 
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index d55b895af65c..8d2c4110863d 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -70,7 +70,7 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long 
nVal )
 
 OUString sMetric;
 const sal_Unicode cSep = 
Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep()[0];
-sal_Int64 nConvVal = MetricField::ConvertValue( nVal * 100, 0L, 0, 
FieldUnit::MM_100TH, eOutUnit );
+sal_Int64 nConvVal = MetricField::ConvertValue( nVal * 100, 0, 0, 
FieldUnit::MM_100TH, eOutUnit );
 
 if ( nConvVal < 0 && ( nConvVal / 100 == 0 ) )
 sMetric += "-";
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index cf29f4a268df..35676d9faaf2 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -522,7 +522,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& 
rRef, const Point& rRa
 bDone = true;
 }
 
-if(!bDone && !pPath && pO->IsPolyObj() && 0L != pO->GetPointCount())
+if(!bDone && !pPath && pO->IsPolyObj() && 0 != pO->GetPointCount())
 {
 // for PolyObj's, but NOT for SdrPathObj's, e.g. the measurement object
 sal_uInt32 nPointCount(pO->GetPointCount());
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 72a743fda6c8..8736da464544 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1351,7 +1351,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
 // involved polygon data to curve segments, even if not necessary.
 // It is better to try to reduce to more simple polygons.
 basegfx::B2DPolyPolygon 
aTmpPoly(basegfx::utils::simplifyCurveSegments(ImpGetPolyPolygon(pObj)));
-aPolyPolygon.insert(0L, aTmpPoly);
+aPolyPolygon.insert(

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

2020-01-28 Thread Onur Yilmaz (via logerrit)

 starmath/source/node.cxx |   60 +++
 1 file changed, 30 insertions(+), 30 deletions(-)

New commits:
commit ece847579e606efc0398c01b5a9110623935
Author: Onur Yilmaz 
AuthorDate: Mon Jan 27 11:32:59 2020 +0300
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 16:56:34 2020 +0100

tdf#96505: Get rid of cargo cult long integer literals

I checked return values.
Long variables didn't affect the calculation.

Change-Id: I05fe807e34beb962e3867a708939e557d56e5549
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87491
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index f8f00cd8a949..b70bdfef08a9 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -490,7 +490,7 @@ void SmTableNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 
 // make distance depend on font size
 long  nDist = +(rFormat.GetDistance(DIS_VERTICAL)
-* GetFont().GetFontSize().Height()) / 100L;
+* GetFont().GetFontSize().Height()) / 100;
 
 if (nSize < 1)
 return;
@@ -600,7 +600,7 @@ void SmLineNode::Arrange(OutputDevice &rDev, const SmFormat 
&rFormat)
 }
 
 // make distance depend on font size
-long nDist = (rFormat.GetDistance(DIS_HORIZONTAL) * 
GetFont().GetFontSize().Height()) / 100L;
+long nDist = (rFormat.GetDistance(DIS_HORIZONTAL) * 
GetFont().GetFontSize().Height()) / 100;
 if (!IsUseExtraSpaces())
 nDist = 0;
 
@@ -658,7 +658,7 @@ void SmUnHorNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 pOper->Arrange(rDev, rFormat);
 pBody->Arrange(rDev, rFormat);
 
-long nDist = (pOper->GetRect().GetWidth() * 
rFormat.GetDistance(DIS_HORIZONTAL)) / 100L;
+long nDist = (pOper->GetRect().GetWidth() * 
rFormat.GetDistance(DIS_HORIZONTAL)) / 100;
 
 SmRect::operator = (*pNode0);
 
@@ -727,7 +727,7 @@ void SmRootNode::Arrange(OutputDevice &rDev, const SmFormat 
&rFormat)
   nVerOffset;
 lcl_GetHeightVerOffset(*pBody, nHeight, nVerOffset);
 nHeight += rFormat.GetDistance(DIS_ROOT)
-   * GetFont().GetFontSize().Height() / 100L;
+   * GetFont().GetFontSize().Height() / 100;
 
 // font specialist advised to change the width first
 pRootSym->AdaptToY(rDev, nHeight);
@@ -797,7 +797,7 @@ void SmBinHorNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 const SmRect &rOpRect = pOper->GetRect();
 
 long nDist = (rOpRect.GetWidth() *
- rFormat.GetDistance(DIS_HORIZONTAL)) / 100L;
+ rFormat.GetDistance(DIS_HORIZONTAL)) / 100;
 
 SmRect::operator = (*pLeft);
 
@@ -840,13 +840,13 @@ void SmBinVerNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 pDenom->Arrange(rDev, rFormat);
 
 long  nFontHeight = GetFont().GetFontSize().Height(),
-  nExtLen = nFontHeight * rFormat.GetDistance(DIS_FRACTION) / 100L,
-  nThick  = nFontHeight * rFormat.GetDistance(DIS_STROKEWIDTH) / 
100L,
+  nExtLen = nFontHeight * rFormat.GetDistance(DIS_FRACTION) / 100,
+  nThick  = nFontHeight * rFormat.GetDistance(DIS_STROKEWIDTH) / 
100,
   nWidth  = std::max(pNum->GetItalicWidth(), 
pDenom->GetItalicWidth()),
   nNumDist= bIsTextmode ? 0 :
-nFontHeight * rFormat.GetDistance(DIS_NUMERATOR)   
/ 100L,
+nFontHeight * rFormat.GetDistance(DIS_NUMERATOR)   
/ 100,
   nDenomDist  = bIsTextmode ? 0 :
-nFontHeight * rFormat.GetDistance(DIS_DENOMINATOR) 
/ 100L;
+nFontHeight * rFormat.GetDistance(DIS_DENOMINATOR) 
/ 100;
 
 // font specialist advised to change the width first
 pLine->AdaptToY(rDev, nThick);
@@ -1201,7 +1201,7 @@ void SmSubSupNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 case LSUB :
 if (!bIsTextmode)
 nDist = nOrigHeight
-* rFormat.GetDistance(DIS_SUBSCRIPT) / 100L;
+* rFormat.GetDistance(DIS_SUBSCRIPT) / 100;
 aPos  = pSubSup->GetRect().AlignTo(aTmpRect,
 eSubSup == LSUB ? RectPos::Left : 
RectPos::Right,
 RectHorAlign::Center, RectVerAlign::Bottom);
@@ -1214,7 +1214,7 @@ void SmSubSupNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 case LSUP :
 if (!bIsTextmode)
 nDist = nOrigHeight
-* rFormat.GetDistance(DIS_SUPERSCRIPT) / 100L;
+* rFormat.GetDistance(DIS_SUPERSCRIPT) / 100;
 aPos  = pSubSup->GetRect().AlignTo(aTmpRect,
 eSubSup == LSUP ? RectPos::Left : 
RectPos::Right,

[Libreoffice-commits] core.git: filter/source reportdesign/source sal/osl

2020-01-28 Thread Onur Yilmaz (via logerrit)

 filter/source/svg/svgexport.cxx|4 ++--
 filter/source/svg/svgwriter.cxx|6 +++---
 reportdesign/source/ui/inspection/metadata.cxx |2 +-
 sal/osl/unx/profile.cxx|4 ++--
 sal/osl/unx/socket.cxx |4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b44ad15cd78892f2f1d7fe83ccda9fc41dc9c9a5
Author: Onur Yilmaz 
AuthorDate: Mon Jan 27 11:46:12 2020 +0300
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 16:53:27 2020 +0100

tdf#96505: Get rid of cargo cult long integer literals

I checked return values.
Long variables didn't affect the calculation.

Change-Id: Ia3713eedf275de71b1096d1fe7e22da012a7f94e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87493
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 731cb6d4561e..c717d00596ef 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2493,8 +2493,8 @@ void SVGExport::writeMtf( const GDIMetaFile& rMtf )
 aAttr = OUString::number( aSize.Height() ) + "mm";
 AddAttribute( XML_NAMESPACE_NONE, "height", aAttr );
 
-aAttr = "0 0 " + OUString::number( aSize.Width() * 100L ) + " " +
-OUString::number( aSize.Height() * 100L );
+aAttr = "0 0 " + OUString::number( aSize.Width() * 100 ) + " " +
+OUString::number( aSize.Height() * 100 );
 AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
 
 AddAttribute( XML_NAMESPACE_NONE, "version", "1.1" );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 205bfabc6d4a..f70d11200be7 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2328,9 +2328,9 @@ void SVGActionWriter::ImplWriteGradientStop( const Color& 
rColor, double fOffset
 Color SVGActionWriter::ImplGetColorWithIntensity( const Color& rColor,
   sal_uInt16 nIntensity )
 {
- sal_uInt8 nNewRed = static_cast( 
static_cast(rColor.GetRed()) * nIntensity / 100L );
- sal_uInt8 nNewGreen = static_cast( 
static_cast(rColor.GetGreen()) * nIntensity / 100L );
- sal_uInt8 nNewBlue = static_cast( 
static_cast(rColor.GetBlue()) * nIntensity / 100L );
+ sal_uInt8 nNewRed = static_cast( 
static_cast(rColor.GetRed()) * nIntensity / 100 );
+ sal_uInt8 nNewGreen = static_cast( 
static_cast(rColor.GetGreen()) * nIntensity / 100 );
+ sal_uInt8 nNewBlue = static_cast( 
static_cast(rColor.GetBlue()) * nIntensity / 100 );
  return Color( nNewRed, nNewGreen, nNewBlue);
 }
 
diff --git a/reportdesign/source/ui/inspection/metadata.cxx 
b/reportdesign/source/ui/inspection/metadata.cxx
index fe968c7fddd6..f652fa4a4723 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -187,7 +187,7 @@ namespace rptui
 // initialization
 if(!s_pPropertyInfos)
 getPropertyInfo();
-OPropertyInfoImpl  aSearch(_rName, 0L, OUString(), "", 
PropUIFlags::NONE);
+OPropertyInfoImpl  aSearch(_rName, 0, OUString(), "", 
PropUIFlags::NONE);
 
 const OPropertyInfoImpl* pPropInfo = ::std::lower_bound(
 s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, 
PropertyInfoLessByName() );
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index b7bc5771fd64..e2cca48ab8c6 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -1029,11 +1029,11 @@ static bool OslProfile_rewindFile(osl_TFile* pFile, 
bool bTruncate)
 {
 pFile->m_pReadPtr  = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);
 
-bRet = (lseek(pFile->m_Handle, SEEK_SET, 0L) == 0);
+bRet = (lseek(pFile->m_Handle, SEEK_SET, 0) == 0);
 
 if (bTruncate)
 {
-bRet &= (ftruncate(pFile->m_Handle, 0L) == 0);
+bRet &= (ftruncate(pFile->m_Handle, 0) == 0);
 }
 
 }
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index 5db922e7674d..d3b192f4e1f1 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -1404,7 +1404,7 @@ oslSocketResult SAL_CALL osl_connectSocketTo(oslSocket 
pSocket,
 {
 /* divide milliseconds into seconds and microseconds */
 tv.tv_sec=  pTimeout->Seconds;
-tv.tv_usec= pTimeout->Nanosec / 1000L;
+tv.tv_usec= pTimeout->Nanosec / 1000;
 }
 
 /* select */
@@ -2217,7 +2217,7 @@ sal_Int32 SAL_CALL 
osl_demultiplexSocketEvents(oslSocketSet IncomingSet,
 {
 /* non-blocking call */
 tv.tv_sec  = pTimeout->Seconds;
-tv.tv_usec = pTimeout->Nanosec / 1000L;
+tv.tv_usec = pTimeout->Nanosec / 1000;
 }
 
 /* get max handle from all sets */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lis

[Libreoffice-commits] core.git: icon-themes/breeze_dark icon-themes/breeze_dark_svg

2020-01-28 Thread rizmut (via logerrit)

 icon-themes/breeze_dark/cmd/32/safemode.png
|binary
 icon-themes/breeze_dark/cmd/32/sourcecharstyle.png 
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_All_18x18.png
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Bottom_18x18.png 
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png  
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png   
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Empty_18x18.png  
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_FourBorders_18x18.png
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png  
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png   
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png   
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Left_18x18.png   
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png  
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Right_18x18.png  
|binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png   
|binary
 
icon-themes/breeze_dark/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png
 |binary
 
icon-themes/breeze_dark/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png 
   |binary
 icon-themes/breeze_dark/sc/res/sidebar/CellBorder_Top_18x18.png
|binary
 icon-themes/breeze_dark/svx/res/fr01.png   
|binary
 icon-themes/breeze_dark/svx/res/fr010.png  
|binary
 icon-themes/breeze_dark/svx/res/fr011.png  
|binary
 icon-themes/breeze_dark/svx/res/fr02.png   
|binary
 icon-themes/breeze_dark/svx/res/fr03.png   
|binary
 icon-themes/breeze_dark/svx/res/fr04.png   
|binary
 icon-themes/breeze_dark/svx/res/fr05.png   
|binary
 icon-themes/breeze_dark/svx/res/fr06.png   
|binary
 icon-themes/breeze_dark/svx/res/fr07.png   
|binary
 icon-themes/breeze_dark/svx/res/fr08.png   
|binary
 icon-themes/breeze_dark/svx/res/fr09.png   
|binary
 icon-themes/breeze_dark/svx/res/marker-anchor-pressed.png  
|binary
 icon-themes/breeze_dark/svx/res/marker-anchor.png  
|binary
 icon-themes/breeze_dark/svx/res/markers.png
|binary
 icon-themes/breeze_dark/svx/res/pr01.png   
|binary
 icon-themes/breeze_dark/svx/res/pr010.png  
|binary
 icon-themes/breeze_dark/svx/res/pr011.png  
|binary
 icon-themes/breeze_dark/svx/res/pr012.png  
|binary
 icon-themes/breeze_dark/svx/res/pr014.png  
|binary
 icon-themes/breeze_dark/svx/res/pr015.png  
|binary
 icon-themes/breeze_dark/svx/res/pr016.png  
|binary
 icon-themes/breeze_dark/svx/res/pr017.png  
|binary
 icon-themes/breeze_dark/svx/res/pr018.png  
|binary
 icon-themes/breeze_dark/svx/res/pr019.png  
|binary
 icon-themes/breeze_dark/svx/res/pr02.png   
|binary
 icon-themes/breeze_dark/svx/res/pr020.png  
|binary
 icon-themes/breeze_dark/svx/res/pr021.png  
|binary
 icon-themes/breeze_dark/svx/res/pr03.png   
|binary
 icon-themes/breeze_dark/svx/res/pr04.png   
|binary
 icon-themes/breeze_dark/svx/res/pr05.png   
|binary
 icon-themes/breeze_dark/svx/res/pr06.png   
|binary
 icon-themes/breeze_dark/svx/res/pr09.png   
|binary
 icon-themes/breeze_dark_svg/cmd/32/insertexternaldatasource.svg
|   58 ---
 icon-themes/breeze_dark_svg/cmd/32/safemod

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

2020-01-28 Thread Pranam Lashkari (via logerrit)

 loleaflet/src/control/Control.ColumnHeader.js |  129 +++---
 1 file changed, 75 insertions(+), 54 deletions(-)

New commits:
commit 6ed054ca6a975e38d98ca65b956c887dc88d9bc8
Author: Pranam Lashkari 
AuthorDate: Thu Jan 23 01:41:35 2020 +0530
Commit: Jan Holesovsky 
CommitDate: Tue Jan 28 16:08:54 2020 +0100

Mobile wizard: added for Column header

In mobile view context menu replaced with wizard for calc column header

Change-Id: I3ea1dfc79815d9fde61d5d22e7a8b09a98a8bc63
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87287
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index d0d7290b7..de58741fb 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -3,7 +3,7 @@
 * Control.ColumnHeader
 */
 
-/* global $ _UNO */
+/* global $ _UNO Hammer */
 L.Control.ColumnHeader = L.Control.Header.extend({
options: {
cursor: 'col-resize'
@@ -63,59 +63,46 @@ L.Control.ColumnHeader = L.Control.Header.extend({
L.DomEvent.on(this._cornerCanvas, 'contextmenu', 
L.DomEvent.preventDefault);
L.DomEvent.addListener(this._cornerCanvas, 'click', 
this._onCornerHeaderClick, this);
 
-   var colHeaderObj = this;
-   L.installContextMenu({
-   selector: '.spreadsheet-header-columns',
-   className: 'loleaflet-font',
-   items: {
-   'insertcolbefore': {
-   name: _UNO('.uno:InsertColumnsBefore', 
'spreadsheet', true),
-   callback: function() {
-   var index = 
colHeaderObj._lastMouseOverIndex;
-   if (index) {
-   
colHeaderObj.insertColumn.call(colHeaderObj, index);
-   }
-   }
-   },
-   'deleteselectedcol': {
-   name: _UNO('.uno:DeleteColumns', 
'spreadsheet', true),
-   callback: function() {
-   var index = 
colHeaderObj._lastMouseOverIndex;
-   if (index) {
-   
colHeaderObj.deleteColumn.call(colHeaderObj, index);
-   }
-   }
-   },
-   'optimalwidth': {
-   name: 
_UNO('.uno:SetOptimalColumnWidth', 'spreadsheet', true),
-   callback: function() {
-   var index = 
colHeaderObj._lastMouseOverIndex;
-   if (index) {
-   
colHeaderObj.optimalWidth.call(colHeaderObj, index);
-   }
-   }
-   },
-   'hideColumn': {
-   name: _UNO('.uno:HideColumn', 
'spreadsheet', true),
-   callback: function() {
-   var index = 
colHeaderObj._lastMouseOverIndex;
-   if (index) {
-   
colHeaderObj.hideColumn.call(colHeaderObj, index);
-   }
-   }
-   },
-   'showColumn': {
-   name: _UNO('.uno:ShowColumn', 
'spreadsheet', true),
-   callback: function() {
-   var index = 
colHeaderObj._lastMouseOverIndex;
-   if (index) {
-   
colHeaderObj.showColumn.call(colHeaderObj, index);
-   }
-   }
-   }
+   this._menuItem = {
+   'insertcolbefore': {
+   name: _UNO('.uno:InsertColumnsBefore', 
'spreadsheet', true),
+   callback: (this._insertColBefore).bind(this)
},
-   zIndex: 10
-   });
+   'deleteselec

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

2020-01-28 Thread Pranam Lashkari (via logerrit)

 loleaflet/src/control/Control.RowHeader.js |  129 +
 1 file changed, 76 insertions(+), 53 deletions(-)

New commits:
commit e971435be92351cfb5e123971a0e11e8aa02ab58
Author: Pranam Lashkari 
AuthorDate: Thu Jan 23 22:07:31 2020 +0530
Commit: Jan Holesovsky 
CommitDate: Tue Jan 28 16:08:08 2020 +0100

Mobile wizard: added for row header

In mobile view context menu replaced with wizard for calc row header

Change-Id: Id85eefacbe598a3a041dd92dbe6b3c85e8997b4a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87286
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.RowHeader.js 
b/loleaflet/src/control/Control.RowHeader.js
index 15c783220..f4330e59a 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -3,7 +3,7 @@
  * L.Control.RowHeader
 */
 
-/* global $ _UNO */
+/* global $ _UNO Hammer */
 L.Control.RowHeader = L.Control.Header.extend({
options: {
cursor: 'row-resize'
@@ -60,59 +60,47 @@ L.Control.RowHeader = L.Control.Header.extend({
this._startOffset = 0;
this._position = 0;
 
-   var rowHeaderObj = this;
-   L.installContextMenu({
-   selector: '.spreadsheet-header-rows',
-   className: 'loleaflet-font',
-   items: {
-   'insertrowabove': {
-   name: _UNO('.uno:InsertRowsBefore', 
'spreadsheet', true),
-   callback: function() {
-   var index = 
rowHeaderObj._lastMouseOverIndex;
-   if (index) {
-   
rowHeaderObj.insertRow.call(rowHeaderObj, index);
-   }
-   }
-   },
-   'deleteselectedrow': {
-   name: _UNO('.uno:DeleteRows', 
'spreadsheet', true),
-   callback: function() {
-   var index = 
rowHeaderObj._lastMouseOverIndex;
-   if (index) {
-   
rowHeaderObj.deleteRow.call(rowHeaderObj, index);
-   }
-   }
-   },
-   'optimalheight': {
-   name: _UNO('.uno:SetOptimalRowHeight', 
'spreadsheet', true),
-   callback: function() {
-   var index = 
rowHeaderObj._lastMouseOverIndex;
-   if (index) {
-   
rowHeaderObj.optimalHeight.call(rowHeaderObj, index);
-   }
-   }
-   },
-   'hideRow': {
-   name: _UNO('.uno:HideRow', 
'spreadsheet', true),
-   callback: function() {
-   var index = 
rowHeaderObj._lastMouseOverIndex;
-   if (index) {
-   
rowHeaderObj.hideRow.call(rowHeaderObj, index);
-   }
-   }
-   },
-   'showRow': {
-   name: _UNO('.uno:ShowRow', 
'spreadsheet', true),
-   callback: function() {
-   var index = 
rowHeaderObj._lastMouseOverIndex;
-   if (index) {
-   
rowHeaderObj.showRow.call(rowHeaderObj, index);
-   }
-   }
-   }
+   this._menuItem = {
+   'insertrowabove': {
+   name: _UNO('.uno:InsertRowsBefore', 
'spreadsheet', true),
+   callback: (this._insertRowAbove).bind(this)
+   },
+   'deleteselectedrow': {
+   name: _UNO('.uno:DeleteRows', 'spreadsheet', 
true),
+   callback: (this._deleteSelectedRow).bind(this)
+   },
+   'optimalheight

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 sc/source/core/data/dpobject.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4c741189265847916b9f9a65dc9f119d16e2c4c5
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 12:24:51 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 15:42:11 2020 +0100

Resolves: tdf#130239 set an explicit parent for the message dialog

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

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 45736b4d4db0..2cd0e6f0ef56 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -3259,7 +3260,7 @@ uno::Reference 
ScDPCollection::DBCaches::createRowSet(
 catch ( const sdbc::SQLException& rError )
 {
 //! store error message
-std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(nullptr,
+std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(ScDocShell::GetActiveDialogParent(),
   VclMessageType::Info, 
VclButtonsType::Ok,
   rError.Message));
 xInfoBox->run();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Missing _sysconfigdata_m_linux_i686-linux-gnu.py

2020-01-28 Thread slacka

Does the master branch build under the same configuration? I do not see this
or any issue building i686 master under Arch Linux 32 or Cent OS 7.  



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-01-28 Thread mert (via logerrit)

 loleaflet/src/control/Control.JSDialogBuilder.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit abac1fa536a0bd052a071f8f699c2867f83cb07d
Author: mert 
AuthorDate: Tue Jan 28 12:58:38 2020 +0300
Commit: Michael Meeks 
CommitDate: Tue Jan 28 15:21:05 2020 +0100

mobilewizard: Changed hit area for unoToolButton

only the image button was clickable which was
confusing where to tap on mobile. This patch
changes the hit area to surrounding div instead

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

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 71c074103..a3dcdb844 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1201,7 +1201,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
button.innerHTML = builder._cleanText(data.text);
}
 
-   $(button).click(function () {
+   $(div).click(function () {
builder.callback('toolbutton', 'click', button, 
data.command, builder);
});
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Onur Yılmaz license statement

2020-01-28 Thread Stephan Bergmann


On 18/12/2019 20:20, Onur Yılmaz wrote:
All of my past & future contributions to LibreOffice may be licensed 
under the MPLv2/LGPLv3+ dual license.


put on file at 
 
"added Onur Yılmaz"


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

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

2020-01-28 Thread Stephan Bergmann (via logerrit)

 vcl/osx/DropTarget.cxx |2 +-
 vcl/osx/clipboard.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 72855b51e0c241b5a514858afcbb9c4df7c03188
Author: Stephan Bergmann 
AuthorDate: Tue Jan 28 13:09:34 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 15:09:17 2020 +0100

loplugin:makeshared (macOS)

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

diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index ebaa0a97fb40..26398cb903a3 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -124,7 +124,7 @@ DropTarget::DropTarget() :
 mSelectedDropAction(DNDConstants::ACTION_NONE),
 mDefaultActions(DNDConstants::ACTION_COPY_OR_MOVE | 
DNDConstants::ACTION_LINK | DNDConstants::ACTION_DEFAULT)
 {
-mDataFlavorMapper = DataFlavorMapperPtr_t(new DataFlavorMapper());
+mDataFlavorMapper = std::make_shared();
 }
 
 DropTarget::~DropTarget()
diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx
index 58559e174272..c2adb5bfcd3c 100644
--- a/vcl/osx/clipboard.cxx
+++ b/vcl/osx/clipboard.cxx
@@ -77,7 +77,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool 
bUseSystemPasteboard
 
 mrXMimeCntFactory = datatransfer::MimeContentTypeFactory::create(xContext);
 
-mpDataFlavorMapper = DataFlavorMapperPtr_t(new DataFlavorMapper());
+mpDataFlavorMapper = std::make_shared();
 
 if (pasteboard != nullptr)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Stephan Bergmann (via logerrit)

 vcl/osx/salframe.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit c43d6d6a3ac1a8a93b3e2ba2f549a7135848487f
Author: Stephan Bergmann 
AuthorDate: Tue Jan 28 13:10:14 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 15:07:52 2020 +0100

loplugin:unsignedcompare (macOS)

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

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index ce5ada142911..dc012aa1d07b 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -576,17 +577,17 @@ SalEvent AquaSalFrame::PreparePosSize(long nX, long nY, 
long nWidth, long nHeigh
 if (nFlags & SAL_FRAME_POSSIZE_WIDTH)
 {
 maGeometry.nWidth = nWidth;
-if (mnMaxWidth > 0 && maGeometry.nWidth > static_cast(mnMaxWidth))
+if (mnMaxWidth > 0 && maGeometry.nWidth > 
o3tl::make_unsigned(mnMaxWidth))
 maGeometry.nWidth = mnMaxWidth;
-if (mnMinWidth > 0 && maGeometry.nWidth < static_cast(mnMinWidth))
+if (mnMinWidth > 0 && maGeometry.nWidth < 
o3tl::make_unsigned(mnMinWidth))
 maGeometry.nWidth = mnMinWidth;
 }
 if (nFlags & SAL_FRAME_POSSIZE_HEIGHT)
 {
 maGeometry.nHeight = nHeight;
-if (mnMaxHeight > 0 && maGeometry.nHeight > static_cast(mnMaxHeight))
+if (mnMaxHeight > 0 && maGeometry.nHeight > 
o3tl::make_unsigned(mnMaxHeight))
 maGeometry.nHeight = mnMaxHeight;
-if (mnMinHeight > 0 && maGeometry.nHeight < static_cast(mnMinHeight))
+if (mnMinHeight > 0 && maGeometry.nHeight < 
o3tl::make_unsigned(mnMinHeight))
 maGeometry.nHeight = mnMinHeight;
 }
 if (nEvent != SalEvent::NONE)
@@ -783,7 +784,7 @@ void AquaSalFrame::doShowFullScreen( bool bFullScreen, 
sal_Int32 nDisplay )
 NSArray* pScreens = [NSScreen screens];
 if( pScreens )
 {
-if( nDisplay >= 0 && static_cast(nDisplay) < 
[pScreens count] )
+if( nDisplay >= 0 && o3tl::make_unsigned(nDisplay) < [pScreens 
count] )
 pScreen = [pScreens objectAtIndex: nDisplay];
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 lotuswordpro/source/filter/lwplayout.cxx |   21 +++--
 lotuswordpro/source/filter/lwplayout.hxx |1 +
 2 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 018bf569904e77e897b9b76f17a9b539cc415dcc
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 10:46:01 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 14:54:53 2020 +0100

ofz#20361 infinite recursion

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

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index d9b442268b04..9d8b33fa94b5 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -88,6 +88,7 @@ LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader const 
&objHdr, LwpSvStream* p
 , m_bGettingBorderStuff(false)
 , m_bGettingUseWhen(false)
 , m_bGettingStyleLayout(false)
+, m_bGettingAutoGrowUp(false)
 , m_nAttributes(0)
 , m_nAttributes2(0)
 , m_nAttributes3(0)
@@ -1189,19 +1190,27 @@ bool LwpMiddleLayout::IsAutoGrowDown()
 */
 bool LwpMiddleLayout::IsAutoGrowUp()
 {
-if(m_nOverrideFlag & OVER_SIZE)
+if (m_bGettingAutoGrowUp)
+throw std::runtime_error("recursion in layout");
+m_bGettingAutoGrowUp = true;
+
+bool bRet;
+
+if (m_nOverrideFlag & OVER_SIZE)
 {
-return (m_nDirection & (LAY_AUTOGROW << SHIFT_UP)) != 0;
+bRet = (m_nDirection & (LAY_AUTOGROW << SHIFT_UP)) != 0;
 }
 else
 {
 rtl::Reference xBase(GetBasedOnStyle());
 if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
-{
-return pLay->IsAutoGrowUp();
-}
+bRet = pLay->IsAutoGrowUp();
+else
+bRet = LwpVirtualLayout::IsAutoGrowUp();
 }
-return LwpVirtualLayout::IsAutoGrowUp();
+
+m_bGettingAutoGrowUp = false;
+return bRet;
 }
 
 /**
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index c68a82d1edd3..c11f830c83a5 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -240,6 +240,7 @@ protected:
 bool m_bGettingBorderStuff;
 bool m_bGettingUseWhen;
 bool m_bGettingStyleLayout;
+bool m_bGettingAutoGrowUp;
 sal_uInt32 m_nAttributes;
 sal_uInt32 m_nAttributes2;
 sal_uInt32 m_nAttributes3;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Onur Yilmaz (via logerrit)

 starmath/source/view.cxx  |8 
 starmath/source/visitors.cxx  |2 +-
 svx/source/dialog/_bmpmask.cxx|2 +-
 svx/source/dialog/_contdlg.cxx|2 +-
 svx/source/dialog/framelinkarray.cxx  |8 
 svx/source/sdr/animation/scheduler.cxx|2 +-
 svx/source/sdr/contact/viewcontactofsdrobj.cxx|2 +-
 svx/source/sdr/contact/viewobjectcontactofpageobj.cxx |4 ++--
 svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx |4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 2065cbf576e7d3257e7da2151419404928326df3
Author: Onur Yilmaz 
AuthorDate: Mon Jan 27 12:04:16 2020 +0300
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 14:54:10 2020 +0100

tdf#96505: Get rid of cargo cult long integer literals

I checked return values.
Long variables didn't affect the calculation.

Change-Id: I1d5b5cffa291c20f7940dc14efa05cc64f3ff1ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87499
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 54e6122c8873..a76a6e82b83b 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1197,8 +1197,8 @@ void SmViewShell::Impl_Print(OutputDevice &rOutDev, const 
SmPrintUIOptions &rPri
 Size OutputSize 
(rOutDev.LogicToPixel(Size(aOutRect.GetWidth(),
 
aOutRect.GetHeight()), MapMode(MapUnit::Map100thMM)));
 Size GraphicSize (rOutDev.LogicToPixel(aSize, 
MapMode(MapUnit::Map100thMM)));
-sal_uInt16 nZ = 
sal::static_int_cast(std::min(long(Fraction(OutputSize.Width()  * 
100L, GraphicSize.Width())),
-  
long(Fraction(OutputSize.Height() * 100L, GraphicSize.Height();
+sal_uInt16 nZ = 
sal::static_int_cast(std::min(long(Fraction(OutputSize.Width()  * 
100, GraphicSize.Width())),
+  
long(Fraction(OutputSize.Height() * 100, GraphicSize.Height();
 nZ -= 10;
 Fraction aFraction (std::max(MINZOOM, std::min(MAXZOOM, nZ)), 
100);
 
@@ -2019,8 +2019,8 @@ void SmViewShell::ZoomByItemSet(const SfxItemSet *pSet)
 Size   
OutputSize(pPrinter->LogicToPixel(Size(OutputRect.GetWidth(),
   
OutputRect.GetHeight()), aMap));
 Size   GraphicSize(pPrinter->LogicToPixel(GetDoc()->GetSize(), 
aMap));
-sal_uInt16 nZ = 
sal::static_int_cast(std::min(long(Fraction(OutputSize.Width()  * 
100L, GraphicSize.Width())),
-  
long(Fraction(OutputSize.Height() * 100L, GraphicSize.Height();
+sal_uInt16 nZ = 
sal::static_int_cast(std::min(long(Fraction(OutputSize.Width()  * 
100, GraphicSize.Width())),
+  
long(Fraction(OutputSize.Height() * 100, GraphicSize.Height();
 mpGraphic->SetZoom (nZ);
 break;
 }
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index a950046162bf..dcf36497a4eb 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -406,7 +406,7 @@ void SmDrawingVisitor::Visit( SmRootSymbolNode* pNode )
 // _unscaled_ font height to be used, we use that to calculate the
 // bar height. Thus it is independent of the arguments height.
 // ( see display of sqrt QQQ versus sqrt stack{Q#Q#Q#Q} )
-long nBarHeight = pNode->GetWidth( ) * 7L / 100L;
+long nBarHeight = pNode->GetWidth( ) * 7 / 100;
 long nBarWidth = pNode->GetBodyWidth( ) + pNode->GetBorderWidth( );
 Point aBarOffset( pNode->GetWidth( ), +pNode->GetBorderWidth( ) );
 Point aBarPos( maPosition + aBarOffset );
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 38c931434fd2..27c5d3a4de07 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -676,7 +676,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
 // Prepare Color comparison array
 for( i = 0; i < nCount; i++ )
 {
-long nTol = ( pTols[i] * 255L ) / 100L;
+long nTol = ( pTols[i] * 255 ) / 100;
 
 long nVal = static_cast(pSrcCols[i].GetRed());
 pMinR[i] = std::max( nVal - nTol, 0L );
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 1ca714868c17..fe08cad1fed7 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -631,7 +631,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, 
ContourWindow&,

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

2020-01-28 Thread Mehmet Emin Başoğlu (via logerrit)

 sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx|6 ++
 toolkit/source/controls/grid/defaultgriddatamodel.cxx |3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 6dc77b9f16e0b3fba6f801a3c307786a7c8a8ddd
Author: Mehmet Emin Başoğlu 
AuthorDate: Mon Jan 27 15:51:28 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jan 28 14:49:25 2020 +0100

tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: I13e5c59aa673100655f38328b4b6515a1946fb76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87524
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx 
b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index c9def241673e..854a2c0c6a94 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -84,8 +84,7 @@ public:
 
 virtual uno::Sequence SAL_CALL getSupportedServiceNames() 
override
 {
-uno::Sequence aServices { 
"com.sun.star.frame.ToolbarController" };
-return aServices;
+return { "com.sun.star.frame.ToolbarController" };
 }
 
 // XComponent
@@ -145,8 +144,7 @@ public:
 
 virtual uno::Sequence SAL_CALL getSupportedServiceNames() 
override
 {
-uno::Sequence aServices { 
"com.sun.star.frame.ToolbarController" };
-return aServices;
+return { "com.sun.star.frame.ToolbarController" };
 }
 
 // XComponent
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx 
b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 1945204c559b..c700ad79b344 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -488,8 +488,7 @@ private:
 
 Sequence< OUString > SAL_CALL 
DefaultGridDataModel::getSupportedServiceNames(  )
 {
-Sequence aSeq { "com.sun.star.awt.grid.DefaultGridDataModel" 
};
-return aSeq;
+return { "com.sun.star.awt.grid.DefaultGridDataModel" };
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Burak Bala (via logerrit)

 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx |4 
++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ca76204c89db32839259a67c52a140a5b7f1fceb
Author: Burak Bala 
AuthorDate: Mon Jan 27 00:53:24 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jan 28 14:46:02 2020 +0100

tdf#75280: Convert inappropriate use of sal_uIntPtr to better integer types

Change-Id: I9280d8ec3a789535ff83357e4c311a2f0f8e7fcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87477
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git 
a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx 
b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index b5cb64c7af02..30a6148e675d 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -583,11 +583,11 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl, 
weld::Button&, void)
 if( m_xCB_Reverse->get_active() )
 {
 rReverse.deleteEntries( pE->m_aMapping );
-sal_uIntPtr nPos = rReverse.deleteEntries( aMapping );
+int nPos = rReverse.deleteEntries( aMapping );
 rReverse.addEntry( aMapping, aTerm, nConversionPropertyType, 
nPos );
 }
 
-sal_uIntPtr nPos = rActive.deleteEntries( aTerm );
+int nPos = rActive.deleteEntries( aTerm );
 rActive.addEntry( aTerm, aMapping, nConversionPropertyType, nPos );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread iakarsu (via logerrit)

 shell/source/backends/desktopbe/desktopbackend.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit f29cd4d26921ac22cecdee1d52fce7b3a1672efa
Author: iakarsu 
AuthorDate: Mon Jan 27 14:15:15 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jan 28 14:44:30 2020 +0100

tdf#88205: - Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: If0fe2feb6b6b4aa595f69c1a1448a809438ec077
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87508
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx 
b/shell/source/backends/desktopbe/desktopbackend.cxx
index 03fe834506b9..001adefd2e4d 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -63,9 +63,7 @@ OUString getDefaultImplementationName() {
 }
 
 css::uno::Sequence< OUString > getDefaultSupportedServiceNames() {
-OUString name(
-"com.sun.star.configuration.backend.DesktopBackend");
-return css::uno::Sequence< OUString >(&name, 1);
+return { "com.sun.star.configuration.backend.DesktopBackend" };
 }
 
 class Default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format

2020-01-28 Thread Batuhan Taskaya (via logerrit)

 solenv/clang-format/blacklist |   26 --
 1 file changed, 26 deletions(-)

New commits:
commit 958c35bf761cfc05dfd9a2557ed30d5b1457c3ba
Author: Batuhan Taskaya 
AuthorDate: Tue Jan 28 10:19:24 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jan 28 14:37:21 2020 +0100

tdf#123936: remove non-existent files from blacklist

Change-Id: If2f6971dd49440a050bfbb42ba7eace75c780218
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87572
Reviewed-by: Muhammet Kara 
Tested-by: Muhammet Kara 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 6823ec4187a5..08cbe76219c2 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -44,8 +44,6 @@ accessibility/inc/extended/accessibletabbarpage.hxx
 accessibility/inc/extended/accessibletabbarpagelist.hxx
 accessibility/inc/extended/accessibletablistbox.hxx
 accessibility/inc/extended/accessibletablistboxtable.hxx
-accessibility/inc/extended/listboxaccessible.hxx
-accessibility/inc/extended/textwindowaccessibility.hxx
 accessibility/inc/helper/IComboListBoxHelper.hxx
 accessibility/inc/helper/accresmgr.hxx
 accessibility/inc/helper/characterattributeshelper.hxx
@@ -113,8 +111,6 @@ accessibility/source/extended/accessibletabbarpage.cxx
 accessibility/source/extended/accessibletabbarpagelist.cxx
 accessibility/source/extended/accessibletablistbox.cxx
 accessibility/source/extended/accessibletablistboxtable.cxx
-accessibility/source/extended/listboxaccessible.cxx
-accessibility/source/extended/textwindowaccessibility.cxx
 accessibility/source/helper/IComboListBoxHelper.cxx
 accessibility/source/helper/acc_factory.cxx
 accessibility/source/helper/accresmgr.cxx
@@ -647,13 +643,9 @@ bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
 bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
 bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
 bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
-bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
-bridges/source/cpp_uno/msvc_win32_intel/except.cxx
 bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
 bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
-bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx
-bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
 bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
 bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
 bridges/source/cpp_uno/shared/bridge.cxx
@@ -1602,8 +1594,6 @@ comphelper/source/misc/proxyaggregation.cxx
 comphelper/source/misc/random.cxx
 comphelper/source/misc/sequenceashashmap.cxx
 comphelper/source/misc/servicedecl.cxx
-comphelper/source/misc/serviceinfohelper.cxx
-comphelper/source/misc/sharedmutex.cxx
 comphelper/source/misc/simplefileaccessinteraction.cxx
 comphelper/source/misc/solarmutex.cxx
 comphelper/source/misc/stillreadwriteinteraction.cxx
@@ -1921,8 +1911,6 @@ connectivity/inc/pch/precompiled_firebird_sdbc.cxx
 connectivity/inc/pch/precompiled_firebird_sdbc.hxx
 connectivity/inc/pch/precompiled_flat.cxx
 connectivity/inc/pch/precompiled_flat.hxx
-connectivity/inc/pch/precompiled_mysql.cxx
-connectivity/inc/pch/precompiled_mysql.hxx
 connectivity/inc/pch/precompiled_odbc.cxx
 connectivity/inc/pch/precompiled_odbc.hxx
 connectivity/inc/pch/precompiled_postgresql-sdbc-impl.cxx
@@ -3718,8 +3706,6 @@ desktop/win32/source/applauncher/simpress.cxx
 desktop/win32/source/applauncher/smath.cxx
 desktop/win32/source/applauncher/sweb.cxx
 desktop/win32/source/applauncher/swriter.cxx
-desktop/win32/source/guiloader/genericloader.cxx
-desktop/win32/source/guistdio/unopkgio.cxx
 desktop/win32/source/loader.cxx
 desktop/win32/source/loader.hxx
 desktop/win32/source/unoinfo.cxx
@@ -4997,12 +4983,10 @@ fpicker/source/win32/VistaFilePickerImpl.cxx
 fpicker/source/win32/VistaFilePickerImpl.hxx
 fpicker/source/win32/WinImplHelper.cxx
 fpicker/source/win32/WinImplHelper.hxx
-fpicker/source/win32/afxres.h
 fpicker/source/win32/asyncrequests.cxx
 fpicker/source/win32/asyncrequests.hxx
 fpicker/source/win32/comptr.hxx
 fpicker/source/win32/platform_vista.h
-fpicker/source/win32/resource.h
 fpicker/source/win32/resourceprovider.cxx
 fpicker/source/win32/resourceprovider.hxx
 fpicker/source/win32/shared.hxx
@@ -5082,7 +5066,6 @@ framework/inc/stdtypes.h
 framework/inc/targets.h
 framework/inc/taskcreatordefs.hxx
 framework/inc/threadhelp/gate.hxx
-framework/inc/threadhelp/transactionbase.hxx
 framework/inc/threadhelp/transactionguard.hxx
 framework/inc/threadhelp/transactionmanager.hxx
 framework/inc/uiconfiguration/globalsettings.hxx
@@ -5870,7 +5853,6 @@ include/comphelper/sequence.hxx
 include/comphelper/sequenceashashmap.hxx
 include/comphelper/servicedecl.hxx
 include/comphelper/servicehelper.hxx
-include/comphelper/serviceinfohelper.hxx
 include/comphelper/sharedmutex.hxx
 include/comphelper/simplefileaccessinteraction.hxx
 include/comphelper/solarmutex.hxx
@@ -17549,7 +17531,6 @@ vcl/opengl/win/WinDeviceInfo.cxx

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

2020-01-28 Thread Mike Kaganski (via logerrit)

 sw/qa/extras/ooxmlimport/data/tdf130214.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |5 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
 3 files changed, 11 insertions(+)

New commits:
commit eca00082c78fddf79f247057227404738be8806c
Author: Mike Kaganski 
AuthorDate: Tue Jan 28 13:22:56 2020 +0300
Commit: Mike Kaganski 
CommitDate: Tue Jan 28 14:16:04 2020 +0100

tdf#130214: workaround invalid state resulting from error on import

Obviously the real error is somewhere else, which results in tdf#126435,
and produces unexpected state with missing text append context on stack.
This is just a hack to avoid crash.

Change-Id: I420ac3b74f5efb9688dc764ac2ad0dcc974ba0e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87595
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/sw/qa/extras/ooxmlimport/data/tdf130214.docx 
b/sw/qa/extras/ooxmlimport/data/tdf130214.docx
new file mode 100644
index ..4344e1c6e44e
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf130214.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 2983be1076e1..593947fd77ab 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -531,6 +531,11 @@ DECLARE_OOXMLIMPORT_TEST(testTdf103345, 
"numbering-circle.docx")
 }
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf130214, "tdf130214.docx")
+{
+// Currently this file imports with errors because of tdf#126435; it must 
not segfault on load
+}
+
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in 
ooxmlEXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 24f769338c94..ee9e1fb55d62 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4516,6 +4516,12 @@ void DomainMapper_Impl::handleBibliography
 (const FieldContextPtr& pContext,
 const OUString & sTOCServiceName)
 {
+if (m_aTextAppendStack.empty())
+{
+// tdf#130214: a workaround to avoid crash on import errors
+SAL_WARN("writerfilter.dmapper", "no text append stack");
+return;
+}
 // Create section before setting m_bStartTOC and m_bStartBibliography: 
finishing paragraph
 // inside StartIndexSectionChecked could do the wrong thing otherwise
 const auto xTOC = StartIndexSectionChecked(sTOCServiceName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Henry Castro (via logerrit)

 loleaflet/css/spreadsheet-mobile.css  |2 +-
 loleaflet/src/layer/tile/CalcTileLayer.js |   20 +++-
 2 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 62fe18a04439b12a8ca09e1ae624eb62cfb403e0
Author: Henry Castro 
AuthorDate: Tue Jan 28 08:50:20 2020 -0400
Commit: Henry Castro 
CommitDate: Tue Jan 28 14:09:53 2020 +0100

loleaflet: mobile: restore 'Insert sheet' toolbar item

Change-Id: Ib51341c517954519b0dea2263ac9bf16b052b3f8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87615
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/css/spreadsheet-mobile.css 
b/loleaflet/css/spreadsheet-mobile.css
index 7f026ab3a..37f685d9e 100644
--- a/loleaflet/css/spreadsheet-mobile.css
+++ b/loleaflet/css/spreadsheet-mobile.css
@@ -54,7 +54,7 @@
}
 
.spreadsheet-tabs-container {
-   left: 0px;
+   left: 24px;
overflow-x: scroll;
scrollbar-width: none; /*css draft (firefox only)*/
-ms-scrollbar: none; /*ie*/
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 021a6b2db..288a7322e 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -171,7 +171,25 @@ L.CalcTileLayer = L.TileLayer.extend({
e.isCancelled = true;
});
 
-   L.DomUtil.remove(L.DomUtil.get('spreadsheet-toolbar'));
+   toolbar = $('#spreadsheet-toolbar');
+   toolbar.w2toolbar({
+   name: 'spreadsheet-toolbar',
+   tooltip: 'bottom',
+   hidden: true,
+   items: [{type: 'button',  id: 'insertsheet', img: 
'insertsheet', hint: _('Insert sheet')}],
+   onClick: function (e) {
+   window.onClick(e, e.target);
+   window.hideTooltip(this, e.target);
+   }
+   });
+   toolbar.bind('touchstart', function(e) {
+   w2ui['spreadsheet-toolbar'].touchStarted = true;
+   var touchEvent = e.originalEvent;
+   if (touchEvent && touchEvent.touches.length > 1) {
+   L.DomEvent.preventDefault(e);
+   }
+   });
+   toolbar.show();
 
toolbar = $('#toolbar-down');
toolbar.w2toolbar({
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 sc/source/ui/dbgui/csvcontrol.cxx  |1 +
 sc/source/ui/docshell/arealink.cxx |1 +
 sc/source/ui/inc/csvcontrol.hxx|1 -
 sc/source/ui/inc/scuiasciiopt.hxx  |1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 39e08a2bd1e2f9d451e09d11a33c99ff4c49b077
Author: Caolán McNamara 
AuthorDate: Mon Jan 27 21:25:29 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 14:01:42 2020 +0100

no need to include vcl/ctrl.hxx

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

diff --git a/sc/source/ui/dbgui/csvcontrol.cxx 
b/sc/source/ui/dbgui/csvcontrol.cxx
index b5ec628e170c..6ede105199c5 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 
 ScCsvLayoutData::ScCsvLayoutData() :
diff --git a/sc/source/ui/docshell/arealink.cxx 
b/sc/source/ui/docshell/arealink.cxx
index 0863c75f4be5..a14b9070a041 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index a7d7a9765c9d..4c95c7a77286 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_CSVCONTROL_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_CSVCONTROL_HXX
 
-#include 
 #include 
 #include 
 #include "csvsplits.hxx"
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx 
b/sc/source/ui/inc/scuiasciiopt.hxx
index 1b263931bc6f..052f85a4bef5 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_SCUIASCIIOPT_HXX
 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Burak Bala license statement

2020-01-28 Thread Burak Bala

All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - include/svtools include/vcl solenv/clang-format svtools/source toolkit/source vcl/source

2020-01-28 Thread Caolán McNamara (via logerrit)

 include/svtools/toolbarmenu.hxx|3 
 include/vcl/field.hxx  |  105 ---
 include/vcl/toolkit/field.hxx  |  125 +
 solenv/clang-format/blacklist  |1 
 svtools/source/control/toolbarmenu.cxx |7 -
 toolkit/source/awt/vclxtoolkit.cxx |2 
 toolkit/source/awt/vclxwindows.cxx |2 
 vcl/source/control/field.cxx   |2 
 vcl/source/control/field2.cxx  |2 
 vcl/source/window/builder.cxx  |2 
 10 files changed, 131 insertions(+), 120 deletions(-)

New commits:
commit f9eecb48bf675e77d15a9d926d1dd47f22835d67
Author: Caolán McNamara 
AuthorDate: Mon Jan 27 20:22:05 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 13:50:42 2020 +0100

move private TimeBox to toolkit-only headers

move private DateBox to toolkit-only headers
move private CurrencyBox to toolkit-only headers
move private PatternBox to toolkit-only headers
move private CurrencyField to toolkit-only headers
move private CurrencyFormatter to toolkit-only headers

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

diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 4e0b0a04d9ff..81fd9e5b8023 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -236,24 +236,6 @@ private:
 OUStringmaCustomUnitText;
 };
 
-
-class VCL_DLLPUBLIC CurrencyFormatter : public NumericFormatter
-{
-protected:
-CurrencyFormatter(Edit* pEdit);
-SAL_DLLPRIVATE void ImplCurrencyReformat( const OUString& rStr, 
OUString& rOutStr );
-virtual sal_Int64   GetValueFromString(const OUString& rStr) const 
override;
-
-public:
-virtual ~CurrencyFormatter() override;
-
-virtual voidReformat() override;
-
-virtual voidSetValue( sal_Int64 nNewValue ) override;
-virtual OUStringCreateFieldText( sal_Int64 nValue ) const override;
-};
-
-
 class VCL_DLLPUBLIC DateFormatter : public FormatterBase
 {
 private:
@@ -331,7 +313,6 @@ public:
 bool IsEnforceValidValue( ) const { return 
mbEnforceValidValue; }
 };
 
-
 class VCL_DLLPUBLIC TimeFormatter : public FormatterBase
 {
 private:
@@ -499,26 +480,6 @@ public:
 virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 };
 
-
-class VCL_DLLPUBLIC CurrencyField final : public SpinField, public 
CurrencyFormatter
-{
-public:
-CurrencyField( vcl::Window* pParent, WinBits nWinStyle );
-
-virtual boolPreNotify( NotifyEvent& rNEvt ) override;
-virtual boolEventNotify( NotifyEvent& rNEvt ) override;
-virtual voidDataChanged( const DataChangedEvent& rDCEvt ) 
override;
-
-virtual voidModify() override;
-
-virtual voidUp() override;
-virtual voidDown() override;
-virtual voidFirst() override;
-virtual voidLast() override;
-virtual voiddispose() override;
-};
-
-
 class VCL_DLLPUBLIC DateField : public SpinField, public DateFormatter
 {
 private:
@@ -549,7 +510,6 @@ public:
 virtual voiddispose() override;
 };
 
-
 class VCL_DLLPUBLIC TimeField final : public SpinField, public TimeFormatter
 {
 private:
@@ -581,22 +541,6 @@ public:
 virtual voiddispose() override;
 };
 
-
-class VCL_DLLPUBLIC PatternBox final : public ComboBox, public PatternFormatter
-{
-public:
-PatternBox( vcl::Window* pParent, WinBits 
nWinStyle );
-
-virtual boolPreNotify( NotifyEvent& rNEvt ) override;
-virtual boolEventNotify( NotifyEvent& rNEvt ) override;
-
-virtual voidModify() override;
-
-virtual voidReformatAll() override;
-virtual voiddispose() override;
-};
-
-
 class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter
 {
 SAL_DLLPRIVATE void ImplNumericReformat( const OUString& rStr, 
sal_Int64& rValue, OUString& rOutStr );
@@ -642,55 +586,6 @@ public:
 virtual voiddispose() override;
 };
 
-
-class VCL_DLLPUBLIC CurrencyBox final : public ComboBox, public 
CurrencyFormatter
-{
-public:
-explicitCurrencyBox( vcl::Window* pParent, WinBits 
nWinStyle );
-
-virtual boolPreNotify( NotifyEvent& rNEvt ) override;
-virtual boolEventNotify( NotifyEvent& rNEvt ) override;
-virtual voidDataChanged( const DataChangedEvent& rDCEvt ) 
override;
-
-virtual voidModify() override;
-
-virtual voidReformatAll() override;
-
-virtual voiddispose() override;
-};
-
-
-class VCL_DLLPUBLIC DateBox final : public ComboBox, public DateFormatter
-{
-public:
-explic

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

2020-01-28 Thread Serkan Özkaya (via logerrit)

 sc/inc/numformat.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 3160d75bac24acd0eb5b6a727d2b68d434921843
Author: Serkan Özkaya 
AuthorDate: Tue Jan 28 09:08:21 2020 +
Commit: Muhammet Kara 
CommitDate: Tue Jan 28 13:38:53 2020 +0100

tdf#124176: Use pragma once instead of include guards

Change-Id: Icd8e75e42d2311396bfb68e50f2421f9dd61b22e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87588
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sc/inc/numformat.hxx b/sc/inc/numformat.hxx
index c3aa957ed209..739c7f1d9329 100644
--- a/sc/inc/numformat.hxx
+++ b/sc/inc/numformat.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SC_NUMFORMAT_HXX
-#define INCLUDED_SC_NUMFORMAT_HXX
+#pragma once
 
 #include "scdllapi.h"
 
@@ -33,6 +32,4 @@ public:
 
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 svx/source/tbxctrls/tbcontrl.cxx |  244 ++-
 1 file changed, 117 insertions(+), 127 deletions(-)

New commits:
commit b564a92d102e356b11d7851d4fe538104addce49
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 09:59:23 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 13:35:40 2020 +0100

weld LineListBox

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

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 4421e0f7d3b8..55d4d6cf7406 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -319,22 +319,20 @@ private:
 virtual VclPtr createVclPopupWindow( vcl::Window* pParent ) 
override;
 };
 
-class LineListBox final : public ListBox
+class LineListBox final : public SvtValueSet
 {
 public:
 typedef Color (*ColorFunc)(Color);
 typedef Color (*ColorDistFunc)(Color, Color);
 
-LineListBox( vcl::Window* pParent );
-virtual ~LineListBox() override;
-virtual voiddispose() override;
+LineListBox();
 
 /** Set the width in Twips */
-void SetWidth( long nWidth )
+Size SetWidth( long nWidth )
 {
 long nOldWidth = m_nWidth;
 m_nWidth = nWidth;
-UpdateEntries( nOldWidth );
+return UpdateEntries( nOldWidth );
 }
 
 void SetNone( const OUString& sNone )
@@ -342,7 +340,6 @@ private:
 m_sNone = sNone;
 }
 
-using ListBox::InsertEntry;
 /** Insert a listbox entry with all widths in Twips. */
 voidInsertEntry(const BorderWidthImpl& rWidthImpl,
 SvxBorderLineStyle nStyle, long nMinWidth = 0,
@@ -358,16 +355,16 @@ private:
 
 const Color&GetColor() const { return aColor; }
 
+virtual voidSetDrawingArea(weld::DrawingArea* pDrawingArea) 
override;
 private:
 
 void ImpGetLine(long nLine1, long nLine2, long nDistance,
 Color nColor1, Color nColor2, Color nColorDist,
 SvxBorderLineStyle nStyle, BitmapEx& rBmp);
-using Window::ImplInit;
+
 voidUpdatePaintLineColor();   // returns sal_True if 
maPaintCol has changed
-virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
 
-voidUpdateEntries( long nOldWidth );
+SizeUpdateEntries( long nOldWidth );
 sal_Int32   GetStylePos( sal_Int32  nListPos, long nWidth );
 
 const Color& GetPaintColor() const
@@ -395,11 +392,11 @@ private:
 SvxBorderLineStyle LineListBox::GetSelectEntryStyle() const
 {
 SvxBorderLineStyle nStyle = SvxBorderLineStyle::SOLID;
-sal_Int32 nPos = GetSelectedEntryPos();
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+size_t nPos = GetSelectItemPos();
+if (nPos != VALUESET_ITEM_NOTFOUND)
 {
 if (!m_sNone.isEmpty())
-nPos--;
+--nPos;
 nStyle = GetEntryStyle( nPos );
 }
 
@@ -410,17 +407,10 @@ private:
 Color aColor1, Color aColor2, Color aColorDist,
 SvxBorderLineStyle nStyle, BitmapEx& rBmp )
 {
-//TODO, rather than including the " " text to force
-//the line height, better would be do drop
-//this calculation and draw a bitmap of height
-//equal to normal text line and center the
-//line within that
-long nMinWidth = GetTextWidth("--");
-Size aSize = CalcSubEditSize();
-aSize.setWidth( std::max(nMinWidth, aSize.Width()) );
+auto nMinWidth = 
GetDrawingArea()->get_ref_device().approximate_digit_width() * 15;
+Size aSize(nMinWidth, aTxtSize.Height());
 aSize.AdjustWidth( -(aTxtSize.Width()) );
 aSize.AdjustWidth( -6 );
-aSize.setHeight( aTxtSize.Height() );
 
 // SourceUnit to Twips
 if ( eSourceUnit == FieldUnit::POINT )
@@ -472,45 +462,41 @@ private:
 rBmp = aVirDev->GetBitmapEx( Point(), Size( aSize.Width(), n1+nDist+n2 
) );
 }
 
-LineListBox::LineListBox( vcl::Window* pParent ) :
-ListBox( pParent, WB_BORDER ),
-m_nWidth( 5 ),
-m_sNone( ),
-aVirDev( VclPtr::Create() ),
-aColor( COL_BLACK ),
-maPaintCol( COL_BLACK )
+LineListBox::LineListBox()
+: SvtValueSet(nullptr)
+, m_nWidth( 5 )
+, m_sNone()
+, aVirDev(VclPtr::Create())
+, aColor(COL_BLACK)
+, maPaintCol(COL_BLACK)
+, eSourceUnit(FieldUnit::POINT)
 {
-aTxtSize.setWidth( GetTextWidth( " " ) );
-aTxtSize.setHeight( GetTextHeight(

[Libreoffice-commits] core.git: odk/CustomTarget_allheaders.mk

2020-01-28 Thread Stephan Bergmann (via logerrit)

 odk/CustomTarget_allheaders.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d68824bd926954f1d2201904d6976a55e9fd8564
Author: Stephan Bergmann 
AuthorDate: Tue Jan 28 10:44:16 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 13:14:46 2020 +0100

Remove misleading comment

...that had not been adapted when the corresponding #ifdef had been changed 
in
2087484c65a3d5e75a9e8ad116d11a4e13366219 "use consistent #define checks for 
the
Windows platform"

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

diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk
index b432317c4a72..3c28f0cfcfe1 100644
--- a/odk/CustomTarget_allheaders.mk
+++ b/odk/CustomTarget_allheaders.mk
@@ -42,7 +42,7 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)
$(foreach file,$(shell cat $^),\
$(if $(findstring /win32/,$(file)),&& printf '#ifdef _WIN32\n' 
>> $@) \
&& printf '#include <%s>\n' $(subst 
$(INSTDIR)/$(SDKDIRNAME)/include/,,$(file)) >> $@ \
-   $(if $(findstring /win32/,$(file)),&& printf '#endif // WNT\n' 
>> $@) \
+   $(if $(findstring /win32/,$(file)),&& printf '#endif\n' >> $@) \
)
 else
$(file >$@,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Stephan Bergmann (via logerrit)

 desktop/source/pkgchk/unopkg/unopkg_app.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 9f277b2616512299ec20de0209c272527f26386b
Author: Stephan Bergmann 
AuthorDate: Tue Jan 28 10:39:16 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 28 13:14:18 2020 +0100

Dispose configmgr at the end of unopkg

...so that the configmgr::Components::WriteThread
(configmgr/source/components.cxx) is joined well before exit.  (This should
solve the issue discussed at 
, "tdf#129917 Use temp user profile 
when
installing shared extensions".)

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

diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx 
b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 6ee96a9b7995..97abd4c9dbc0 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -582,6 +582,8 @@ extern "C" int unopkg_main()
 logger->log(LogLevel::INFO, "$1$ done.", APP_NAME);
 //Force to release all bridges which connect us to the child processes
 dp_misc::disposeBridges(xLocalComponentContext);
+css::uno::Reference(
+xLocalComponentContext, css::uno::UNO_QUERY_THROW)->dispose();
 return 0;
 }
 catch (const ucb::CommandFailedException &e)
@@ -613,6 +615,10 @@ extern "C" int unopkg_main()
 if (bShowFailedMsg)
 logger->log(LogLevel::SEVERE, "$1$ failed.", APP_NAME);
 dp_misc::disposeBridges(xLocalComponentContext);
+if (xLocalComponentContext.is()) {
+css::uno::Reference(
+xLocalComponentContext, css::uno::UNO_QUERY_THROW)->dispose();
+}
 return 1;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/links.txt.xsl

2020-01-28 Thread Olivier Hallot (via logerrit)

 help3xsl/links.txt.xsl |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3e3457dd21940c5513d95dbe081cdc1a3ac9a6ef
Author: Olivier Hallot 
AuthorDate: Tue Jan 28 09:04:33 2020 -0300
Commit: Olivier Hallot 
CommitDate: Tue Jan 28 13:09:22 2020 +0100

Update Colibre icons replacement table in Help.

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

diff --git a/help3xsl/links.txt.xsl b/help3xsl/links.txt.xsl
index 265da593b..c338e3a5c 100644
--- a/help3xsl/links.txt.xsl
+++ b/help3xsl/links.txt.xsl
@@ -26,6 +26,8 @@
 cmd/sc_insertcolumnsafter.svg
 cmd/sc_insertcolumns.svg
 cmd/sc_insertrowsbefore.svg
+chart2/res/net_52x60.svg
+chart2/res/netstack_52x60.svg
 formula/res/refinp1.svg
 cmd/32/toggletitle.svg
 cmd/32/diagramaxisxyz.svg
@@ -1085,6 +1087,7 @@
 cmd/32/navigator.svg
 cmd/lc_navigator.svg
 cmd/sc_navigator.svg
+cmd/sc_timefield.svg
 cmd/32/dbtableedit.svg
 cmd/32/sbanativesql.svg
 cmd/32/dbchangedesignmode.svg
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2020-01-28 Thread Olivier Hallot (via logerrit)

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

New commits:
commit b987ea4f7cd75e43c65e652a303feaac25bacb55
Author: Olivier Hallot 
AuthorDate: Tue Jan 28 09:09:22 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Jan 28 13:09:22 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 3e3457dd21940c5513d95dbe081cdc1a3ac9a6ef
  - Update Colibre icons replacement table in Help.

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

diff --git a/helpcontent2 b/helpcontent2
index 3fe23a6489fb..3e3457dd2194 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3fe23a6489fbf959bb89adaed68f7fad8c8ed267
+Subproject commit 3e3457dd21940c5513d95dbe081cdc1a3ac9a6ef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Pedro Pinto Silva (via logerrit)

 loleaflet/images/lc_insertgraphic.svg |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0cb32e0ea5b4d78e949c450dba439b1bd70a624d
Author: Pedro Pinto Silva 
AuthorDate: Tue Jan 28 13:02:26 2020 +0100
Commit: Pedro Pinto da Silva 
CommitDate: Tue Jan 28 13:03:50 2020 +0100

MobileWizard: add monochrome version of insert local image

Change-Id: I095c23c086c026995d1433e9f3efc1adfef2a8cd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87601
Reviewed-by: Pedro Pinto da Silva 
Tested-by: Pedro Pinto da Silva 

diff --git a/loleaflet/images/lc_insertgraphic.svg 
b/loleaflet/images/lc_insertgraphic.svg
index e1a05ae69..463aa429f 100644
--- a/loleaflet/images/lc_insertgraphic.svg
+++ b/loleaflet/images/lc_insertgraphic.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 
24">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: pyuno/source scripting/source

2020-01-28 Thread Mike Kaganski (via logerrit)

 pyuno/source/loader/pythonloader.py  |2 +-
 scripting/source/pyprov/mailmerge.py |   10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a76d229fa9d800e96d88f5f37981251722e153e6
Author: Mike Kaganski 
AuthorDate: Mon Jan 27 07:18:20 2020 +0100
Commit: Mike Kaganski 
CommitDate: Tue Jan 28 13:01:26 2020 +0100

sys.version is for displaying; use sys.version_info for version check

Change-Id: If0d26019d9f842bcf56c1e01c46cc86c21523c3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87476
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/pyuno/source/loader/pythonloader.py 
b/pyuno/source/loader/pythonloader.py
index 268cb168fe3c..5ce69f62ea7e 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -90,7 +90,7 @@ class Loader( XImplementationLoader, XServiceInfo, 
unohelper.Base ):
 # read the file
 filename = unohelper.fileUrlToSystemPath( url )
 
-if sys.version >= '3':
+if sys.version_info >= (3,0):
 fileHandle = open( filename, encoding='utf_8' )
 else:
 fileHandle = open( filename )
diff --git a/scripting/source/pyprov/mailmerge.py 
b/scripting/source/pyprov/mailmerge.py
index 079744007816..fadceb1e1e56 100644
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -127,7 +127,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
user = xAuthenticator.getUserName()
password = xAuthenticator.getPassword()
if user != '':
-   if sys.version < '3': # fdo#59249 i#105669 Python 2 
needs "ascii"
+   if sys.version_info < (3,0): # fdo#59249 i#105669 
Python 2 needs "ascii"
user = user.encode('ascii')
password = password.encode('ascii')
if dbg:
@@ -198,8 +198,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
except:
#it's a bytesequence, get raw 
bytes
textbody = textbody.value
-   if sys.version >= '3':
-   if sys.version_info.minor < 3 
or (sys.version_info.minor == 3 and sys.version_info.micro <= 1):
+   if sys.version_info >= (3,0):
+   if sys.version_info <= (3,1):

#http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w
#see 
http://bugs.python.org/16564, etc. basically it now *seems* to be all ok
#in python 3.3.2 
onwards, but a little busted in 3.3.0
@@ -333,7 +333,7 @@ class PyMailIMAPService(unohelper.Base, XMailService):
user = xAuthenticator.getUserName()
password = xAuthenticator.getPassword()
if user != '':
-   if sys.version < '3': # fdo#59249 i#105669 Python 2 
needs "ascii"
+   if sys.version_info < (3,0): # fdo#59249 i#105669 
Python 2 needs "ascii"
user = user.encode('ascii')
password = password.encode('ascii')
if dbg:
@@ -411,7 +411,7 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
 
user = xAuthenticator.getUserName()
password = xAuthenticator.getPassword()
-   if sys.version < '3': # fdo#59249 i#105669 Python 2 needs 
"ascii"
+   if sys.version_info < (3,0): # fdo#59249 i#105669 Python 2 
needs "ascii"
user = user.encode('ascii')
password = password.encode('ascii')
if dbg:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 dbaccess/source/ui/control/opendoccontrols.cxx |1 -
 svtools/source/edit/editsyntaxhighlighter.cxx  |1 -
 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx |1 -
 3 files changed, 3 deletions(-)

New commits:
commit 268b2b4cd5507e63830df71b3aa21ea022c0b48f
Author: Caolán McNamara 
AuthorDate: Mon Jan 27 21:29:19 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 12:34:35 2020 +0100

drop some unneeded vcl/builderfactory.hxx includes

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

diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx 
b/dbaccess/source/ui/control/opendoccontrols.cxx
index 3ca51921375f..232a4849e82f 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -38,7 +38,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace dbaui
 {
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx 
b/svtools/source/edit/editsyntaxhighlighter.cxx
index 532fc67503f9..6dc523baa507 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -22,7 +22,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx 
b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index 4e777a6e2b6e..6dd4f4858c90 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include 
 
 using namespace svx;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Pranam Lashkari (via logerrit)

 loleaflet/src/control/Control.JSDialogBuilder.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be4800531d0a3e184d4683992f382d08837ffec0
Author: Pranam Lashkari 
AuthorDate: Thu Jan 23 05:17:53 2020 +0530
Commit: Jan Holesovsky 
CommitDate: Tue Jan 28 12:20:52 2020 +0100

Fixed broken image linking in mobile wizard

after new callback function route for the mobile wizard,
 noneexisting images were being added to menu

Change-Id: Iec3f817cc218d7a4cb9b92370f092fdf6dc18d70
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87228
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 3660dc2fa..71c074103 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1422,7 +1422,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var menuEntry = L.DomUtil.create('div', 'ui-header level-' + 
builder._currentDepth + ' mobile-wizard ui-widget', parentContainer);
 
var icon = null;
-   var commandName = data.command ? 
data.command.substring('.uno:'.length) : data.id;
+   var commandName = data.command && data.command.substring(0, 
'.uno:'.length) === '.uno:' ? data.command.substring('.uno:'.length) : data.id;
if (commandName && commandName.length && 
L.LOUtil.existsIconForCommand(commandName)) {
var iconSpan = L.DomUtil.create('span', 
'menu-entry-icon ' + commandName.toLowerCase(), menuEntry);
var iconPath = 'images/lc_' + commandName.toLowerCase() 
+ '.svg';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Caolán McNamara (via logerrit)

 svx/source/gallery2/galbrws1.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b2be32ed509f3857c1ede758163f0b8e753337e8
Author: Caolán McNamara 
AuthorDate: Mon Jan 27 21:36:28 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 12:08:27 2020 +0100

drop unnecessary vcl.builder include

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

diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index cbe8d93efbbf..7b7daeee6024 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -22,7 +22,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-28 Thread Caolán McNamara (via logerrit)

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

New commits:
commit d6fc0133151756e076e572628e830ae87cec643b
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 09:00:25 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 12:03:02 2020 +0100

add SAL_WARN_UNUSED to Region

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

diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index faa2da61141d..0c8fad891cc0 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -40,7 +40,7 @@ typedef std::vector< tools::Rectangle > RectangleVector;
 
 namespace vcl {
 
-class VCL_DLLPUBLIC Region
+class SAL_WARN_UNUSED VCL_DLLPUBLIC Region
 {
 private:
 friend class ::OutputDevice;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 136 matches

Mail list logo