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

2019-03-31 Thread Andras Timar (via logerrit)
 solenv/bin/modules/installer/environment.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c2f121842edcfba060c46343d78d4ef4c28b6249
Author: Andras Timar 
AuthorDate: Sun Mar 31 13:00:33 2019 -0700
Commit: Andras Timar 
CommitDate: Mon Apr 1 08:34:00 2019 +0200

Restore original $licensepath of the optional EULA of MSI package

Change-Id: If80ac5648f50deda7a16bc6661ced31357958d67
Reviewed-on: https://gerrit.libreoffice.org/70038
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/solenv/bin/modules/installer/environment.pm 
b/solenv/bin/modules/installer/environment.pm
index b45227f8a1a4..05dfdbfb6787 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -59,7 +59,7 @@ sub create_pathvariables
 my $filelistpath = $environment->{'WORKDIR'};
 $variables{'filelistpath'} = $filelistpath;
 
-my $licensepath = $environment->{'WORKDIR'} . 
$installer::globals::separator . "CustomTarget/readlicense_oo/license";
+my $licensepath = $environment->{'SRCDIR'} . 
$installer::globals::separator . "readlicense_oo/license";
 $variables{'licensepath'} = $licensepath;
 
 my $packinfopath = $environment->{'SRCDIR'} . 
$installer::globals::separator . "setup_native/source/packinfo";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa

2019-03-31 Thread Jens Carl (via logerrit)
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv |
2 --
 sc/qa/extras/scsubtotaldescriptorbase.cxx|
7 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit ae75372dbdb74eaf959b566f1d9c2b77043e736a
Author: Jens Carl 
AuthorDate: Mon Apr 1 05:28:57 2019 +
Commit: Jens Carl 
CommitDate: Mon Apr 1 08:19:21 2019 +0200

tdf#45904 Move XIndexAccess Java tests to C++

Move XIndexAccess Java tests to C++ for ScSubTotalDescriptorBase.

Change-Id: I86f39c2ef5559f8b5ac4d45daeb6bcad1ab01c8c
Reviewed-on: https://gerrit.libreoffice.org/70039
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
index 2ba64e29988c..a001e7a8497c 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
@@ -1,5 +1,3 @@
-"ScSubTotalDescriptorBase";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScSubTotalDescriptorBase";"com::sun::star::container::XIndexAccess";"getByIndex()"
 
"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"getElementType()"
 
"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"hasElements()"
 
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
diff --git a/sc/qa/extras/scsubtotaldescriptorbase.cxx 
b/sc/qa/extras/scsubtotaldescriptorbase.cxx
index 5d77331f3801..93ff4de17081 100644
--- a/sc/qa/extras/scsubtotaldescriptorbase.cxx
+++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -33,6 +34,7 @@ namespace sc_apitest
 class ScSubTotalDescriptorBase : public CalcUnoApiTest,
  public apitest::SubTotalDescriptor,
  public apitest::XEnumerationAccess,
+ public apitest::XIndexAccess,
  public apitest::XSubTotalDescriptor
 {
 public:
@@ -50,6 +52,10 @@ public:
 // XEnumerationAccess
 CPPUNIT_TEST(testCreateEnumeration);
 
+// XIndexAccess
+CPPUNIT_TEST(testGetByIndex);
+CPPUNIT_TEST(testGetCount);
+
 // XSubTotalDescriptor
 CPPUNIT_TEST(testAddNew);
 CPPUNIT_TEST(testClear);
@@ -62,6 +68,7 @@ private:
 
 ScSubTotalDescriptorBase::ScSubTotalDescriptorBase()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XIndexAccess(1)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/CppunitTest_sc_subtotaldescriptorbase.mk sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk sc/Module_sc.mk sc/qa

2019-03-31 Thread Jens Carl (via logerrit)
 sc/CppunitTest_sc_subtotaldescriptorbase.mk |   22 +--
 sc/Module_sc.mk |2 -
 sc/qa/extras/scsubtotaldescriptorbase.cxx   |   55 +---
 3 files changed, 39 insertions(+), 40 deletions(-)

New commits:
commit af5f02ec27e3403c1e4c43bca621e2a0d261aa0e
Author: Jens Carl 
AuthorDate: Mon Apr 1 03:58:12 2019 +
Commit: Jens Carl 
CommitDate: Mon Apr 1 08:14:30 2019 +0200

Rename ScSubTotalDescriptorBaseObj to ScSubTotalDescriptorBase

Correct class name to mirror the name of the object we are testing
against.

Change-Id: If26dc045f67df7725043f1b0ccd0d3c8ba73f4ed
Reviewed-on: https://gerrit.libreoffice.org/70030
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk 
b/sc/CppunitTest_sc_subtotaldescriptorbase.mk
similarity index 76%
rename from sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
rename to sc/CppunitTest_sc_subtotaldescriptorbase.mk
index 6a4ed6a951f7..e20d002735aa 100644
--- a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_subtotaldescriptorbase.mk
@@ -9,15 +9,15 @@
 #
 #*
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_subtotaldescriptorbaseobj))
+$(eval $(call gb_CppunitTest_CppunitTest,sc_subtotaldescriptorbase))
 
-$(eval $(call 
gb_CppunitTest_use_external,sc_subtotaldescriptorbaseobj,boost_headers))
+$(eval $(call 
gb_CppunitTest_use_external,sc_subtotaldescriptorbase,boost_headers))
 
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_subtotaldescriptorbaseobj, \
-   sc/qa/extras/scsubtotaldescriptorbaseobj \
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_subtotaldescriptorbase, \
+   sc/qa/extras/scsubtotaldescriptorbase \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sc_subtotaldescriptorbaseobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_subtotaldescriptorbase, \
cppu \
sal \
subsequenttest \
@@ -25,22 +25,22 @@ $(eval $(call 
gb_CppunitTest_use_libraries,sc_subtotaldescriptorbaseobj, \
unotest \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sc_subtotaldescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_set_include,sc_subtotaldescriptorbase,\
$$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sc_subtotaldescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_subtotaldescriptorbase,\
offapi \
udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sc_subtotaldescriptorbaseobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_subtotaldescriptorbaseobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_subtotaldescriptorbase))
+$(eval $(call gb_CppunitTest_use_vcl,sc_subtotaldescriptorbase))
 
-$(eval $(call gb_CppunitTest_use_components,sc_subtotaldescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_subtotaldescriptorbase,\
$(sc_unoapi_common_components) \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sc_subtotaldescriptorbaseobj))
+$(eval $(call gb_CppunitTest_use_configuration,sc_subtotaldescriptorbase))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 7e014431f6a5..b56484c798a5 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -192,7 +192,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_spreadsheetsettingsobj \
CppunitTest_sc_stylefamiliesobj \
CppunitTest_sc_stylefamilyobj \
-   CppunitTest_sc_subtotaldescriptorbaseobj \
+   CppunitTest_sc_subtotaldescriptorbase \
CppunitTest_sc_subtotalfieldobj \
CppunitTest_sc_tablecolumnsobj \
CppunitTest_sc_tableconditionalentryobj \
diff --git a/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx 
b/sc/qa/extras/scsubtotaldescriptorbase.cxx
similarity index 58%
rename from sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
rename to sc/qa/extras/scsubtotaldescriptorbase.cxx
index 25236174837a..5d77331f3801 100644
--- a/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
+++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx
@@ -21,36 +21,35 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
-#include 
 
 using namespace css;
-using namespace css::uno;
-using namespace com::sun::star;
-
-namespace sc_apitest {
 
-class ScSubTotalDescriptorBaseObj : public CalcUnoApiTest,public 
apitest::XEnumerationAccess,
-  public 
apitest::SubTotalDescriptor,
-  public 
apitest::XSubTotalDescriptor
+namespace sc_apitest
+{
+class ScSubTotalDescriptorBase : public CalcUnoApiTest,
+ public apitest::SubTotalDescriptor,
+ public apitest::XEnumerationAccess,
+ public apitest::XSubTotalDescriptor
 {
 public:
-ScSubTotalDescriptorBaseObj();
+ScSubTotalDescriptorBase();
 
-virtual uno:

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

2019-03-31 Thread Tomaž Vajngerl (via logerrit)
 include/vcl/settings.hxx|1 +
 vcl/source/app/settings.cxx |5 +
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx |1 +
 3 files changed, 7 insertions(+)

New commits:
commit c2108dd683ec7ff0bcaac8456c6cce9610a2993a
Author: Tomaž Vajngerl 
AuthorDate: Mon Apr 1 13:08:02 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Apr 1 08:02:55 2019 +0200

tdf#124150 increase size of color valueset widget

Size of the color value set can be set through settings, but there
was no setter. Added a setter and set it to a bigger value so it
is better suited for touch.

Change-Id: I8c9b17f7379c4702b0faf7847f1e6292cd89b0d0
Reviewed-on: https://gerrit.libreoffice.org/70031
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 3b7e5e215104..f7be71ae5092 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -592,6 +592,7 @@ public:
 // be used.
 static sal_uInt16   GetColorValueSetMaximumRowCount();
 
+voidSetListBoxPreviewDefaultLogicSize(Size 
const & rSize);
 const Size& GetListBoxPreviewDefaultPixelSize() const;
 
 // the default LineWidth for ListBox UI previews (LineStyle, LineDash, 
LineStartEnd). Default is 1.
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 50dce10343b2..fccce19ad1f8 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1981,6 +1981,11 @@ StyleSettings::operator !=( const StyleSettings& rSet ) 
const
 return !(*this == rSet);
 }
 
+void StyleSettings::SetListBoxPreviewDefaultLogicSize(Size const& rSize)
+{
+mxData->maListBoxPreviewDefaultLogicSize = rSize;
+}
+
 const Size& StyleSettings::GetListBoxPreviewDefaultPixelSize() const
 {
 if(0 == mxData->maListBoxPreviewDefaultPixelSize.Width() || 0 == 
mxData->maListBoxPreviewDefaultPixelSize.Height())
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index e3658172be2a..6124a31e21e4 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -929,6 +929,7 @@ bool FileDefinitionWidgetDraw::updateSettings(AllSettings& 
rSettings)
 
 aStyleSet.SetTitleHeight(16);
 aStyleSet.SetFloatTitleHeight(12);
+aStyleSet.SetListBoxPreviewDefaultLogicSize(Size(16, 16));
 
 rSettings.SetStyleSettings(aStyleSet);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - .gitignore readlicense_oo/CustomTarget_license.mk readlicense_oo/Package_files.mk readlicense_oo/Package_license.mk solen

2019-03-31 Thread Andras Timar (via logerrit)
 .gitignore  |1 +
 readlicense_oo/CustomTarget_license.mk  |4 
 readlicense_oo/Package_files.mk |5 +
 readlicense_oo/Package_license.mk   |3 ++-
 solenv/bin/modules/installer/environment.pm |2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 4a352772f28cdc8edd36d8c7b7178c9dcd5892a8
Author: Andras Timar 
AuthorDate: Sun Mar 31 13:00:33 2019 -0700
Commit: Andras Timar 
CommitDate: Mon Apr 1 07:31:28 2019 +0200

Restore original $licensepath of the optional EULA of MSI package

Change-Id: If80ac5648f50deda7a16bc6661ced31357958d67
Reviewed-on: https://gerrit.libreoffice.org/70037
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/solenv/bin/modules/installer/environment.pm 
b/solenv/bin/modules/installer/environment.pm
index 7cb2b9aa15a1..38448a8ba9fb 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -59,7 +59,7 @@ sub create_pathvariables
 my $filelistpath = $environment->{'WORKDIR'};
 $variables{'filelistpath'} = $filelistpath;
 
-my $licensepath = $environment->{'WORKDIR'} . 
$installer::globals::separator . "CustomTarget/readlicense_oo/license";
+my $licensepath = $environment->{'SRCDIR'} . 
$installer::globals::separator . "readlicense_oo/license";
 $variables{'licensepath'} = $licensepath;
 
 my $packinfopath = $environment->{'SRCDIR'} . 
$installer::globals::separator . "setup_native/source/packinfo";
commit 62c9b13280e94103db6f83485d4bfe6993b1cd9f
Author: Andras Timar 
AuthorDate: Sun Mar 31 10:30:02 2019 -0700
Commit: Andras Timar 
CommitDate: Mon Apr 1 07:31:13 2019 +0200

[cp] MSP does not allow to move files between components

Change-Id: Ie279b16b4ba5dd87498f4144146d1a9e8ca4ece9
Reviewed-on: https://gerrit.libreoffice.org/70013
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/.gitignore b/.gitignore
index aad4142986f0..63d17deebbf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,7 @@
 /AUTHORS
 /MAINTAINERS
 /setup_native/source/packinfo/finals_instsetoo.txt
+/readlicense_oo/license/LICENSE.html
 
 # make id
 /ID
diff --git a/readlicense_oo/CustomTarget_license.mk 
b/readlicense_oo/CustomTarget_license.mk
index 75923d109970..d5ecffb2300e 100644
--- a/readlicense_oo/CustomTarget_license.mk
+++ b/readlicense_oo/CustomTarget_license.mk
@@ -64,6 +64,10 @@ $(readlicense_oo_DIR)/license.txt : \
$(call gb_Helper_abbreviate_dirs, \
$(gb_AWK) 'sub("$$","\r")' $< > $@.tmp && mv $@.tmp $@ \
)
+
+$(SRCDIR)/readlicense_oo/license/LICENSE.html: \
+   $(readlicense_oo_DIR)/license.html
+   cp $< $@
 endif
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 95614109e3d1..41b6e43c4856 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -21,4 +21,9 @@ $(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/EULA_en-US.rtf,
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
 endif
 
+ifeq ($(OS),WNT)
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.fodt,LICENSE.html))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/Package_license.mk 
b/readlicense_oo/Package_license.mk
index d91a18bb8bb5..1aaee1df4a47 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -11,7 +11,6 @@ $(eval $(call 
gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_g
 
 ifeq ($(OS),WNT)
 $(eval $(call 
gb_Package_add_file,readlicense_oo_license,license.txt,license.txt))
-$(eval $(call 
gb_Package_add_file,readlicense_oo_license,LICENSE.fodt,license.html))
 else
 ifneq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,readlicense_oo_license,LICENSE,LICENSE))
@@ -20,10 +19,12 @@ $(eval $(call 
gb_Package_add_file,readlicense_oo_license,Resources/LICENSE,LICEN
 endif
 endif
 
+ifneq ($(OS),WNT)
 ifneq ($(OS),MACOSX)
 $(eval $(call 
gb_Package_add_file,readlicense_oo_license,LICENSE.html,license.html))
 else
 $(eval $(call 
gb_Package_add_file,readlicense_oo_license,Resources/LICENSE.html,license.html))
 endif
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk

2019-03-31 Thread Andras Timar (via logerrit)
 postprocess/CustomTarget_signing.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9f8fe00a245c279e7531e03bf38fbcab24d52bcc
Author: Andras Timar 
AuthorDate: Mon Apr 1 00:02:39 2019 +0200
Commit: Andras Timar 
CommitDate: Mon Apr 1 07:28:45 2019 +0200

no need to sign mysql-connector-ooo files, because they no longer exist in 
LO

Change-Id: Id9361cc6fd6d9bb150fd5a70fde7f6c91097b04a
Reviewed-on: https://gerrit.libreoffice.org/70018
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index b8a764d899e4..3a7097fcbd77 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -47,7 +47,6 @@ ifneq ($(ENABLE_DBGUTIL),TRUE)
$(INSTDIR)/program/shlxthdl/*.dll \
$(INSTDIR)/sdk/cli/*.dll \
$(INSTDIR)/sdk/bin/*.exe \
-   $(INSTDIR)/share/extensions/mysql-connector-ooo/*.dll\
&& rm $$EXCLUDELIST && touch $@
 else
@echo "Doing nothing on non product builds ..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-31 Thread Jens Carl (via logerrit)
 sc/qa/extras/scviewpaneobj.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 74fce77c1f05de306037ceeeb2efa5e8cb736d3f
Author: Jens Carl 
AuthorDate: Fri Mar 29 22:27:56 2019 +
Commit: Jens Carl 
CommitDate: Mon Apr 1 05:58:43 2019 +0200

Add XServiceInfo tests to ScViewPaneObj

Change-Id: I3764dd54f0ddb86166028a6c9c824e58ff0a88a6
Reviewed-on: https://gerrit.libreoffice.org/70029
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/sc/qa/extras/scviewpaneobj.cxx b/sc/qa/extras/scviewpaneobj.cxx
index 779b019e2506..a233cc90050b 100644
--- a/sc/qa/extras/scviewpaneobj.cxx
+++ b/sc/qa/extras/scviewpaneobj.cxx
@@ -8,6 +8,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -38,6 +39,7 @@ class ScViewPaneObj : public CalcUnoApiTest,
   public apitest::XCellRangeReferrer,
   public apitest::XControlAccess,
   public apitest::XFormLayerAccess,
+  public apitest::XServiceInfo,
   public apitest::XViewPane
 {
 public:
@@ -61,6 +63,11 @@ public:
 CPPUNIT_TEST(testIsFormDesignMode);
 CPPUNIT_TEST(testSetFormDesignMode);
 
+// XServiceInfo
+CPPUNIT_TEST(testGetImplementationName);
+CPPUNIT_TEST(testGetSupportedServiceNames);
+CPPUNIT_TEST(testSupportsService);
+
 // XViewPane
 CPPUNIT_TEST(testFirstVisibleColumn);
 CPPUNIT_TEST(testFirstVisibleRow);
@@ -74,6 +81,7 @@ private:
 
 ScViewPaneObj::ScViewPaneObj()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XServiceInfo("ScViewPaneObj", "com.sun.star.sheet.SpreadsheetViewPane")
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-31 Thread Andrea Gelmini (via logerrit)
 accessibility/source/extended/AccessibleGridControl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 911237e9de3fdc39480ad299118f76f908ea2b92
Author: Andrea Gelmini 
AuthorDate: Sun Mar 31 18:19:50 2019 +
Commit: Jens Carl 
CommitDate: Mon Apr 1 05:22:40 2019 +0200

Fix typo

Change-Id: Ic7ed36a39c09627e94f61a2b36454c4f19b24ebd
Reviewed-on: https://gerrit.libreoffice.org/70021
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/accessibility/source/extended/AccessibleGridControl.cxx 
b/accessibility/source/extended/AccessibleGridControl.cxx
index 9d0a34064a91..6f69c9d57712 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -377,7 +377,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext 
> SAL_CALL Accessibl
 SolarMutexGuard g;
 
 // if the context died meanwhile (we're no listener, so it won't tell us 
explicitly when this happens),
-// then reset an re-create.
+// then reset and re-create.
 if ( m_xContext.is() && !m_xContext->isAlive() )
 m_xContext = nullptr;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-31 Thread Mike Kaganski (via logerrit)
 solenv/bin/concat-deps.c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 029e89537c86da25c3328623fae94960fcfeb8a7
Author: Mike Kaganski 
AuthorDate: Mon Apr 1 01:59:50 2019 +0300
Commit: Mike Kaganski 
CommitDate: Mon Apr 1 04:07:30 2019 +0200

tdf#120703 PVS: Silence V575 warnings

V575 The potential null pointer is passed into 'strcpy' function.

Change-Id: Iba2cbf1c94f1744b4e34c0f20d9dc030d52f5d9f
Reviewed-on: https://gerrit.libreoffice.org/70024
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 2a81f89da97c..8f1ea492b9cd 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -1146,6 +1146,7 @@ int main(int argc, char** argv)
 return 1;
 work_dir_len = strlen(work_dir);
 phony_content_buffer = malloc(PHONY_TARGET_BUFFER);
+assert(phony_content_buffer); // Don't handle OOM conditions
 strcpy(phony_content_buffer, work_dir);
 phony_content_buffer[work_dir_len] = '/';
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-31 Thread Andrea Gelmini (via logerrit)
 basegfx/source/polygon/b2dpolypolygoncutter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d31d77b7199ecc9a7edc899d9703e9da52d5cbd1
Author: Andrea Gelmini 
AuthorDate: Sun Mar 31 18:19:40 2019 +
Commit: Jens Carl 
CommitDate: Mon Apr 1 01:51:23 2019 +0200

Fix typo

Change-Id: Ib38d3dd25f15ce403ee9ff461a94331a4a7c24ac
Reviewed-on: https://gerrit.libreoffice.org/70019
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx 
b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index 1388a10f360e..beb0136912fd 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -59,7 +59,7 @@ namespace basegfx
 
 // to have the correct curve segments in the crossover checks,
 // it is necessary to keep the original next vectors, too. Else,
-// it may happen to use a already switched next vector which
+// it may happen to use an already switched next vector which
 // would interpolate the wrong comparison point
 B2DVector   maOriginalNext;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source cli_ure/source codemaker/source cppu/source drawinglayer/source editeng/qa javaunohelper/source sal/osl sc/source soltools/cpp sw/source unodevtools/sourc

2019-03-31 Thread Mike Kaganski (via logerrit)
 chart2/source/controller/main/ChartController.cxx  |3 ++-
 chart2/source/controller/main/ChartController_TextEdit.cxx |6 +++---
 chart2/source/controller/main/ChartController_Window.cxx   |3 ++-
 cli_ure/source/uno_bridge/cli_data.cxx |2 +-
 codemaker/source/cppumaker/cpputype.cxx|3 ++-
 cppu/source/uno/copy.hxx   |7 +++
 drawinglayer/source/primitive2d/baseprimitive2d.cxx|8 +---
 drawinglayer/source/primitive3d/baseprimitive3d.cxx|8 +---
 editeng/qa/unit/core-test.cxx  |5 +
 javaunohelper/source/bootstrap.cxx |1 +
 sal/osl/w32/backtrace.cxx  |2 ++
 sc/source/core/tool/chgtrack.cxx   |5 +++--
 sc/source/ui/pagedlg/areasdlg.cxx  |6 +++---
 soltools/cpp/_tokens.c |2 ++
 sw/source/core/access/accfrmobj.cxx|4 ++--
 sw/source/core/crsr/annotationmark.cxx |5 +++--
 sw/source/core/txtnode/atrfld.cxx  |   10 ++
 sw/source/uibase/app/apphdl.cxx|3 +--
 unodevtools/source/skeletonmaker/cpptypemaker.cxx  |6 --
 winaccessibility/source/service/AccFrameEventListener.cxx  |4 ++--
 winaccessibility/source/service/AccObjectWinManager.cxx|5 ++---
 21 files changed, 55 insertions(+), 43 deletions(-)

New commits:
commit 85456fae54029edd26df2277a9eec5e2fe3d9739
Author: Mike Kaganski 
AuthorDate: Mon Apr 1 00:25:16 2019 +0300
Commit: Mike Kaganski 
CommitDate: Mon Apr 1 00:49:12 2019 +0200

tdf#120703 PVS: Silence V522 warnings

V522 There might be dereferencing of a potential null pointer.

Change-Id: Ie617b41a8f8d334022cf5313b242a236baedba48
Reviewed-on: https://gerrit.libreoffice.org/70017
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index bffd841f415d..533029f3024a 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -396,7 +396,8 @@ void SAL_CALL ChartController::attachFrame(
 uno::Reference xSidebar = getSidebarFromModel(getModel());
 if (xSidebar.is())
 {
-sfx2::sidebar::SidebarController* pSidebar = 
dynamic_cast(xSidebar.get());
+
assert(dynamic_cast(xSidebar.get()));
+auto pSidebar = 
static_cast(xSidebar.get());
 sfx2::sidebar::SidebarController::registerSidebarForFrame(pSidebar, 
this);
 pSidebar->updateModel(getModel());
 css::lang::EventObject aEvent;
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx 
b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 71f9f02a28b3..a8148e3929b8 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -174,9 +174,9 @@ void 
ChartController::executeDispatch_InsertSpecialCharacter()
 const SfxItemSet* pSet = pDlg->GetOutputItemSet();
 const SfxPoolItem* pItem=nullptr;
 OUString aString;
-if ( pSet && pSet->GetItemState( SID_CHARMAP, true, &pItem) == 
SfxItemState::SET &&
- dynamic_cast< const SfxStringItem* >(pItem) !=  nullptr )
-aString = dynamic_cast(pItem)->GetValue();
+if (pSet && pSet->GetItemState(SID_CHARMAP, true, &pItem) == 
SfxItemState::SET)
+if (auto pStringItem = dynamic_cast(pItem))
+aString = pStringItem->GetValue();
 
 OutlinerView* pOutlinerView = 
m_pDrawViewWrapper->GetTextEditOutlinerView();
 SdrOutliner*  pOutliner = m_pDrawViewWrapper->getOutliner();
diff --git a/chart2/source/controller/main/ChartController_Window.cxx 
b/chart2/source/controller/main/ChartController_Window.cxx
index d2c7dfbd69a3..06e870dc05ae 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -852,7 +852,8 @@ void ChartController::execute_MouseButtonUp( const 
MouseEvent& rMEvt )
 m_xUndoManager );
 
 bool bChanged = false;
-ChartModel* pModel = 
dynamic_cast(getModel().get());
+assert(dynamic_cast(getModel().get()));
+ChartModel* pModel = 
static_cast(getModel().get());
 if ( eObjectType == OBJECTTYPE_LEGEND )
 bChanged = 
DiagramHelper::switchDiagramPositioningToExcludingPositioning( *pModel, false , 
true );
 
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx 
b/cli_ure/source/uno_bridge/cli_data.cxx
index 722536a3057d..16f7047a80dd 100644
--- a/cli

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - cui/source

2019-03-31 Thread Andras Timar (via logerrit)
 cui/source/dialogs/hlmailtp.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 8c4ba30663e2a8fe5abde7abc6c29e881f9a1a4f
Author: Andras Timar 
AuthorDate: Sun Mar 31 22:21:20 2019 +0200
Commit: Andras Timar 
CommitDate: Sun Mar 31 22:21:20 2019 +0200

Revert 2nd "tdf#124362 hide Addressbook button in Online"

This reverts commit 2cbfef805020d86889e63432092cdbf417cdf325.

diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index dbbceb5bff34..5ccd90a35a9b 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -30,8 +30,6 @@
 
 #include 
 
-#include 
-
 using namespace ::com::sun::star;
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - cui/source

2019-03-31 Thread Andras Timar (via logerrit)
 cui/source/dialogs/hlmailtp.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2cbfef805020d86889e63432092cdbf417cdf325
Author: Andras Timar 
AuthorDate: Sat Mar 30 17:24:08 2019 +0100
Commit: Andras Timar 
CommitDate: Sun Mar 31 22:18:32 2019 +0200

tdf#124362 hide Addressbook button in Online

Change-Id: If066c4440c7add08836fa3ebb569ffc36969072e
Reviewed-on: https://gerrit.libreoffice.org/69966
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
(cherry picked from commit 1d35b89e7581e12024769d19bfb6d6eb2c3274b8)
Reviewed-on: https://gerrit.libreoffice.org/70016
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 5ccd90a35a9b..dbbceb5bff34 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -30,6 +30,8 @@
 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - tools/GoogleTest_tools_pathutils.mk tools/Module_tools.mk tools/qa

2019-03-31 Thread Damjan Jovanovic (via logerrit)
 tools/GoogleTest_tools_pathutils.mk |   46 
 tools/Module_tools.mk   |1 
 tools/qa/test_pathutils.cxx |   27 -
 3 files changed, 63 insertions(+), 11 deletions(-)

New commits:
commit e665db4362b177a38f07a8392ebbb8f99ef6b6e9
Author: Damjan Jovanovic 
AuthorDate: Sun Mar 31 18:17:42 2019 +
Commit: Damjan Jovanovic 
CommitDate: Sun Mar 31 18:17:42 2019 +

Port a main/tools unit test from cppunit to gtest.

Patch by: me

diff --git a/tools/GoogleTest_tools_pathutils.mk 
b/tools/GoogleTest_tools_pathutils.mk
new file mode 100644
index ..58e0c6f5f897
--- /dev/null
+++ b/tools/GoogleTest_tools_pathutils.mk
@@ -0,0 +1,46 @@
+#**
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+
+$(eval $(call gb_GoogleTest_GoogleTest,tools_pathutils))
+ 
+$(eval $(call gb_GoogleTest_add_exception_objects,tools_pathutils, \
+   tools/qa/test_pathutils \
+))
+ 
+$(eval $(call gb_GoogleTest_add_linked_libs,tools_pathutils, \
+stl \
+tl \
+$(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_GoogleTest_add_linked_static_libs,tools_pathutils, \
+ooopathutils \
+))
+ 
+$(eval $(call gb_GoogleTest_set_include,tools_pathutils,\
+   $$(INCLUDE) \
+   -I$(SRCDIR)/inc \
+   -I$(SRCDIR)/tools/inc/pch \
+))
+ 
+# vim: set noet sw=4 ts=4:
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index 53a984177ad8..5f4ec4c6f488 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_targets,tools,\
 ifeq ($(ENABLE_UNIT_TESTS),YES)
 $(eval $(call gb_Module_add_check_targets,tools,\
 GoogleTest_tools_fractiontest \
+GoogleTest_tools_pathutils \
 ))
 endif
 
diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx
index 2d771a1a3324..4e59b445b1f6 100644
--- a/tools/qa/test_pathutils.cxx
+++ b/tools/qa/test_pathutils.cxx
@@ -26,7 +26,7 @@
 
 #include 
 
-#include "testshl/simpleheader.hxx"
+#include "gtest/gtest.h"
 #include "tools/pathutils.hxx"
 
 namespace {
@@ -38,8 +38,8 @@ void buildPath(
 wchar_t p[MAX_PATH];
 wchar_t * e = tools::buildPath(
 p, front, front + std::wcslen(front), back, std::wcslen(back));
-CPPUNIT_ASSERT_EQUAL(p + std::wcslen(path), e);
-CPPUNIT_ASSERT_EQUAL(0, std::wcscmp(path, p));
+ASSERT_EQ(p + std::wcslen(path), e);
+ASSERT_EQ(0, std::wcscmp(path, p));
 #else
 (void) front;
 (void) back;
@@ -47,16 +47,18 @@ void buildPath(
 #endif
 }
 
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
 public:
-void testBuildPath();
+void SetUp()
+{
+}
 
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testBuildPath);
-CPPUNIT_TEST_SUITE_END();
+void TearDown()
+{
+}
 };
 
-void Test::testBuildPath() {
+TEST_F(Test, testBuildPath) {
 buildPath(L"a:\\b\\", L"..", L"a:\\");
 buildPath(L"a:\\b\\", L"..\\", L"a:\\");
 buildPath(L"a:\\b\\c\\", L"..\\..\\..\\d", L"a:\\..\\d");
@@ -65,8 +67,11 @@ void Test::testBuildPath() {
 buildPath(L"", L"..\\a", L"..\\a");
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+}
 
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
 }
 
-NOADDITIONAL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Introduction

2019-03-31 Thread Gayatri Palkar
Hello,

My name is Gayatri Palkar.

I am a 2nd Year Undergraduate in Cummins College of Engineering, Pune, India


My email: gayatripalkarh...@gmail.com

My Linkedin Profile: https://www.linkedin.com/in/gayatri-palkar-9a3509180

My nickname on Libreoffice IRC channel: Gayatri Palkar


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - cui/source

2019-03-31 Thread Andras Timar (via logerrit)
 cui/source/dialogs/hlmailtp.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit dfd740287c9e21b8d2d9f04a10dafd12f2b63b0c
Author: Andras Timar 
AuthorDate: Sat Mar 30 17:24:08 2019 +0100
Commit: Tor Lillqvist 
CommitDate: Sun Mar 31 21:15:34 2019 +0300

tdf#124362 hide Addressbook button in Online

Change-Id: If066c4440c7add08836fa3ebb569ffc36969072e
Reviewed-on: https://gerrit.libreoffice.org/69966
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
(cherry picked from commit 1d35b89e7581e12024769d19bfb6d6eb2c3274b8)

diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 303407da84b6..5ccd90a35a9b 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -28,6 +28,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 
 /*
@@ -63,7 +65,8 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window 
*pParent, IconChoiceDialog*
 m_pBtAdrBook->SetClickHdl  ( LINK ( this, SvxHyperlinkMailTp, 
ClickAdrBookHdl_Impl ) );
 m_pCbbReceiver->SetModifyHdl   ( LINK ( this, SvxHyperlinkMailTp, 
ModifiedReceiverHdl_Impl) );
 
-if ( !SvtModuleOptions().IsModuleInstalled( 
SvtModuleOptions::EModule::DATABASE ) )
+if ( !SvtModuleOptions().IsModuleInstalled( 
SvtModuleOptions::EModule::DATABASE ) ||
+ comphelper::LibreOfficeKit::isActive() )
 m_pBtAdrBook->Hide();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-31 Thread Andras Timar (via logerrit)
 cui/source/dialogs/hlmailtp.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1d35b89e7581e12024769d19bfb6d6eb2c3274b8
Author: Andras Timar 
AuthorDate: Sat Mar 30 17:24:08 2019 +0100
Commit: Tor Lillqvist 
CommitDate: Sun Mar 31 20:09:10 2019 +0200

tdf#124362 hide Addressbook button in Online

Change-Id: If066c4440c7add08836fa3ebb569ffc36969072e
Reviewed-on: https://gerrit.libreoffice.org/69966
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 89809a3b394a..dda7b82b4565 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -27,6 +27,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 
 /*
@@ -59,7 +61,8 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window 
*pParent, IconChoiceDialog*
 m_pBtAdrBook->SetClickHdl  ( LINK ( this, SvxHyperlinkMailTp, 
ClickAdrBookHdl_Impl ) );
 m_pCbbReceiver->SetModifyHdl   ( LINK ( this, SvxHyperlinkMailTp, 
ModifiedReceiverHdl_Impl) );
 
-if ( !SvtModuleOptions().IsModuleInstalled( 
SvtModuleOptions::EModule::DATABASE ) )
+if ( !SvtModuleOptions().IsModuleInstalled( 
SvtModuleOptions::EModule::DATABASE ) ||
+ comphelper::LibreOfficeKit::isActive() )
 m_pBtAdrBook->Hide();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-31 Thread Mike Kaganski (via logerrit)
 embeddedobj/source/msole/olecomponent.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 5e30823e8a25066aa7bbaa801583dbfa7db55a72
Author: Mike Kaganski 
AuthorDate: Sun Mar 31 18:11:27 2019 +0300
Commit: Mike Kaganski 
CommitDate: Sun Mar 31 18:10:42 2019 +0200

tdf#120703 PVS: GetBitmapBits does not return required buffer size

... unlike GetMetaFileBitsEx or GetEnhMetaFileBits, which are used
in the other branches. The implementation is trying to pass nullptr
to the function since commit 41e72962df83a410986fb48250aaaf1adc827c13

Just calculate the required buffer size using BITMAP struct filled
by GetObject call.

V575 The null pointer is passed into 'GetBitmapBits' function.
 Inspect the third argument.

Change-Id: I0d164694c99d805fd59b65ea1b4df4919a89e130
Reviewed-on: https://gerrit.libreoffice.org/70012
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/embeddedobj/source/msole/olecomponent.cxx 
b/embeddedobj/source/msole/olecomponent.cxx
index a8fad97a35a7..f1511d696f7b 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -334,7 +334,13 @@ bool OleComponentNative_Impl::ConvertDataForFlavor( const 
STGMEDIUM& aMedium,
 else if ( aMedium.tymed == TYMED_GDI ) // Bitmap
 {
 aFormat = "image/x-MS-bmp";
-nBufSize = GetBitmapBits( aMedium.hBitmap, 0, nullptr );
+
+// Find out size of buffer: deprecated GetBitmapBits does not have 
a mode to return
+// required buffer size
+BITMAP aBmp;
+GetObjectW(aMedium.hBitmap, sizeof(aBmp), &aBmp);
+nBufSize = aBmp.bmWidthBytes * aBmp.bmHeight;
+
 pBuf.reset(new sal_Int8[nBufSize]);
 if ( nBufSize && nBufSize == sal::static_int_cast< ULONG >( 
GetBitmapBits( aMedium.hBitmap, nBufSize, pBuf.get() ) ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source jvmfwk/plugins odk/source sal/osl setup_native/source soltools/mkdepend vcl/source vcl/win

2019-03-31 Thread Mike Kaganski (via logerrit)
 desktop/source/lib/init.cxx   |   13 
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx   |2 
 odk/source/unoapploader/win/unoapploader.c|3 +
 sal/osl/w32/file_dirvol.cxx   |   28 
++
 sal/osl/w32/file_url.cxx  |2 
 sal/osl/w32/pipe.cxx  |2 
 sal/osl/w32/security.cxx  |2 
 setup_native/source/win32/customactions/regactivex/regactivex.cxx |3 +
 setup_native/source/win32/customactions/sellang/sellang.cxx   |2 
 setup_native/source/win32/customactions/tools/checkversion.cxx|2 
 soltools/mkdepend/main.c  |4 +
 vcl/source/fontsubset/sft.cxx |   14 ++---
 vcl/win/gdi/salprn.cxx|1 
 13 files changed, 60 insertions(+), 18 deletions(-)

New commits:
commit 3b25ea6d83041c03d06a47fb5e278372181b8a6d
Author: Mike Kaganski 
AuthorDate: Sun Mar 31 16:45:29 2019 +0300
Commit: Mike Kaganski 
CommitDate: Sun Mar 31 16:43:44 2019 +0200

tdf#120703 PVS: Silence V575 warnings

V575 The potential null pointer is passed into 'foo' function

Add asserts to those cases that are related to OOM cases. There's
nothing to be done if the assertions fail anyway.

Change-Id: I92ac95d44f512aa1948b1552b0e1f6da695a9f92
Reviewed-on: https://gerrit.libreoffice.org/70008
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index dfbbdd8386dc..ba77d5ad10d3 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2239,6 +2239,7 @@ static char* doc_getPartInfo(LibreOfficeKitDocument* 
pThis, int nPart)
 OString aString = OUStringToOString(aPartInfo, RTL_TEXTENCODING_UTF8);
 
 char* pMemory = static_cast(malloc(aString.getLength() + 1));
+assert(pMemory); // Don't handle OOM conditions
 strcpy(pMemory, aString.getStr());
 return pMemory;
 }
@@ -2259,6 +2260,7 @@ static char* 
doc_getPartPageRectangles(LibreOfficeKitDocument* pThis)
 OUString sRectangles = pDoc->getPartPageRectangles();
 OString aString = OUStringToOString(sRectangles, RTL_TEXTENCODING_UTF8);
 char* pMemory = static_cast(malloc(aString.getLength() + 1));
+assert(pMemory); // Don't handle OOM conditions
 strcpy(pMemory, aString.getStr());
 return pMemory;
 
@@ -2280,6 +2282,7 @@ static char* doc_getPartName(LibreOfficeKitDocument* 
pThis, int nPart)
 OUString sName = pDoc->getPartName( nPart );
 OString aString = OUStringToOString(sName, RTL_TEXTENCODING_UTF8);
 char* pMemory = static_cast(malloc(aString.getLength() + 1));
+assert(pMemory); // Don't handle OOM conditions
 strcpy(pMemory, aString.getStr());
 return pMemory;
 
@@ -2301,6 +2304,7 @@ static char* doc_getPartHash(LibreOfficeKitDocument* 
pThis, int nPart)
 OUString sHash = pDoc->getPartHash(nPart);
 OString aString = OUStringToOString(sHash, RTL_TEXTENCODING_UTF8);
 char* pMemory = static_cast(malloc(aString.getLength() + 1));
+assert(pMemory); // Don't handle OOM conditions
 strcpy(pMemory, aString.getStr());
 return pMemory;
 
@@ -3100,6 +3104,7 @@ static char* doc_getTextSelection(LibreOfficeKitDocument* 
pThis, const char* pMi
 aRet = pDoc->getTextSelection("text/plain;charset=utf-8", 
aUsedMimeType);
 
 char* pMemory = static_cast(malloc(aRet.getLength() + 1));
+assert(pMemory); // Don't handle OOM conditions
 strcpy(pMemory, aRet.getStr());
 
 if (pUsedMimeType)
@@ -3215,6 +3220,7 @@ static char* getLanguages(const char* pCommand)
 std::stringstream aStream;
 boost::property_tree::write_json(aStream, aTree);
 char* pJson = static_cast(malloc(aStream.str().size() + 1));
+assert(pJson); // Don't handle OOM conditions
 strcpy(pJson, aStream.str().c_str());
 pJson[aStream.str().size()] = '\0';
 return pJson;
@@ -3253,6 +3259,7 @@ static char* getFonts (const char* pCommand)
 std::stringstream aStream;
 boost::property_tree::write_json(aStream, aTree);
 char* pJson = static_cast(malloc(aStream.str().size() + 1));
+assert(pJson); // Don't handle OOM conditions
 strcpy(pJson, aStream.str().c_str());
 pJson[aStream.str().size()] = '\0';
 return pJson;
@@ -3305,6 +3312,7 @@ static char* getFontSubset (const OString& aFontName)
 std::stringstream aStream;
 boost::property_tree::write_json(aStream, aTree);
 char* pJson = static_cast(malloc(aStream.str().size() + 1));
+assert(pJson); // Don't handle OOM conditions
 strcpy(pJson, aStream.str().c_str());
 pJson[aStream.str().size()] = '\0';
 return pJson;
@@ -3429,6 +3437,7 @@ static char* getStyles(LibreOfficeKitDocument* pThis, 
const 

Re: [Bug 123999] time change causes the return of "parameter index out of range... using mysql and J/connector

2019-03-31 Thread Drew Jensen
Howdy Dan,

You find all the daily builds at https://dev-builds.libreoffice.org/daily/

I install those in parallel on my system, which I figure you already know
how to do but for those who may not:
https://wiki.documentfoundation.org/Installing_in_parallel

Best wishes,

Drew


On Sat, Mar 30, 2019 at 9:11 PM Dan Lewis  wrote:

> I have run into a problem with this bug. I would like to download a daily
> build, but I do not know how. I have clicked on the link below, but I don't
> see any .deb files that I can download. I don't really know what it is that
> I am to download. (I use Ubuntu 18.04.) In fact, I do not see any builds
> available there. I could use some help so that I can test this patch to see
> if it works.
>
> Dan
> On 3/27/19 9:14 AM, bugzilla-dae...@bugs.documentfoundation.org wrote:
>
> *Comment # 17
>  on bug
> 123999  from
> Commit Notification  *
>
> Julien Nabet committed a patch related to this issue.
> It has been pushed to "libreoffice-6-2":
> https://git.libreoffice.org/core/+/15f4f8b7bfd666d69381696fe288da24302d2ecd%5E%21
> tdf#123999 : 
> ParameterNameSubstitution in mysqljdbc
>
> It will be available in 6.2.3.
>
> The patch should be included in the daily builds available 
> athttps://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
> information about daily builds can be found 
> at:https://wiki.documentfoundation.org/Testing_Daily_Builds
>
> Affected users are encouraged to test the fix and report feedback.
>
> --
> You are receiving this mail because:
>
>- You reported the bug.
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: kit/Kit.cpp net/ServerSocket.hpp net/Socket.cpp wsd/LOOLWSD.cpp

2019-03-31 Thread Libreoffice Gerrit user
 kit/Kit.cpp  |2 +-
 net/ServerSocket.hpp |4 
 net/Socket.cpp   |   19 ---
 wsd/LOOLWSD.cpp  |2 ++
 4 files changed, 15 insertions(+), 12 deletions(-)

New commits:
commit 9c02d82f7ccb4abb19dd40837418ac10a8da9040
Author: Tor Lillqvist 
AuthorDate: Sun Mar 31 14:34:24 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Mar 31 14:34:24 2019 +0300

Fix build in the MOBILEAPP case

Did not check how well it works.

Change-Id: I5ca1b349aafcfddaed517e51ca6bd25e9749779d

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index ff4a3a7ed..42663d3ee 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2530,7 +2530,7 @@ void lokit_main(
 #if !MOBILEAPP
 mainKit.insertNewUnixSocket(MasterLocation, pathAndQuery, 
websocketHandler);
 #else
-mainKit.insertNewFakeSocketSync(docBrokerSocket, websocketHandler);
+mainKit.insertNewFakeSocket(docBrokerSocket, websocketHandler);
 #endif
 
 LOG_INF("New kit client websocket inserted.");
diff --git a/net/ServerSocket.hpp b/net/ServerSocket.hpp
index dd07af4fe..ff4d4aa26 100644
--- a/net/ServerSocket.hpp
+++ b/net/ServerSocket.hpp
@@ -96,6 +96,8 @@ protected:
 std::shared_ptr _sockFactory;
 };
 
+#if !MOBILEAPP
+
 /// A non-blocking, streaming Unix Domain Socket for local use
 class LocalServerSocket : public ServerSocket
 {
@@ -114,4 +116,6 @@ private:
 
 #endif
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/net/Socket.cpp b/net/Socket.cpp
index 02fb7f972..441128f16 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -200,6 +200,8 @@ void SocketPoll::wakeupWorld()
 wakeup(fd);
 }
 
+#if !MOBILEAPP
+
 void SocketPoll::insertNewWebSocketSync(
 const Poco::URI &uri,
 const std::shared_ptr& websocketHandler)
@@ -331,7 +333,8 @@ void SocketPoll::insertNewUnixSocket(
 }
 }
 
-#if MOBILEAPP
+#else
+
 void SocketPoll::insertNewFakeSocket(
 int peerSocket,
 const std::shared_ptr& websocketHandler)
@@ -361,6 +364,7 @@ void SocketPoll::insertNewFakeSocket(
 }
 }
 }
+
 #endif
 
 void ServerSocket::dumpState(std::ostream& os)
@@ -539,6 +543,8 @@ std::shared_ptr ServerSocket::accept()
 return nullptr;
 }
 
+#if !MOBILEAPP
+
 int Socket::getPid() const
 {
 struct ucred creds;
@@ -553,11 +559,7 @@ int Socket::getPid() const
 
 std::shared_ptr LocalServerSocket::accept()
 {
-#if !MOBILEAPP
 const int rc = ::accept4(getFD(), nullptr, nullptr, SOCK_NONBLOCK);
-#else
-const int rc = fakeSocketAccept4(getFD());
-#endif
 try
 {
 LOG_DBG("Accepted prisoner socket #" << rc << ", creating socket 
object.");
@@ -565,7 +567,6 @@ std::shared_ptr LocalServerSocket::accept()
 return std::shared_ptr(nullptr);
 
 std::shared_ptr _socket = _sockFactory->create(rc);
-#if MOBILEAPP
 // Sanity check this incoming socket
 struct ucred creds;
 socklen_t credSize = sizeof(struct ucred);
@@ -592,7 +593,6 @@ std::shared_ptr LocalServerSocket::accept()
 std::shared_ptr _socket = _sockFactory->create(rc);
 LOG_DBG("Accepted socket is UDS - address " << addr <<
 " and pid/gid " << creds.pid << "/" << creds.gid);
-#endif
 return _socket;
 }
 catch (const std::exception& ex)
@@ -605,7 +605,6 @@ std::shared_ptr LocalServerSocket::accept()
 /// Returns true on success only.
 std::string LocalServerSocket::bind()
 {
-#if !MOBILEAPP
 int rc;
 struct sockaddr_un addrunix;
 do
@@ -625,12 +624,10 @@ std::string LocalServerSocket::bind()
 
 if (rc >= 0)
 return std::string(&addrunix.sun_path[1]);
-#endif
+
 return "";
 }
 
-#if !MOBILEAPP
-
 bool StreamSocket::parseHeader(const char *clientName,
Poco::MemoryInputStream &message,
Poco::Net::HTTPRequest &request,
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b4060d643..e7365eef2 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2900,12 +2900,14 @@ public:
 SocketPoll::InhibitThreadChecks = true;
 
 os << "LOOLWSDServer:\n"
+#if !MOBILEAPP
<< "  Ports: server " << ClientPortNumber
<<  " prisoner " << MasterLocation << "\n"
<< "  SSL: " << (LOOLWSD::isSSLEnabled() ? "https" : "http") << "\n"
<< "  SSL-Termination: " << (LOOLWSD::isSSLTermination() ? "yes" : 
"no") << "\n"
<< "  Security " << (LOOLWSD::NoCapsForKit ? "no" : "") << " 
chroot, "
 << (LOOLWSD::NoSeccomp ? "no" : "") << " api 
lockdown\n"
+#endif
<< "  TerminationFlag: " << TerminationFlag << "\n"
<< "  isShuttingDown: " << ShutdownRequestFlag << "\n"
<< "  NewChildren: " << NewChildren.size() << "\n"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-31 Thread Mark Hung (via logerrit)
 slideshow/source/engine/animationnodes/animationbasenode.cxx |   17 ++-
 slideshow/source/engine/animationnodes/animationbasenode.hxx |2 +
 slideshow/source/engine/animationnodes/basecontainernode.cxx |8 +
 slideshow/source/inc/animationnode.hxx   |7 
 slideshow/source/inc/basenode.hxx|7 ++--
 5 files changed, 37 insertions(+), 4 deletions(-)

New commits:
commit bf2f0c913774c90e4c9a65119d0219187bb4498c
Author: Mark Hung 
AuthorDate: Thu Mar 21 22:56:41 2019 +0800
Commit: Mark Hung 
CommitDate: Sun Mar 31 11:38:16 2019 +0200

tdf#73092 remove remaining shape of the repeating animation.

It is neccessary to set a drawshape to invisible (i.e. remove the
effect ) before the drawshape rewind, otherwise it remains at the
original place. The timenode container will ask its child to remove
the effect after all the child finished, before it start to repeat or
it deactivate.

Change-Id: Iaef1a8269b61afa0c37b03655e2ea169f1d3c453
Reviewed-on: https://gerrit.libreoffice.org/69543
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx 
b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 107ac68650a6..ed4d157c526f 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "nodetools.hxx"
@@ -52,6 +53,7 @@ AnimationBaseNode::AnimationBaseNode(
   mpShape(),
   mpShapeSubset(),
   mpSubsetManager(rContext.maContext.mpSubsettableShapeManager),
+  mbPreservedVisibility(true),
   mbIsIndependentSubset( rContext.mbIsIndependentSubset )
 {
 // extract native node targets
@@ -234,8 +236,11 @@ bool AnimationBaseNode::resolve_st()
 
 void AnimationBaseNode::activate_st()
 {
+AttributableShapeSharedPtr const pShape(getShape());
+mbPreservedVisibility = pShape->isVisible();
+
 // create new attribute layer
-maAttributeLayerHolder.createAttributeLayer( getShape() );
+maAttributeLayerHolder.createAttributeLayer(pShape);
 
 ENSURE_OR_THROW( maAttributeLayerHolder.get(),
   "Could not generate shape attribute layer" );
@@ -354,6 +359,16 @@ void AnimationBaseNode::deactivate_st( NodeState 
eDestState )
 }
 }
 
+void AnimationBaseNode::removeEffect()
+{
+if (!isDependentSubsettedShape()) {
+AttributableShapeSharedPtr const pShape(getShape());
+pShape->setVisibility(!mbPreservedVisibility);
+getContext().mpSubsettableShapeManager->notifyShapeUpdate( pShape );
+pShape->setVisibility(mbPreservedVisibility);
+}
+}
+
 bool AnimationBaseNode::hasPendingAnimation() const
 {
 // TODO(F1): This might not always be true. Are there 'inactive'
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx 
b/slideshow/source/engine/animationnodes/animationbasenode.hxx
index 55ec060ac4ad..7751642517aa 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.hxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx
@@ -46,6 +46,7 @@ public:
 #if defined(DBG_UTIL)
 virtual void showState() const override;
 #endif
+virtual void removeEffect() override;
 
 protected:
 virtual void dispose() override;
@@ -87,6 +88,7 @@ private:
 /// When valid, this is a subsetted target shape
 ShapeSubsetSharedPtrmpShapeSubset;
 SubsettableShapeManagerSharedPtr const  mpSubsetManager;
+boolmbPreservedVisibility;
 boolmbIsIndependentSubset;
 };
 
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx 
b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index e8e5dfbd7f88..02668ae7fd28 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -20,6 +20,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "nodetools.hxx"
@@ -161,6 +162,11 @@ bool BaseContainerNode::notifyDeactivatedChild(
 }
 if(mnLeftIterations >= 1.0 || mbRestart)
 {
+// SMIL spec said that "Accumulate" controls whether or not the 
animation
+// is cumulative, but XTimeContainer do not have this attribute, 
so always
+// remove the effect before next repeat.
+forEachChildNode(std::mem_fn(&AnimationNode::removeEffect), -1);
+
 if (mnLeftIterations >= 1.0)
 bFinished = false;
 
@@ -172,6 +178,8 @@ bool BaseContainerNode::notifyDeactivatedChild(
 }
 else if (isDurationIndefinite())
 {
+if (getFillMode() == animations::AnimationFill::REMOVE)
+forEa