[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - cui/uiconfig

2020-08-03 Thread Markus Mohrhard (via logerrit)
 cui/uiconfig/ui/movemenu.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 23397ecc1ee69462fbe0639c5ea105e2c0ec9a45
Author: Markus Mohrhard 
AuthorDate: Sat Aug 1 23:01:52 2020 +0800
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Aug 4 03:47:49 2020 +0200

correctly mark the "New menu" dialog as modal

The dialog is called from a modal dialog which means a modeless dialog
does not make sense. Some of our internal dialog tracking code is confused
by that case which confused the UI tests.

Change-Id: I705877e8a751c55bfbd00ddeaf18ab86c95321c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99944
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 3258603e8850900e04cecffb1113b833c4c76fd9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99929
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/uiconfig/ui/movemenu.ui b/cui/uiconfig/ui/movemenu.ui
index 7bb5be63309c..18a0712e67c1 100644
--- a/cui/uiconfig/ui/movemenu.ui
+++ b/cui/uiconfig/ui/movemenu.ui
@@ -25,6 +25,7 @@
 6
 New Menu
 dialog
+True
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-08-03 Thread Markus Mohrhard (via logerrit)
 cui/uiconfig/ui/movemenu.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3258603e8850900e04cecffb1113b833c4c76fd9
Author: Markus Mohrhard 
AuthorDate: Sat Aug 1 23:01:52 2020 +0800
Commit: Markus Mohrhard 
CommitDate: Mon Aug 3 21:31:26 2020 +0200

correctly mark the "New menu" dialog as modal

The dialog is called from a modal dialog which means a modeless dialog
does not make sense. Some of our internal dialog tracking code is confused
by that case which confused the UI tests.

Change-Id: I705877e8a751c55bfbd00ddeaf18ab86c95321c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99944
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/cui/uiconfig/ui/movemenu.ui b/cui/uiconfig/ui/movemenu.ui
index 7bb5be63309c..18a0712e67c1 100644
--- a/cui/uiconfig/ui/movemenu.ui
+++ b/cui/uiconfig/ui/movemenu.ui
@@ -25,6 +25,7 @@
 6
 New Menu
 dialog
+True
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


trying to fix the problem with hanging UI tests

2020-06-04 Thread Markus Mohrhard
Hey community,

as promised I looked into the problem with hanging UI tests and noticed
that there was a bug in the handling of the shutdown if the LibreOffice
instance can not handle an UNO based shutdown request. The most common case
for this is actually hitting an assert in the UI tests while a modal dialog
is open.

I have proposed https://gerrit.libreoffice.org/c/core/+/95300 but that
attempt was rejected by Stephan and Noel. As I'm currently not involved
enough any more I'll leave the decision about the patch with the community.
I think without the patch one can just remove the whole UI test suite as
you can not safely use an assert if a dialog is still open (or could not be
closed). The patch makes sure that actually after each test case the
soffice process will be either correctly closed or receives a SIGTERM.

A simple test case is attached to the gerrit request that will result in a
soffice process not being closed properly without the patch. As a result,
later test runs will try to use the user profile of the still running
soffice instance and fail immediately until the soffice process is killed
manually.

My impression from this interaction is that some community members would
prefer to get rid of the UI tests completely instead of trying to fix the
current issue with the tests. I have decided not to invest any more of my
spare free time into this.

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


Re: GSoC'20 Introduction

2020-05-18 Thread Markus Mohrhard
Hey Ahmed,

On Fri, May 15, 2020 at 12:41 PM ahmed El-Shreif 
wrote:

> Hello,
>
> I am Ahmed ElShreif a senior computer engineering student from Egypt. I am
> really happy to share with all of LO community that I am accepted this year
> again in GSoC.
>
> I was a GSoC'19 student with LO in this project [1]. And I am really happy
> to have the chance to work with LO community again. I would like to thank
> Markus Mohrhard and Xisco Fauli for the support and help that they always
> give to me.
>
> As we have in LO logger system that can log user interaction so my last
> year project was mainly about implementing new DSL that we could log all
> user action in its syntax then transpile it to python UITest that we can
> use in testing.
>
> This year project [2] is to extending the ability of the uitest to cover
> the unsupported items that can be found here[3] and add them to the logger
> system that we have with the new DSL. This will give more coverage for more
> features in our testing in the future.
>
> I am willing to make a blog about the project and provide weekly report
> about the status of the project and share it here. I am really hope to make
> great achievements this summer with LO.
>
> I am interested to hear all your feedbacks and comments about the 2
> projects. And I will be really happy to answer any question related to them
> on my mail or on the IRC:"shiko". Thanks everyone.
>
> [1]
> https://summerofcode.withgoogle.com/archive/2019/projects/4762543371845632/
> [2]https://summerofcode.withgoogle.com/projects/#5349139656736768
> [3]
> https://wiki.documentfoundation.org/Development/UITests#Unsupported_ui_items
>


Great to have you on board again and looking forward to an awesome summer.

Cheers,
Markus

>
> Regards,
> Ahmad ElShreif
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: cppunit

2020-03-28 Thread Markus Mohrhard
Hey David,


On Sun, Mar 29, 2020 at 8:29 AM David Wiseman  wrote:

> Hi,
>
>As a developer, if make a contribution to the cppunit project, is it
> just required that it builds, or are there tests that I should run.  And I
> guess I would contribute to the test suite also.   Can you tell me if there
> is a review procedure for contributions?
>


make check needs to pass.

The code will need to be pushed to gerrit, our reviewing platform, where it
will be reviewed and finally pushed.

Cheers,
Markus

>
>
> Thanks,
>
> David
> Please see our Privacy Policy (https://www.iee.lu/en/privacy-policy) to
> learn how we handle personal data. This e-mail may contain trade secrets or
> privileged, undisclosed or otherwise confidential information. If you are
> not the intended recipient and have received this e-mail in error, you are
> hereby notified that any review, copying or distribution of it is strictly
> prohibited. Please inform us immediately and destroy the original
> transmittal from your system. Thank you for your co-operation.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice-qa] ESC meeting minutes: 2020-03-05

2020-03-05 Thread Markus Mohrhard
Hey,

* Changing the default ‘make’ target (Lubos)
>   + https://gerrit.libreoffice.org/c/core/+/89820
>   + keeping ‘make check’ unchanged
>   + plain ‘make’ would just build, not run tests
>   + buildbot owners: need to run ‘make unitcheck slowcheck’ on
> Windows/macOS, not just plain ‘make’ to avoid loosing test coverage
>
>
Is there still a reason to have independent unitcheck and slowcheck
targets? They are historically different because a default module level
make would only execute the unitcheck and not the slowcheck target but if a
module level make is not executing a unitcheck anymore, slowcheck can just
be merged into unitcheck.

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


Re: Cppunit 1.15.0 and Cppunit 1.15.1 aren't tagged in GIT repo

2020-02-17 Thread Markus Mohrhard
Hey,

On Mon, Feb 17, 2020 at 7:51 PM Christian Madsen 
wrote:

> The two mentioned versions aren’t tagged in the git://
> anongit.freedesktop.org/git/libreoffice/cppunit/ repository.
>
>
>
> The last tagged version is cppunit-1.14.0.
>

they are at least tagged in the pushed version at
https://gerrit.libreoffice.org/plugins/gitiles/cppunit

I'll need to check why the sync between the repos is not updating the tags.
For now if you need the tags best to use the gerrit version and I'll try to
figure out why our repository replication is not syncing the tags anymore.

Cheers,
Markus

>
>
> Kind Regards,
>
> Christian Madsen
> ___
> 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


cppunit updated to 1.15.1 with new features

2019-12-24 Thread Markus Mohrhard
Hey,

I just updated cppunit to 1.15.1 in master which includes at least two new
features for LibreOffice:

* Noel's patch to allow custom string formatter to allow e.g. OUString in
the CPPUNIT_ASSERT_MESSAGE message part (
https://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=1caa3a0c66f009fe1a386d7559dc25054dad42a3
)
* Miklos' patch to add CPPUNIT_TEST_FIXTURE which allows us to remove the
corresponding LibreOffice patch

If you find any issues please let me know.

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


[Libreoffice-commits] core.git: download.lst external/cppunit

2019-12-24 Thread Markus Mohrhard (via logerrit)
 download.lst|4 
 external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1 |   57 
--
 external/cppunit/UnpackedTarball_cppunit.mk |6 -
 external/cppunit/gcc9.patch.0   |   11 -
 external/cppunit/windows.patch  |   12 +-
 5 files changed, 9 insertions(+), 81 deletions(-)

New commits:
commit ffe9ff2cf63112ac04a695740a5637f25c16abe8
Author: Markus Mohrhard 
AuthorDate: Fri Dec 20 01:28:54 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Tue Dec 24 20:45:53 2019 +0100

update cppunit to 1.15.1

Change-Id: Ic27a77addb409a8d63ea44136a8d2410ee40c4d2
Reviewed-on: https://gerrit.libreoffice.org/85539
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/download.lst b/download.lst
index fdd0b866c373..690f43cc419d 100644
--- a/download.lst
+++ b/download.lst
@@ -25,8 +25,8 @@ export LIBCMIS_SHA256SUM := 
d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d874
 export LIBCMIS_TARBALL := libcmis-0.5.2.tar.xz
 export COINMP_SHA256SUM := 
86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f
 export COINMP_TARBALL := CoinMP-1.7.6.tgz
-export CPPUNIT_SHA256SUM := 
3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780
-export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
+export CPPUNIT_SHA256SUM := 
89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7
+export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
 export CURL_SHA256SUM := 
7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd
diff --git a/external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1 
b/external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1
deleted file mode 100644
index 70ede229a3e6..
--- a/external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1
+++ /dev/null
@@ -1,57 +0,0 @@
-From c955b1041b9e3ebe7ee8a620340b78bddc820682 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann 
-Date: Fri, 1 Feb 2019 13:37:59 +0100
-Subject: [PATCH] Unconditionally use C++11 [[noreturn]]
-
-This helps avoid issues like <https://gerrit.libreoffice.org/plugins/gitiles/
-core/+/9808486a89c6368f836579f8d8c0dda63fd0063c%5E%21> "Avoid
--Werror,-Wimplicit-fallthrough with clang-cl ...where CPPUNIT_FAIL is marked as
-noreturn only for __GNUC__".
-
-Change-Id: Idb33af7375f103f2dd7a7b4c3dbf20ce731b17ad

- include/cppunit/Asserter.h | 12 +++-
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h
-index 3321b87..dd39ead 100644
 a/include/cppunit/Asserter.h
-+++ b/include/cppunit/Asserter.h
-@@ -43,23 +43,17 @@ class Message;
-  * \endcode
-  */
- 
--#if defined __GNUC__
--#   define NORETURN __attribute__((noreturn))
--#else
--#   define NORETURN
--#endif
--
- struct Asserter
- {
-   /*! \brief Throws a Exception with the specified message and location.
-*/
--  NORETURN static void CPPUNIT_API fail( const Message , 
-+  [[noreturn]] static void CPPUNIT_API fail( const Message , 
- const SourceLine  = SourceLine() );
- 
-   /*! \brief Throws a Exception with the specified message and location.
-* \deprecated Use fail( Message, SourceLine ) instead.
-*/
--  NORETURN static void CPPUNIT_API fail( std::string message, 
-+  [[noreturn]] static void CPPUNIT_API fail( std::string message, 
- const SourceLine  = SourceLine() );
- 
-   /*! \brief Throws a Exception with the specified message and location.
-@@ -165,7 +159,7 @@ struct Asserter
-*  what are the differences between the expected 
and actual value.
-* \param shortDescription Short description for the failure message.
-*/
--  NORETURN static void CPPUNIT_API failNotEqual( std::string expected, 
-+  [[noreturn]] static void CPPUNIT_API failNotEqual( std::string expected, 
- std::string actual, 
- const SourceLine ,
- const AdditionalMessage 
 = AdditionalMessage(),
--- 
-2.20.1
-
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index 649ba8fc4063..24f75b43415f 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -13,18 +13,12 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,cppunit))
 
-# gcc9.patch.0 addressed upstream with <https://gerrit.libreoffice.org/58690> 
"Avoid GCC 9
-#  -Wdeprecated-copy":
-# 0001-Unconditionally-use-C-11-nore

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

2019-12-20 Thread Markus Mohrhard (via logerrit)
 sc/uiconfig/scalc/menubar/menubar.xml |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 24939a5b43b9fe889c3aace027c668666ff61987
Author: Markus Mohrhard 
AuthorDate: Fri Dec 20 02:56:20 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Fri Dec 20 19:38:53 2019 +0100

the data provider feature is not ready for production

Change-Id: Idca4b9dbde4fed2524c186851cb44d95953181ec
Reviewed-on: https://gerrit.libreoffice.org/85541
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index d1d8069b50e2..d029db790622 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -642,8 +642,6 @@
   
   
   
-  
-  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: a developer's goodbye

2019-10-14 Thread Markus Mohrhard
Hello Winfried,

it was a pleasure working with you and you will always be part of the Calc
team. It is sad that we never managed to meet in person (I think we missed
each other by a few minutes at one FOSDEM) so I could not tell your in
person how much I have appreciated your dedication to your work on Calc's
formula engine.

I wish you all the best.

Cheers,
Markus

On Fri, Oct 11, 2019 at 9:02 PM Winfried Donkers <
winfried.libreoff...@gmail.com> wrote:

> Hi all,
>
> The past 8 years I have had the honour and pleasure to contribute as
> developer to LibreOffice (mainly Calc).
>
> Alas, because of health reasons I must end my contributions.
>
> It was great to be part of a large community focussed on making a great
> open source project a success.
>
> Thank you all!
>
>
> Winfried
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/chart-style-experiment-markus' - chart2/source

2019-08-27 Thread Markus Mohrhard (via logerrit)
 chart2/source/inc/OPropertySet.hxx   |2 ++
 chart2/source/tools/OPropertySet.cxx |   20 
 2 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 7c5dd833e1f62a1cae9ce4ae804146032bd5e841
Author: Markus Mohrhard 
AuthorDate: Wed Aug 28 00:35:03 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Wed Aug 28 00:35:03 2019 +0800

the default value now needs to come from the style if the style is available

Change-Id: I54b3563aabcde71e7bcddacc8a7a5b1a9eb70ccd

diff --git a/chart2/source/inc/OPropertySet.hxx 
b/chart2/source/inc/OPropertySet.hxx
index 12a55c677661..50e40b9fa082 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -69,6 +69,8 @@ protected:
  */
 virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const = 0;
 
+css::uno::Any GetDefault(sal_Int32 nHandle) const;
+
 /** The InfoHelper table contains all property names and types of
 this object.
 
diff --git a/chart2/source/tools/OPropertySet.cxx 
b/chart2/source/tools/OPropertySet.cxx
index fe4c69700fad..33ed2bcb0a53 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -105,6 +105,18 @@ Sequence< sal_Int8 > SAL_CALL
 return css::uno::Sequence();
 }
 
+Any OPropertySet::GetDefault(sal_Int32 nHandle) const
+{
+Reference xStyle = m_pImplProperties->GetStyle();
+if (xStyle.is())
+{
+css::uno::Reference 
xStylePropSet(xStyle, css::uno::UNO_QUERY);
+return xStylePropSet->getFastPropertyValue(nHandle);
+}
+
+return GetDefaultValue(nHandle);
+}
+
 //  XPropertyState 
 beans::PropertyState SAL_CALL
 OPropertySet::getPropertyState( const OUString& PropertyName )
@@ -143,7 +155,7 @@ Any SAL_CALL
 {
 cppu::IPropertyArrayHelper & rPH = getInfoHelper();
 
-return GetDefaultValue( rPH.getHandleByName( aPropertyName ) );
+return GetDefault( rPH.getHandleByName( aPropertyName ) );
 }
 
 //  XMultiPropertyStates 
@@ -184,7 +196,7 @@ Sequence< Any > SAL_CALL
 
 for( ; nI < nElements; ++nI )
 {
-pResultArray[ nI ] = GetDefaultValue(
+pResultArray[ nI ] = GetDefault(
 rPH.getHandleByName( aPropertyNames[ nI ] ));
 }
 
@@ -242,7 +254,7 @@ void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast
 Any aDefault;
 try
 {
-aDefault = GetDefaultValue( nHandle );
+aDefault = GetDefault( nHandle );
 }
 catch( const beans::UnknownPropertyException& )
 {
@@ -322,7 +334,7 @@ void SAL_CALL OPropertySet::getFastPropertyValue
 // => take the default value
 try
 {
-rValue = GetDefaultValue( nHandle );
+rValue = GetDefault( nHandle );
 }
 catch( const beans::UnknownPropertyException& )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 28 commits - include/vcl sc/source sd/source sfx2/source sw/source uitest/ui_logger_dsl vcl/source

2019-08-19 Thread Markus Mohrhard (via logerrit)
 include/vcl/uitest/logger.hxx  |   44 +
 sc/source/core/data/document.cxx   |   18 
 sc/source/ui/view/viewdata.cxx |   20 
 sc/source/ui/view/viewfun2.cxx |   26 
 sc/source/ui/view/viewfun3.cxx |   34 
 sc/source/ui/view/viewfunc.cxx |   28 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |   29 
 sd/source/ui/slidesorter/model/SlideSorterModel.cxx|   22 
 sfx2/source/control/unoctitm.cxx   |4 
 sw/source/core/edit/edtab.cxx  |   20 
 sw/source/uibase/dochdl/swdtflvr.cxx   |   24 
 sw/source/uibase/wrtsh/wrtsh1.cxx  |   17 
 uitest/ui_logger_dsl/General_commands.tx   |   29 
 uitest/ui_logger_dsl/Special_commands.tx   |  209 ++
 uitest/ui_logger_dsl/UI_Object_commands.tx |   65 +
 uitest/ui_logger_dsl/dialog_commands.tx|   24 
 uitest/ui_logger_dsl/dsl_core.py   |  581 +
 uitest/ui_logger_dsl/example.ul|   34 
 uitest/ui_logger_dsl/starter_commands.tx   |   13 
 uitest/ui_logger_dsl/type_options.tx   |9 
 uitest/ui_logger_dsl/ui_logger_dsl_grammar.tx  |   29 
 uitest/ui_logger_dsl/uno_commands.tx   |   17 
 vcl/source/uitest/logger.cxx   |  359 +-
 vcl/source/uitest/uiobject.cxx |  132 +++
 vcl/source/window/dialog.cxx   |6 
 25 files changed, 1711 insertions(+), 82 deletions(-)

New commits:
commit 739c370522df4d48898b924e3c29957054f71a78
Author: Markus Mohrhard 
AuthorDate: Mon Aug 19 01:30:26 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Mon Aug 19 22:56:40 2019 +0800

uitest: pass OUString by const reference and formatting fixes

Change-Id: I55eca745a84998c74e2d925ed53af20382d98289

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index fd996eb3d4cb..841cb3574213 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -109,21 +109,6 @@ using ::std::set;
 
 namespace {
 
-void collectUIInformation(const std::map& 
aParameters,const OUString action)
-{
-EventDescription aDescription;
-aDescription.aID = "grid_window";
-aDescription.aAction = action;
-aDescription.aParameters = aParameters;
-aDescription.aParent = "MainWindow";
-aDescription.aKeyWord = "ScGridWinUIObject";
-
-UITestLogger::getInstance().logEvent(aDescription);
-}
-}
-
-namespace {
-
 std::pair getMarkedTableRange(const 
std::vector& rTables, const ScMarkData& rMark)
 {
 SCTAB nTabStart = MAXTAB;
@@ -145,6 +130,18 @@ std::pair getMarkedTableRange(const 
std::vector&
 return std::pair(nTabStart,nTabEnd);
 }
 
+void collectUIInformation(const std::map& aParameters, 
const OUString& rAction)
+{
+EventDescription aDescription;
+aDescription.aID = "grid_window";
+aDescription.aAction = rAction;
+aDescription.aParameters = aParameters;
+aDescription.aParent = "MainWindow";
+aDescription.aKeyWord = "ScGridWinUIObject";
+
+UITestLogger::getInstance().logEvent(aDescription);
+}
+
 }
 
 struct ScDefaultAttr
@@ -913,7 +910,9 @@ bool ScDocument::RenameTab( SCTAB nTab, const OUString& 
rName, bool bExternalDoc
 }
 }
 }
-collectUIInformation({{"NewName",rName}},"Rename_Sheet");
+
+collectUIInformation({{"NewName", rName}}, "Rename_Sheet");
+
 return bValid;
 }
 
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 56865508373a..e15ca40404d6 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -91,11 +91,11 @@ void lcl_LOKRemoveWindow(ScTabViewShell* pTabViewShell, 
ScSplitPos eWhich)
 
 namespace {
 
-void collectUIInformation(const std::map& 
aParameters,const OUString action)
+void collectUIInformation(const std::map& aParameters, 
const OUString& rAction)
 {
 EventDescription aDescription;
 aDescription.aID = "grid_window";
-aDescription.aAction = action;
+aDescription.aAction = rAction;
 aDescription.aParameters = aParameters;
 aDescription.aParent = "MainWindow";
 aDescription.aKeyWord = "ScGridWinUIObject";
@@ -857,7 +857,8 @@ void ScViewData::InsertTab( SCTAB nTab )
 
 UpdateCurrentTab();
 mpMarkData->InsertTab( nTab );
-collectUIInformation({{}},"InsertTab");
+
+collectUIInformation({{}}, "InsertTab");
 }
 
 void ScViewData::InsertTabs( SCTAB nTab, SCTAB nNewSheets )
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 831e4c7dd8ee..ac926e722bb

[Libreoffice-commits] core.git: Branch 'feature/gsoc-uitest-2019' - include/vcl vcl/source

2019-08-18 Thread Markus Mohrhard (via logerrit)
Rebased ref, commits from common ancestor:
commit 68973ed3d9d5e125fc7142e512c10d97dd41b865
Author: Markus Mohrhard 
AuthorDate: Sun Aug 18 23:34:32 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Mon Aug 19 00:35:10 2019 +0800

uitest: fixed for formatting and plugin stringconstant

Change-Id: Id657c19223f20d1175f9a774357e8b1f11344fdf

diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 6c8c5008541a..450285c5c247 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -15,10 +15,32 @@
 #include 
 #include 
 
-namespace com { namespace sun { namespace star {
-namespace beans { struct PropertyValue; }
-} } }
-namespace com { namespace sun { namespace star { namespace uno { template 
 class Sequence; } } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+struct PropertyValue;
+}
+}
+}
+}
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+template  class Sequence;
+}
+}
+}
+}
 
 struct EventDescription;
 class Control;
@@ -27,7 +49,6 @@ class KeyEvent;
 class UITEST_DLLPUBLIC UITestLogger
 {
 private:
-
 SvFileStream maStream;
 
 bool mbValid;
@@ -35,29 +56,24 @@ private:
 OUString app_name;
 
 public:
-
 UITestLogger();
 
-void logCommand(const OUString& rAction, const 
css::uno::Sequence& rArgs);
+void logCommand(const OUString& rAction,
+const css::uno::Sequence& 
rArgs);
 
-void logAction(VclPtr const & xUIElement, VclEventId nEvent);
+void logAction(VclPtr const& xUIElement, VclEventId nEvent);
 
 void log(const OUString& rString);
 
-void logKeyInput(VclPtr const & xUIElement, const KeyEvent& 
rEvent);
+void logKeyInput(VclPtr const& xUIElement, const KeyEvent& 
rEvent);
 
 void logEvent(const EventDescription& rDescription);
 
 static UITestLogger& getInstance();
 
-void setAppName(OUString name){
-app_name=name;
-}
-
-OUString getAppName(){
-return app_name;
-}
+void setAppName(OUString name) { app_name = name; }
 
+OUString getAppName() { return app_name; }
 };
 
 #endif
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 0ecd673f9879..03c439fcbd7c 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -20,9 +20,9 @@
 #include 
 #include 
 
-namespace{
-
-bool isDialogWindow(vcl::Window const * pWindow)
+namespace
+{
+bool isDialogWindow(vcl::Window const* pWindow)
 {
 WindowType nType = pWindow->GetType();
 // DIALOG to MODALDIALOG
@@ -39,7 +39,7 @@ bool isDialogWindow(vcl::Window const * pWindow)
 return false;
 }
 
-bool isTopWindow(vcl::Window const * pWindow)
+bool isTopWindow(vcl::Window const* pWindow)
 {
 WindowType eType = pWindow->GetType();
 if (eType == WindowType::FLOATINGWINDOW)
@@ -60,17 +60,16 @@ vcl::Window* get_top_parent(vcl::Window* pWindow)
 
 return get_top_parent(pParent);
 }
-
-
 }
-UITestLogger::UITestLogger():
-maStream(),
-mbValid(false)
+UITestLogger::UITestLogger()
+: maStream()
+, mbValid(false)
 {
 static const char* pFile = std::getenv("LO_COLLECT_UIINFO");
 if (pFile)
 {
-OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/uitest/");
+OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER
+  "/" SAL_CONFIGFILE("bootstrap") 
":UserInstallation}/uitest/");
 rtl::Bootstrap::expandMacros(aDirPath);
 osl::Directory::createPath(aDirPath);
 OUString aFilePath = aDirPath + OUString::fromUtf8(pFile);
@@ -80,7 +79,8 @@ UITestLogger::UITestLogger():
 }
 }
 
-void UITestLogger::logCommand(const OUString& rAction, const 
css::uno::Sequence< css::beans::PropertyValue >& rArgs)
+void UITestLogger::logCommand(const OUString& rAction,
+  const 
css::uno::Sequence& rArgs)
 {
 if (!mbValid)
 return;
@@ -126,10 +126,10 @@ void UITestLogger::logCommand(const OUString& rAction, 
const css::uno::Sequence<
 maStream.WriteLine(OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8));
 }
 
-namespace {
-
+namespace
+{
 // most likely this should be recursive
-bool child_windows_have_focus(VclPtr const & xUIElement)
+bool child_windows_have_focus(VclPtr const& xUIElement)
 {
 sal_Int32 nCount = xUIElement->GetChildCount();
 for (sal_Int32 i = 0; i < nCount; ++i)
@@ -144,10 +144,9 @@ bool child_windows_have_focus(VclPtr const & 
xUIElement)
 }
 return false;
 }
-
 }
 
-void UITestLogger::logAction(VclPtr const & xUIElement, VclEventId 
nEvent)
+void UITestLogger::logAction(VclPtr const& xUIElement, VclEventId 
nEvent)
 {
 if (!mbValid)
 return;
@@ -177,14 +176,14 @@ 

[Libreoffice-commits] core.git: Branch 'feature/gsoc-uitest-2019' - include/vcl vcl/source

2019-08-18 Thread Markus Mohrhard (via logerrit)
Rebased ref, commits from common ancestor:
commit 94e98f8fae5283eecdb56dc84c56739fc9d7d75e
Author: Markus Mohrhard 
AuthorDate: Sun Aug 18 23:34:32 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Mon Aug 19 00:16:37 2019 +0800

uitest: fixed for formatting and plugin stringconstant

Change-Id: Id657c19223f20d1175f9a774357e8b1f11344fdf

diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 6c8c5008541a..450285c5c247 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -15,10 +15,32 @@
 #include 
 #include 
 
-namespace com { namespace sun { namespace star {
-namespace beans { struct PropertyValue; }
-} } }
-namespace com { namespace sun { namespace star { namespace uno { template 
 class Sequence; } } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+struct PropertyValue;
+}
+}
+}
+}
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+template  class Sequence;
+}
+}
+}
+}
 
 struct EventDescription;
 class Control;
@@ -27,7 +49,6 @@ class KeyEvent;
 class UITEST_DLLPUBLIC UITestLogger
 {
 private:
-
 SvFileStream maStream;
 
 bool mbValid;
@@ -35,29 +56,24 @@ private:
 OUString app_name;
 
 public:
-
 UITestLogger();
 
-void logCommand(const OUString& rAction, const 
css::uno::Sequence& rArgs);
+void logCommand(const OUString& rAction,
+const css::uno::Sequence& 
rArgs);
 
-void logAction(VclPtr const & xUIElement, VclEventId nEvent);
+void logAction(VclPtr const& xUIElement, VclEventId nEvent);
 
 void log(const OUString& rString);
 
-void logKeyInput(VclPtr const & xUIElement, const KeyEvent& 
rEvent);
+void logKeyInput(VclPtr const& xUIElement, const KeyEvent& 
rEvent);
 
 void logEvent(const EventDescription& rDescription);
 
 static UITestLogger& getInstance();
 
-void setAppName(OUString name){
-app_name=name;
-}
-
-OUString getAppName(){
-return app_name;
-}
+void setAppName(OUString name) { app_name = name; }
 
+OUString getAppName() { return app_name; }
 };
 
 #endif
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 0ecd673f9879..03c439fcbd7c 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -20,9 +20,9 @@
 #include 
 #include 
 
-namespace{
-
-bool isDialogWindow(vcl::Window const * pWindow)
+namespace
+{
+bool isDialogWindow(vcl::Window const* pWindow)
 {
 WindowType nType = pWindow->GetType();
 // DIALOG to MODALDIALOG
@@ -39,7 +39,7 @@ bool isDialogWindow(vcl::Window const * pWindow)
 return false;
 }
 
-bool isTopWindow(vcl::Window const * pWindow)
+bool isTopWindow(vcl::Window const* pWindow)
 {
 WindowType eType = pWindow->GetType();
 if (eType == WindowType::FLOATINGWINDOW)
@@ -60,17 +60,16 @@ vcl::Window* get_top_parent(vcl::Window* pWindow)
 
 return get_top_parent(pParent);
 }
-
-
 }
-UITestLogger::UITestLogger():
-maStream(),
-mbValid(false)
+UITestLogger::UITestLogger()
+: maStream()
+, mbValid(false)
 {
 static const char* pFile = std::getenv("LO_COLLECT_UIINFO");
 if (pFile)
 {
-OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/uitest/");
+OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER
+  "/" SAL_CONFIGFILE("bootstrap") 
":UserInstallation}/uitest/");
 rtl::Bootstrap::expandMacros(aDirPath);
 osl::Directory::createPath(aDirPath);
 OUString aFilePath = aDirPath + OUString::fromUtf8(pFile);
@@ -80,7 +79,8 @@ UITestLogger::UITestLogger():
 }
 }
 
-void UITestLogger::logCommand(const OUString& rAction, const 
css::uno::Sequence< css::beans::PropertyValue >& rArgs)
+void UITestLogger::logCommand(const OUString& rAction,
+  const 
css::uno::Sequence& rArgs)
 {
 if (!mbValid)
 return;
@@ -126,10 +126,10 @@ void UITestLogger::logCommand(const OUString& rAction, 
const css::uno::Sequence<
 maStream.WriteLine(OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8));
 }
 
-namespace {
-
+namespace
+{
 // most likely this should be recursive
-bool child_windows_have_focus(VclPtr const & xUIElement)
+bool child_windows_have_focus(VclPtr const& xUIElement)
 {
 sal_Int32 nCount = xUIElement->GetChildCount();
 for (sal_Int32 i = 0; i < nCount; ++i)
@@ -144,10 +144,9 @@ bool child_windows_have_focus(VclPtr const & 
xUIElement)
 }
 return false;
 }
-
 }
 
-void UITestLogger::logAction(VclPtr const & xUIElement, VclEventId 
nEvent)
+void UITestLogger::logAction(VclPtr const& xUIElement, VclEventId 
nEvent)
 {
 if (!mbValid)
 return;
@@ -177,14 +176,14 @@ 

[Libreoffice-commits] core.git: Branch 'feature/gsoc-uitest-2019' - include/vcl vcl/source

2019-08-18 Thread Markus Mohrhard (via logerrit)
 include/vcl/uitest/logger.hxx |   48 +++--
 vcl/source/uitest/logger.cxx  |  344 +++---
 2 files changed, 227 insertions(+), 165 deletions(-)

New commits:
commit e30c3c783b5d610407e63fbfe991552289f732d5
Author: Markus Mohrhard 
AuthorDate: Sun Aug 18 23:34:32 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Sun Aug 18 23:36:09 2019 +0800

uitest: fixed for formatting and plugin stringconstant

Change-Id: Id657c19223f20d1175f9a774357e8b1f11344fdf

diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 6c8c5008541a..450285c5c247 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -15,10 +15,32 @@
 #include 
 #include 
 
-namespace com { namespace sun { namespace star {
-namespace beans { struct PropertyValue; }
-} } }
-namespace com { namespace sun { namespace star { namespace uno { template 
 class Sequence; } } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+struct PropertyValue;
+}
+}
+}
+}
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+template  class Sequence;
+}
+}
+}
+}
 
 struct EventDescription;
 class Control;
@@ -27,7 +49,6 @@ class KeyEvent;
 class UITEST_DLLPUBLIC UITestLogger
 {
 private:
-
 SvFileStream maStream;
 
 bool mbValid;
@@ -35,29 +56,24 @@ private:
 OUString app_name;
 
 public:
-
 UITestLogger();
 
-void logCommand(const OUString& rAction, const 
css::uno::Sequence& rArgs);
+void logCommand(const OUString& rAction,
+const css::uno::Sequence& 
rArgs);
 
-void logAction(VclPtr const & xUIElement, VclEventId nEvent);
+void logAction(VclPtr const& xUIElement, VclEventId nEvent);
 
 void log(const OUString& rString);
 
-void logKeyInput(VclPtr const & xUIElement, const KeyEvent& 
rEvent);
+void logKeyInput(VclPtr const& xUIElement, const KeyEvent& 
rEvent);
 
 void logEvent(const EventDescription& rDescription);
 
 static UITestLogger& getInstance();
 
-void setAppName(OUString name){
-app_name=name;
-}
-
-OUString getAppName(){
-return app_name;
-}
+void setAppName(OUString name) { app_name = name; }
 
+OUString getAppName() { return app_name; }
 };
 
 #endif
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 0ecd673f9879..5ea440216980 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -20,9 +20,9 @@
 #include 
 #include 
 
-namespace{
-
-bool isDialogWindow(vcl::Window const * pWindow)
+namespace
+{
+bool isDialogWindow(vcl::Window const* pWindow)
 {
 WindowType nType = pWindow->GetType();
 // DIALOG to MODALDIALOG
@@ -39,7 +39,7 @@ bool isDialogWindow(vcl::Window const * pWindow)
 return false;
 }
 
-bool isTopWindow(vcl::Window const * pWindow)
+bool isTopWindow(vcl::Window const* pWindow)
 {
 WindowType eType = pWindow->GetType();
 if (eType == WindowType::FLOATINGWINDOW)
@@ -60,17 +60,16 @@ vcl::Window* get_top_parent(vcl::Window* pWindow)
 
 return get_top_parent(pParent);
 }
-
-
 }
-UITestLogger::UITestLogger():
-maStream(),
-mbValid(false)
+UITestLogger::UITestLogger()
+: maStream()
+, mbValid(false)
 {
 static const char* pFile = std::getenv("LO_COLLECT_UIINFO");
 if (pFile)
 {
-OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/uitest/");
+OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER
+  "/" SAL_CONFIGFILE("bootstrap") 
":UserInstallation}/uitest/");
 rtl::Bootstrap::expandMacros(aDirPath);
 osl::Directory::createPath(aDirPath);
 OUString aFilePath = aDirPath + OUString::fromUtf8(pFile);
@@ -80,7 +79,8 @@ UITestLogger::UITestLogger():
 }
 }
 
-void UITestLogger::logCommand(const OUString& rAction, const 
css::uno::Sequence< css::beans::PropertyValue >& rArgs)
+void UITestLogger::logCommand(const OUString& rAction,
+  const 
css::uno::Sequence& rArgs)
 {
 if (!mbValid)
 return;
@@ -126,10 +126,10 @@ void UITestLogger::logCommand(const OUString& rAction, 
const css::uno::Sequence<
 maStream.WriteLine(OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8));
 }
 
-namespace {
-
+namespace
+{
 // most likely this should be recursive
-bool child_windows_have_focus(VclPtr const & xUIElement)
+bool child_windows_have_focus(VclPtr const& xUIElement)
 {
 sal_Int32 nCount = xUIElement->GetChildCount();
 for (sal_Int32 i = 0; i < nCount; ++i)
@@ -144,10 +144,9 @@ bool child_windows_have_focus(VclPtr const & 
xUIElement)
 }
 return false;
 }
-
 }
 
-void UITestLogger::logAction(VclPtr const & xUIElement, VclE

[Libreoffice-commits] core.git: Branch 'feature/chart-style-experiment-markus' - 2 commits - chart2/source offapi/com

2019-08-16 Thread Markus Mohrhard (via logerrit)
 chart2/source/inc/ChartStyle.hxx   |   14 -
 chart2/source/model/main/ChartModel.cxx|2 
 chart2/source/tools/ChartStyle.cxx |   77 +
 offapi/com/sun/star/chart2/XChartStyle.idl |7 ++
 4 files changed, 99 insertions(+), 1 deletion(-)

New commits:
commit 77792f9c9c0b92182a0855fae9dcf9274efa0730
Author: Markus Mohrhard 
AuthorDate: Fri Aug 16 23:13:30 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Fri Aug 16 23:13:30 2019 +0800

format file

Change-Id: I42c0069b63ced24eee99d43a7319cc50fd629e30

diff --git a/chart2/source/inc/ChartStyle.hxx b/chart2/source/inc/ChartStyle.hxx
index fc1f06270f90..54cbc5fe243b 100644
--- a/chart2/source/inc/ChartStyle.hxx
+++ b/chart2/source/inc/ChartStyle.hxx
@@ -101,8 +101,8 @@ public:
 virtual void SAL_CALL
 applyStyleToTitle(const css::uno::Reference& xTitle) 
override;
 
-virtual void SAL_CALL
-applyStyleToBackground(const 
css::uno::Reference& xBackground) override;
+virtual void SAL_CALL applyStyleToBackground(
+const css::uno::Reference& xBackground) 
override;
 
 // XStyle
 virtual sal_Bool SAL_CALL isUserDefined() override;
@@ -124,7 +124,8 @@ private:
 
 void applyStyleToAxis(const css::uno::Reference& 
xAxis);
 
-void applyStyleToCoordinates(const 
css::uno::Reference& xCooSysCont);
+void applyStyleToCoordinates(
+const css::uno::Reference& 
xCooSysCont);
 };
 
 OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference 
getChartStyles();
commit 2e31f4ab53b77ebbb0932ced6cafe8e2c8af49a2
Author: Gagandeep Singh 
AuthorDate: Tue Aug 13 15:28:38 2019 +0530
Commit: Markus Mohrhard 
CommitDate: Fri Aug 16 19:40:46 2019 +0800

Add more methods to XChartStyle.idl for applying styles to title, axis,..

Change-Id: I6ce9b3da584671636830122ef9ac9f6b9f54d132

diff --git a/chart2/source/inc/ChartStyle.hxx b/chart2/source/inc/ChartStyle.hxx
index c82611ee163c..fc1f06270f90 100644
--- a/chart2/source/inc/ChartStyle.hxx
+++ b/chart2/source/inc/ChartStyle.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -95,7 +96,13 @@ public:
 SAL_CALL getStyleForObject(const sal_Int16 nChartObjectType) override;
 
 virtual void SAL_CALL
-applyStyleToDiagram(const css::uno::Reference& 
xDiagram);
+applyStyleToDiagram(const css::uno::Reference& 
xDiagram) override;
+
+virtual void SAL_CALL
+applyStyleToTitle(const css::uno::Reference& xTitle) 
override;
+
+virtual void SAL_CALL
+applyStyleToBackground(const 
css::uno::Reference& xBackground) override;
 
 // XStyle
 virtual sal_Bool SAL_CALL isUserDefined() override;
@@ -114,6 +121,10 @@ private:
 std::map> 
m_xChartStyle;
 
 void register_styles();
+
+void applyStyleToAxis(const css::uno::Reference& 
xAxis);
+
+void applyStyleToCoordinates(const 
css::uno::Reference& xCooSysCont);
 };
 
 OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference 
getChartStyles();
diff --git a/chart2/source/model/main/ChartModel.cxx 
b/chart2/source/model/main/ChartModel.cxx
index 7c500abd4a07..4cda0d5882fc 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -935,6 +935,8 @@ void SAL_CALL ChartModel::setTitleObject( const 
uno::Reference< chart2::XTitle >
 ModifyListenerHelper::addListener( m_xTitle, this );
 }
 setModified( true );
+
+m_xChartStyle->applyStyleToTitle( xTitle );
 }
 
 // _ XChartStyled _
diff --git a/chart2/source/tools/ChartStyle.cxx 
b/chart2/source/tools/ChartStyle.cxx
index cb172fa30be7..2847b3db7f7d 100644
--- a/chart2/source/tools/ChartStyle.cxx
+++ b/chart2/source/tools/ChartStyle.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -187,6 +188,56 @@ css::uno::Sequence SAL_CALL 
ChartStyle::getSupportedServiceNames()
 return { "com.sun.star.chart2.ChartStyle" };
 }
 
+void SAL_CALL ChartStyle::applyStyleToTitle(const 
css::uno::Reference& xTitle)
+{
+css::uno::Reference xTitleStyle(xTitle, 
css::uno::UNO_QUERY);
+if (xTitleStyle.is())
+{
+xTitleStyle->setStyle(css::uno::Reference(
+m_xChartStyle.find(css::chart2::ChartObjectType::TITLE)->second,
+css::uno::UNO_QUERY_THROW));
+}
+}
+
+void ChartStyle::applyStyleToAxis(const 
css::uno::Reference& xAxis)
+{
+css::uno::Reference xAxisStyle(xAxis, 
css::uno::UNO_QUERY);
+if (xAxisStyle.is())
+{
+xAxisStyle->setStyle(css::uno::Reference(
+m_xChartStyle.find(css::chart2::ChartObjectType::AXIS)->second,
+css::uno::UNO_QUERY_THROW));
+}
+
+css::uno::Reference xTitled(xAxis, 
css::uno::UNO_QUERY);
+if (xTitled.is())
+{
+css::uno::Reference xTitle = 
xTitled->getTitleObject();
+if (xTitle.is())
+applySty

[Libreoffice-commits] core.git: Branch 'feature/chart-style-experiment-markus' - 3 commits - chart2/Library_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk officecfg/registr

2019-08-14 Thread Markus Mohrhard (via logerrit)
 Repository.mk|4 
 chart2/Library_chartcontroller.mk|1 
 chart2/UIConfig_chart2.mk|1 
 chart2/source/controller/sidebar/Chart2PanelFactory.cxx  |3 
 chart2/source/controller/sidebar/ChartStylesPanel.cxx|   69 ++
 chart2/source/controller/sidebar/ChartStylesPanel.hxx|   90 
 chart2/uiconfig/ui/sidebarstyle.ui   |  111 +++
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |   41 +++-
 8 files changed, 313 insertions(+), 7 deletions(-)

New commits:
commit 8fb2808b35a60771ec72cc9ad01cfde17e2f102a
Author: Markus Mohrhard 
AuthorDate: Thu Aug 15 04:12:11 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Thu Aug 15 04:12:11 2019 +0800

don't force huge control size

Change-Id: I9b42a8b16a333b0833d8444cdc70f32455859028

diff --git a/chart2/source/controller/sidebar/ChartStylesPanel.cxx 
b/chart2/source/controller/sidebar/ChartStylesPanel.cxx
index 13cdd32c65e7..82976b5b1e44 100644
--- a/chart2/source/controller/sidebar/ChartStylesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartStylesPanel.cxx
@@ -34,7 +34,6 @@ ChartStylesPanel::ChartStylesPanel(vcl::Window* pParent,
 get(aDefaultButton, "setdefault");
 get(aDeleteButton, "deletestyle");
 
-aStyleList->set_height_request(45 * aStyleList->GetTextHeight());
 Link aLink = LINK(this, ChartStylesPanel, SelHdl);
 Link aLink2 = LINK(this, ChartStylesPanel, 
SetSelectionClickHdl);
 
commit 3c1a4c172426e573a8f231c15c27ff5cc3d37302
Author: Markus Mohrhard 
AuthorDate: Thu Aug 15 04:10:47 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Thu Aug 15 04:10:47 2019 +0800

make sure the ChartStyles panel shows up in chart sidebar

Change-Id: I8c6cef96d12a97fb8246efc5186d02c5f26733eb

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index e9e206a470c7..05a7789b5db7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -292,26 +292,6 @@
 
   
 
-  
-
-  Chart Styles
-
-
-  ChartStylesDeck
-
-
-  
private:graphicrepository/sfx2/res/symphony/sidebar-style-large.png
-
-
-  
-Chart, any, visible ;
-  
-
-
-  10
-
-  
-
 
 
 
@@ -1431,7 +1411,7 @@
   
private:resource/toolpanel/ChartPanelFactory/SeriesPanel
 
 
-  2
+  3
 
   
 
@@ -1454,7 +1434,7 @@
   
private:resource/toolpanel/ChartPanelFactory/TrendlinePanel
 
 
-  3
+  4
 
   
 
@@ -1480,7 +1460,7 @@
   
private:resource/toolpanel/ChartPanelFactory/ErrorBarPanel
 
 
-  4
+  5
 
   
 
@@ -1506,7 +1486,7 @@
   private:resource/toolpanel/ChartPanelFactory/AxisPanel
 
 
-  5
+  6
 
   
 
@@ -1533,7 +1513,7 @@
   private:resource/toolpanel/ChartPanelFactory/AreaPanel
 
 
-  6
+  7
 
   
 
@@ -1564,7 +1544,7 @@
   private:resource/toolpanel/ChartPanelFactory/LinePanel
 
 
-  7
+  8
 
   
 
@@ -1587,7 +1567,7 @@
   
private:resource/toolpanel/ChartPanelFactory/CharacterPanel
 
 
-  8
+  9
 
   
 
@@ -1602,7 +1582,7 @@
   ChartStylesPanel
 
 
-  ChartStylesDeck
+  ChartDeck
 
 
   
@@ -1613,7 +1593,7 @@
   
private:resource/toolpanel/ChartPanelFactory/ChartStylesPanel
 
 
-  1
+  2
 
   
 
commit 16f447d6232d34a5c665b81ef53c15250849044a
Author: Gagandeep Singh 
AuthorDate: Fri May 3 16:51:51 2019 +0530
Commit: Markus Mohrhard 
CommitDate: Thu Aug 15 03:29:06 2019 +0800

Chart Styles : Added a list box for chart Style in sidebar

Just a GUI update for help in testing chart styles

Change-Id: If7990af383e73996e42ce756c46a8d69d3ab95f3

diff --git a/Repository.mk b/Repository.mk
index d292bd461201..0f5606f12da3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -835,6 +835,10 @@ $(eval $(call 
gb_Helper_register_packages_for_install,calc,\
sc_res_xml \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,chart2,\
+   chart2_res_xml \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,libreofficekit,\
$(if $(filter LINUX %BSD SOLARIS, 
$(OS)),libreofficekit_selectionhandles) \
 ))
diff --git a/chart2/Library_chartcontroller.mk 
b/chart2/Library_chartcontroller.mk
index 02c8bcb

How to handle a testing only python package dependency

2019-08-14 Thread Markus Mohrhard
G'day fellow hackers,

to finally merge the work of one of my GSoC students we are trying to
figure out how to handle a new test framework only python package
dependency. Note that the package is a purely optional dependency and not
required to run our normal test cases. The dependency in question is testx
which again has two dependencies:

textX==2.0.1
  - Arpeggio [required: >=1.9.0, installed: 1.9.0]
  - click [required: ==7.0, installed: 7.0]

What is our policy about python packages that are actually not needed for
an installed LibreOffice?
My current solution would be to add an explicit ImportError check in the
script and tell the person calling the script to install the package. As
this is mostly something for a few selected QA team members this seems like
an acceptable solution.

Any other solutions/opinions?

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

[Libreoffice-commits] core.git: Branch 'feature/chart-style-experiment-markus' - chart2/source chart2/uiconfig

2019-08-11 Thread Markus Mohrhard (via logerrit)
 chart2/source/controller/sidebar/ChartElementsPanel.cxx |   17 +
 chart2/source/controller/sidebar/ChartElementsPanel.hxx |2 
 chart2/source/inc/ChartStyle.hxx|2 
 chart2/source/tools/ChartStyle.cxx  |5 +
 chart2/uiconfig/ui/sidebarelements.ui   |   47 ++--
 5 files changed, 66 insertions(+), 7 deletions(-)

New commits:
commit 1f72a43b2fa1ce5edf53bc23bd478b31d727dd69
Author: Markus Mohrhard 
AuthorDate: Mon Aug 12 04:14:30 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Mon Aug 12 04:14:30 2019 +0800

initial stab at adding ugly chart style selector

Change-Id: Ica266b608d5868be5abe04929c912673e7c4f011

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index ac48b0a7e9cb..b445fd6d 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -303,6 +304,8 @@ ChartElementsPanel::ChartElementsPanel(
 get(mpTextTitle, "text_title");
 get(mpTextSubTitle, "text_subtitle");
 
+get(mpLBStylesBox, "cb_styles");
+
 maTextTitle = mpTextTitle->GetText();
 maTextSubTitle = mpTextSubTitle->GetText();
 
@@ -339,6 +342,8 @@ void ChartElementsPanel::dispose()
 mpLBLegendPosition.clear();
 mpBoxLegend.clear();
 
+mpLBStylesBox.clear();
+
 mpLBAxis.clear();
 mpLBGrid.clear();
 
@@ -433,7 +438,6 @@ void ChartElementsPanel::updateData()
 mpCB2ndXAxis->Check(isAxisVisible(mxModel, AxisType::X_SECOND));
 mpCB2ndYAxis->Check(isAxisVisible(mxModel, AxisType::Y_SECOND));
 
-
 bool bSupportsMainAxis = ChartTypeHelper::isSupportingMainAxis(
 getChartType(mxModel), 0, 0);
 if (bSupportsMainAxis)
@@ -479,6 +483,17 @@ void ChartElementsPanel::updateData()
 }
 
 mpLBLegendPosition->SelectEntryPos(getLegendPos(mxModel));
+
+css::uno::Sequence aChartStyles = 
::chart::getChartStyles()->getElementNames();
+mpLBStylesBox->Clear();
+for (auto& rStyle : aChartStyles)
+{
+mpLBStylesBox->InsertEntry(rStyle);
+}
+
+ChartModel* pModel = getChartModel(mxModel);
+OUString aCurrentChartStyleName = 
css::uno::Reference(pModel->getChartStyle(), 
css::uno::UNO_QUERY_THROW)->getName();
+mpLBStylesBox->SelectEntry(aCurrentChartStyleName);
 }
 
 VclPtr ChartElementsPanel::Create (
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index eca293645cc4..b5719621e88b 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -95,6 +95,8 @@ private:
 VclPtr mpLBLegendPosition;
 VclPtr mpBoxLegend;
 
+VclPtr mpLBStylesBox;
+
 vcl::EnumContext maContext;
 
 css::uno::Reference mxModel;
diff --git a/chart2/source/inc/ChartStyle.hxx b/chart2/source/inc/ChartStyle.hxx
index 30ecdfe0a6b4..c82611ee163c 100644
--- a/chart2/source/inc/ChartStyle.hxx
+++ b/chart2/source/inc/ChartStyle.hxx
@@ -116,7 +116,7 @@ private:
 void register_styles();
 };
 
-css::uno::Reference getChartStyles();
+OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference 
getChartStyles();
 
 } // namespace chart
 
diff --git a/chart2/source/tools/ChartStyle.cxx 
b/chart2/source/tools/ChartStyle.cxx
index b2ccf466fcfd..cb172fa30be7 100644
--- a/chart2/source/tools/ChartStyle.cxx
+++ b/chart2/source/tools/ChartStyle.cxx
@@ -252,6 +252,9 @@ void ChartStyles::addInitialStyles()
 {
 css::uno::Any aDefaultStyle;
 css::uno::Reference xChartStyle = new ChartStyle;
+css::uno::Reference xStyle(xChartStyle, 
css::uno::UNO_QUERY_THROW);
+xStyle->setName("Default");
+
 aDefaultStyle <<= xChartStyle;
 insertByName("Default", aDefaultStyle);
 }
@@ -301,7 +304,7 @@ css::uno::Any ChartStyles::getByName(const OUString& rName)
 
 css::uno::Sequence ChartStyles::getElementNames()
 {
-return css::uno::Sequence();
+return comphelper::mapKeysToSequence(maChartStyles);
 }
 
 sal_Bool ChartStyles::hasByName(const OUString& rName)
diff --git a/chart2/uiconfig/ui/sidebarelements.ui 
b/chart2/uiconfig/ui/sidebarelements.ui
index c4ec4cd49e2d..89ac8c9fd314 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -9,9 +9,9 @@
   
 True
 False
+6
 vertical
 6
-6
 
   
 True
@@ -99,14 +99,14 @@
 False
 
   
-Show Legend
 True
 True
 False
+   

[Libreoffice-commits] core.git: Branch 'feature/chart-style-experiment-markus' - 2 commits - chart2/source

2019-08-11 Thread Markus Mohrhard (via logerrit)
 chart2/source/chartcore.component   |4 
 chart2/source/inc/ChartStyle.hxx|   22 -
 chart2/source/model/main/ChartModel.cxx |5 -
 chart2/source/tools/ChartStyle.cxx  |  129 ++--
 chart2/source/view/main/VTitle.cxx  |3 
 5 files changed, 148 insertions(+), 15 deletions(-)

New commits:
commit 4bf7014ba4b265fa0947bf4e6cc8bbee8f2ab94f
Author: Markus Mohrhard 
AuthorDate: Mon Aug 12 03:27:52 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Mon Aug 12 03:27:52 2019 +0800

tdf#126837: fix incorrect handling of visible flag for chart titles

Change-Id: Idb8dfa18e924324dcf27339fd18ff90616651d40

diff --git a/chart2/source/view/main/VTitle.cxx 
b/chart2/source/view/main/VTitle.cxx
index d0633263f8af..967edd72f55a 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -113,6 +113,9 @@ void VTitle::createShapes(
 m_nYPos = rPos.Y;
 
 uno::Reference< beans::XPropertySet > xTitleProperties( m_xTitle, 
uno::UNO_QUERY );
+sal_Bool bVisible = true;
+if ((xTitleProperties->getPropertyValue("Visible") >>= bVisible) && 
!bVisible)
+return;
 
 try
 {
commit 816332b04ded68f0729bef34dd8774cb8fdabaf1
Author: Markus Mohrhard 
AuthorDate: Mon Aug 12 02:32:09 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Mon Aug 12 03:06:14 2019 +0800

implement a ChartStyles object

Change-Id: Id7992faa801816be99c47f2bea754108b0296da5

diff --git a/chart2/source/chartcore.component 
b/chart2/source/chartcore.component
index 4bb0f689c788..f58ba98ba3ac 100644
--- a/chart2/source/chartcore.component
+++ b/chart2/source/chartcore.component
@@ -256,8 +256,4 @@
 constructor="com_sun_star_comp_chart2_ChartView_get_implementation">
 
   
-  
-
-  
 
diff --git a/chart2/source/inc/ChartStyle.hxx b/chart2/source/inc/ChartStyle.hxx
index c12441e1cd76..30ecdfe0a6b4 100644
--- a/chart2/source/inc/ChartStyle.hxx
+++ b/chart2/source/inc/ChartStyle.hxx
@@ -16,6 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef INCLUDED_CHART2_SOURCE_INC_CHARTSTYLE_HXX
 #define INCLUDED_CHART2_SOURCE_INC_CHARTSTYLE_HXX
 
@@ -25,13 +26,14 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "PropertyHelper.hxx"
 #include "OPropertySet.hxx"
 #include "MutexContainer.hxx"
 
-namespace chart2
+namespace chart
 {
 namespace impl
 {
@@ -77,7 +79,8 @@ private:
 css::uno::Reference mxPropSetInfo;
 };
 
-class ChartStyle : public cppu::WeakImplHelper
+class ChartStyle : public cppu::WeakImplHelper
 {
 public:
 explicit ChartStyle();
@@ -94,15 +97,28 @@ public:
 virtual void SAL_CALL
 applyStyleToDiagram(const css::uno::Reference& 
xDiagram);
 
+// XStyle
+virtual sal_Bool SAL_CALL isUserDefined() override;
+virtual sal_Bool SAL_CALL isInUse() override;
+virtual OUString SAL_CALL getParentStyle() override;
+virtual void setParentStyle(const OUString& rParentStyle) override;
+
+// XNamed
+virtual OUString SAL_CALL getName() override;
+virtual void SAL_CALL setName(const OUString& rName) override;
+
 private:
 sal_Int16 m_nNumObjects;
+OUString maName;
 
 std::map> 
m_xChartStyle;
 
 void register_styles();
 };
 
-} // namespace chart2
+css::uno::Reference getChartStyles();
+
+} // namespace chart
 
 // INCLUDED_CHART2_SOURCE_INC_CHARTSTYLE_HXX
 #endif
diff --git a/chart2/source/model/main/ChartModel.cxx 
b/chart2/source/model/main/ChartModel.cxx
index ba5a5d399445..7c500abd4a07 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -110,8 +111,8 @@ 
ChartModel::ChartModel(uno::Reference const & xContext)
 ModifyListenerHelper::addListener( m_xPageBackground, this );
 m_xChartTypeManager.set( 
xContext->getServiceManager()->createInstanceWithContext(
 "com.sun.star.chart2.ChartTypeManager", m_xContext ), 
uno::UNO_QUERY );
-m_xChartStyle.set( 
xContext->getServiceManager()->createInstanceWithContext(
-"com.sun.star.chart2.ChartStyle" , m_xContext ), 
uno::UNO_QUERY );
+
+::chart::getChartStyles()->getByName("Default") >>= m_xChartStyle;
 }
 osl_atomic_decrement(_refCount);
 }
diff --git a/chart2/source/tools/ChartStyle.cxx 
b/chart2/source/tools/ChartStyle.cxx
index 71e94867dc3a..b2ccf466fcfd 100644
--- a/chart2/source/tools/ChartStyle.cxx
+++ b/chart2/source/tools/ChartStyle.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -49,7 +50,7 @@ class XComponentContext;
 }
 }
 
-namespace chart2
+namespace chart
 {
 
ChartObjectStyle::Chart

[Libreoffice-commits] core.git: Branch 'feature/chart-style-experiment-markus' - offapi/com

2019-08-10 Thread Markus Mohrhard (via logerrit)
 offapi/com/sun/star/chart2/ChartObjectType.idl |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 55a7e6cc42d697f4a46ead4fb0d840407783b2cf
Author: Markus Mohrhard 
AuthorDate: Sun Aug 11 03:02:04 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Sun Aug 11 03:02:04 2019 +0800

add the ChartObjectType::FLOOR ID

Change-Id: I14c6f6e653c7e95a6503eae220140563977609eb

diff --git a/offapi/com/sun/star/chart2/ChartObjectType.idl 
b/offapi/com/sun/star/chart2/ChartObjectType.idl
index eb86b14eb4e0..7580e9d83b19 100644
--- a/offapi/com/sun/star/chart2/ChartObjectType.idl
+++ b/offapi/com/sun/star/chart2/ChartObjectType.idl
@@ -26,7 +26,8 @@ constants ChartObjectType
 const short STOCK = 9;
 const short TITLE = 10;
 const short WALL = 11;
-const short UNKNOWN = 12;
+const short FLOOR = 12;
+const short UNKNOWN = 13;
 };
 
 }; }; }; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-style-experiment-markus' - chart2/source

2019-08-09 Thread Markus Mohrhard (via logerrit)
 chart2/source/model/main/ChartModel_Persistence.cxx |8 
 chart2/source/tools/ChartStyle.cxx  |   19 +++
 2 files changed, 19 insertions(+), 8 deletions(-)

New commits:
commit 78f6221057f13eec4a736d12b282a5904a68d883
Author: Markus Mohrhard 
AuthorDate: Sat Aug 10 03:18:09 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Sat Aug 10 03:18:09 2019 +0800

move chart wall default formatting to style

Change-Id: Ieddeb087df2c60ffa59c5ebba378f862350377bf

diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx 
b/chart2/source/model/main/ChartModel_Persistence.cxx
index db3b05ea195c..6ab5ebf9135b 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -434,14 +434,6 @@ void ChartModel::insertDefaultChart()
 //set some new 'defaults' for wall and floor
 if( xDiagram.is() )
 {
-Reference< beans::XPropertySet > xWall( 
xDiagram->getWall() );
-if( xWall.is() )
-{
-xWall->setPropertyValue( "LineStyle", uno::Any( 
drawing::LineStyle_SOLID ) );
-xWall->setPropertyValue( "FillStyle", uno::Any( 
drawing::FillStyle_NONE ) );
-xWall->setPropertyValue( "LineColor", uno::Any( 
static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
-xWall->setPropertyValue( "FillColor", uno::Any( 
static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
-}
 Reference< beans::XPropertySet > xFloor( 
xDiagram->getFloor() );
 if( xFloor.is() )
 {
diff --git a/chart2/source/tools/ChartStyle.cxx 
b/chart2/source/tools/ChartStyle.cxx
index b383f4316b03..71e94867dc3a 100644
--- a/chart2/source/tools/ChartStyle.cxx
+++ b/chart2/source/tools/ChartStyle.cxx
@@ -142,6 +142,16 @@ void ChartStyle::register_styles()
 *chart::wall::StaticWallInfo::get(), 
*chart::wall::StaticWallInfoHelper::get(),
 *chart::wall::StaticWallDefaults::get());
 
+css::uno::Reference xWallStyle
+= m_xChartStyle[css::chart2::ChartObjectType::WALL];
+
+xWallStyle->setPropertyValue("LineStyle", 
css::uno::Any(css::drawing::LineStyle_SOLID));
+xWallStyle->setPropertyValue("FillStyle", 
css::uno::Any(css::drawing::FillStyle_NONE));
+xWallStyle->setPropertyValue("LineColor",
+ 
css::uno::Any(static_cast(0xb3b3b3))); // gray30
+xWallStyle->setPropertyValue("FillColor",
+ 
css::uno::Any(static_cast(0xe6e6e6))); // gray10
+
 m_xChartStyle[css::chart2::ChartObjectType::GRID] = new ChartObjectStyle(
 *chart::grid::StaticGridInfo::get(), 
*chart::grid::StaticGridInfoHelper::get(),
 *chart::grid::StaticGridDefaults::get());
@@ -187,6 +197,15 @@ ChartStyle::applyStyleToDiagram(const 
css::uno::Reference
 m_xChartStyle.find(css::chart2::ChartObjectType::LEGEND)->second,
 css::uno::UNO_QUERY_THROW));
 }
+
+css::uno::Reference 
xWallStyle(xDiagram->getWall(),
+   
css::uno::UNO_QUERY);
+if (xWallStyle.is())
+{
+xWallStyle->setStyle(css::uno::Reference(
+m_xChartStyle.find(css::chart2::ChartObjectType::WALL)->second,
+css::uno::UNO_QUERY_THROW));
+}
 }
 
 //
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-style-experiment-markus' - 2 commits - chart2/source offapi/com

2019-08-09 Thread Markus Mohrhard (via logerrit)
 chart2/source/inc/ChartStyle.hxx|3 ++
 chart2/source/model/main/ChartModel.cxx |2 +
 chart2/source/model/main/ChartModel_Persistence.cxx |   11 
 chart2/source/tools/ChartStyle.cxx  |   25 
 offapi/com/sun/star/chart2/XChartStyle.idl  |3 ++
 5 files changed, 39 insertions(+), 5 deletions(-)

New commits:
commit b91405200821542b714c19eb65c5ec0532499913
Author: Markus Mohrhard 
AuthorDate: Sat Aug 10 01:17:50 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Sat Aug 10 01:19:49 2019 +0800

move default chart legend formatting to the style

Change-Id: If996e2d86ce07e91da77789732a1abf1ae1b3f99

diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx 
b/chart2/source/model/main/ChartModel_Persistence.cxx
index 87a0a742b7d9..db3b05ea195c 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -416,11 +416,6 @@ void ChartModel::insertDefaultChart()
 Reference< beans::XPropertySet > xLegendProperties( xLegend, 
uno::UNO_QUERY );
 if( xLegendProperties.is() )
 {
-xLegendProperties->setPropertyValue( "FillStyle", 
uno::Any( drawing::FillStyle_NONE ));
-xLegendProperties->setPropertyValue( "LineStyle", 
uno::Any( drawing::LineStyle_NONE ));
-xLegendProperties->setPropertyValue( "LineColor", 
uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) ));  // gray30
-xLegendProperties->setPropertyValue( "FillColor", 
uno::Any( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
-
 if( bIsRTL )
 xLegendProperties->setPropertyValue( "AnchorPosition", 
uno::Any( chart2::LegendPosition_LINE_START ));
 }
diff --git a/chart2/source/tools/ChartStyle.cxx 
b/chart2/source/tools/ChartStyle.cxx
index 8aac449dcf90..6c7c0bafe093 100644
--- a/chart2/source/tools/ChartStyle.cxx
+++ b/chart2/source/tools/ChartStyle.cxx
@@ -19,6 +19,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -104,6 +106,15 @@ void ChartStyle::register_styles()
 m_xChartStyle[css::chart2::ChartObjectType::LEGEND] = new ChartObjectStyle(
 *chart::legend::StaticLegendInfo::get(), 
*chart::legend::StaticLegendInfoHelper::get(),
 *chart::legend::StaticLegendDefaults::get());
+
+css::uno::Reference xLegendStyle
+= m_xChartStyle[css::chart2::ChartObjectType::LEGEND];
+xLegendStyle->setPropertyValue("FillStyle", 
css::uno::Any(css::drawing::FillStyle_NONE));
+xLegendStyle->setPropertyValue("LineStyle", 
css::uno::Any(css::drawing::LineStyle_NONE));
+xLegendStyle->setPropertyValue("LineColor",
+   
css::uno::Any(static_cast(0xb3b3b3))); // gray30
+xLegendStyle->setPropertyValue("FillColor",
+   
css::uno::Any(static_cast(0xe6e6e6))); // gray10
 }
 
 // _ XServiceInfo _____
commit 3ff4ac00a7bdee0e7cecaf5c35bc8056bc3f1d41
Author: Markus Mohrhard 
AuthorDate: Sat Aug 10 01:19:23 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Sat Aug 10 01:19:48 2019 +0800

add initial code to apply style to chart

Change-Id: I33207f95236f4102f8ae5620465494b3384f

diff --git a/chart2/source/inc/ChartStyle.hxx b/chart2/source/inc/ChartStyle.hxx
index 2c1fb3d9e7f8..c12441e1cd76 100644
--- a/chart2/source/inc/ChartStyle.hxx
+++ b/chart2/source/inc/ChartStyle.hxx
@@ -91,6 +91,9 @@ public:
 virtual css::uno::Reference
 SAL_CALL getStyleForObject(const sal_Int16 nChartObjectType) override;
 
+virtual void SAL_CALL
+applyStyleToDiagram(const css::uno::Reference& 
xDiagram);
+
 private:
 sal_Int16 m_nNumObjects;
 
diff --git a/chart2/source/model/main/ChartModel.cxx 
b/chart2/source/model/main/ChartModel.cxx
index 262070310591..ba5a5d399445 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -687,6 +687,8 @@ void SAL_CALL ChartModel::setFirstDiagram( const 
uno::Reference< chart2::XDiagra
 ModifyListenerHelper::removeListener( xOldDiagram, xListener );
 ModifyListenerHelper::addListener( xDiagram, xListener );
 setModified( true );
+
+m_xChartStyle->applyStyleToDiagram(xDiagram);
 }
 
 Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx 
b/chart2/source/model/main/ChartModel_Persistence.cxx
index 642aceb626ae..87a0a742b7d9 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -732,6 +732,12 @@ void SAL_CALL ChartModel::modified( const 
lang::EventObjec

[Libreoffice-commits] core.git: Branch 'feature/chart-style-experiment-markus' - 2 commits - chart2/source

2019-08-06 Thread Markus Mohrhard (via logerrit)
 chart2/source/inc/ChartStyle.hxx|   43 +++
 chart2/source/inc/Legend.hxx|  134 
 chart2/source/model/main/Legend.cxx |  116 +--
 chart2/source/model/main/Legend.hxx |  107 
 chart2/source/tools/ChartStyle.cxx  |  111 +
 5 files changed, 277 insertions(+), 234 deletions(-)

New commits:
commit d63f1346a6c5767d995c787fe2bb36b023a64788
Author: Markus Mohrhard 
AuthorDate: Wed Aug 7 05:10:41 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Wed Aug 7 05:10:41 2019 +0800

store the first style in ChartStyle

Change-Id: Ib72b2c9aeb3ba2c09e8be6edbbd713cb2512b3e7

diff --git a/chart2/source/inc/ChartStyle.hxx b/chart2/source/inc/ChartStyle.hxx
index f01fa6769524..2c1fb3d9e7f8 100644
--- a/chart2/source/inc/ChartStyle.hxx
+++ b/chart2/source/inc/ChartStyle.hxx
@@ -33,13 +33,24 @@
 
 namespace chart2
 {
+namespace impl
+{
+typedef ::cppu::WeakImplHelper ChartObjectStyle_Base;
+}
 
-class ChartObjectStyle : public chart::MutexContainer, public 
property::OPropertySet, public css::style::XStyle
+class ChartObjectStyle : public chart::MutexContainer,
+ public impl::ChartObjectStyle_Base,
+ public property::OPropertySet
 {
 public:
-ChartObjectStyle(::cppu::IPropertyArrayHelper& rArrayHelper, const 
chart::tPropertyValueMap& rPropertyMap);
+ChartObjectStyle(css::uno::Reference 
xPropertySetInfo,
+ ::cppu::IPropertyArrayHelper& rArrayHelper,
+ const chart::tPropertyValueMap& rPropertyMap);
 virtual ~ChartObjectStyle();
 
+/// merge XInterface implementations
+DECLARE_XINTERFACE()
+
 virtual sal_Bool SAL_CALL isUserDefined() override;
 virtual sal_Bool SAL_CALL isInUse() override;
 
@@ -47,32 +58,34 @@ public:
 virtual void SAL_CALL setParentStyle(const OUString&) override;
 
 //  OPropertySet 
-virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
+virtual css::uno::Any GetDefaultValue(sal_Int32 nHandle) const override;
 
 //  OPropertySet 
-virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
+virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
 //  XPropertySet 
-virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-getPropertySetInfo() override;
+virtual css::uno::Reference
+SAL_CALL getPropertySetInfo() override;
 
-private:
+virtual OUString SAL_CALL getName();
 
+virtual void SAL_CALL setName(const OUString&);
+
+private:
 ::cppu::IPropertyArrayHelper& mrArrayHelper;
 const chart::tPropertyValueMap& mrPropertyMap;
+css::uno::Reference mxPropSetInfo;
 };
 
-class ChartStyle : public cppu::WeakImplHelper<
-  css::chart2::XChartStyle
-, css::lang::XServiceInfo >
+class ChartStyle : public cppu::WeakImplHelper
 {
 public:
 explicit ChartStyle();
 virtual ~ChartStyle();
 /// XServiceInfo declarations
 virtual OUString SAL_CALL getImplementationName() override;
-virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
override;
-virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
+virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) 
override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() 
override;
 
 // _ XChartStyle _
 virtual css::uno::Reference
@@ -82,6 +95,8 @@ private:
 sal_Int16 m_nNumObjects;
 
 std::map> 
m_xChartStyle;
+
+void register_styles();
 };
 
 } // namespace chart2
diff --git a/chart2/source/inc/Legend.hxx b/chart2/source/inc/Legend.hxx
new file mode 100644
index ..b3685eb5862a
--- /dev/null
+++ b/chart2/source/inc/Legend.hxx
@@ -0,0 +1,134 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INCLUDED_CHART2_SOURCE_MODEL_MA

[Libreoffice-commits] core.git: Changes to 'feature/chart-style-experiment-markus'

2019-08-05 Thread Markus Mohrhard (via logerrit)
New branch 'feature/chart-style-experiment-markus' available with the following 
commits:
commit c33185cbdfd948f3295f9192a7f8c3ab37a7dae1
Author: Markus Mohrhard 
Date:   Tue Aug 6 03:08:14 2019 +0800

try a different idea how to quickly get some chart styles implemented

Change-Id: I3856c97f8b58d9631b577700dd5aabe7f4f5798b

commit 9fdb2d44efac86ad475dc0d53ceaa3582da696e0
Author: Gagandeep Singh 
Date:   Mon Jul 29 12:07:31 2019 +0530

ChartStyle service prototype and integration into ChartModel

Change-Id: I6462886fba99f16df36a847121adc31ac1924424

commit 61a49a1f413e05af3f5e9114703d3d97163c268e
Author: Markus Mohrhard 
Date:   Tue Aug 6 01:59:16 2019 +0800

Revert "[WIP] Core Structures for Chart Styles Implementation"

This reverts commit 2fd7ed670df9bd4390d26b6a8c6b64c6a4242e50.

Change-Id: I6fc8474f251a7507ea31db623a4bd3908e198b82

commit 9df5887e017bbb2b1e97b156e3daf0c80a82bffe
Author: Gagandeep Singh 
Date:   Tue Jul 9 13:35:35 2019 +0530

ChartStyle class for XChartStyle interface

Change-Id: I8b2cf62e9791f70739d6973aab96c344cb3c3ffb
Reviewed-on: https://gerrit.libreoffice.org/75308
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

commit 0d2083cf893db3690708de2511a11e435dfdbca1
Author: Gagandeep Singh 
Date:   Fri Jul 5 16:31:44 2019 +0530

Populating the ChartObjectType.idl

Change-Id: I253f720d7afc749b1d35946a929f2a762ec03a54
Reviewed-on: https://gerrit.libreoffice.org/75107
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

commit 3cf4e20a3b6b5c346e4b55fef2350f2ea4e14fd4
Author: Markus Mohrhard 
Date:   Thu Jul 4 00:26:34 2019 +0800

add interfaces for chart style

Change-Id: Ib8e118a5c866187507d438f1decbc49ffafd0dd4

commit 2fd7ed670df9bd4390d26b6a8c6b64c6a4242e50
Author: Gagandeep Singh 
Date:   Fri Jun 21 16:58:06 2019 +0530

[WIP] Core Structures for Chart Styles Implementation

Change-Id: I2e96606184b895d572eabdfbac1539a2881e3541

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc19-chart-style' - offapi/com offapi/UnoApi_offapi.mk

2019-07-03 Thread Markus Mohrhard (via logerrit)
 offapi/UnoApi_offapi.mk|2 +
 offapi/com/sun/star/chart2/ChartObjectType.idl |   24 +
 offapi/com/sun/star/chart2/XChartStyle.idl |   28 +
 3 files changed, 54 insertions(+)

New commits:
commit fa2aa8d749c153e660ed5e8c976802921ab59eea
Author: Markus Mohrhard 
AuthorDate: Thu Jul 4 00:26:34 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Thu Jul 4 00:26:34 2019 +0800

add interfaces for chart style

Change-Id: Ib8e118a5c866187507d438f1decbc49ffafd0dd4

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 0f4137996e41..9d158bc16c55 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1997,6 +1997,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/chart,\
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/chart2,\
AxisOrientation \
AxisType \
+   ChartObjectType \
CoordinateSystemTypeID \
CurveStyle \
DataPointGeometry3D \
@@ -2021,6 +2022,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/chart2,\
XChartDocument \
XChartShape \
XChartShapeContainer \
+   XChartStyle \
XChartStyles \
XChartType \
XChartTypeContainer \
diff --git a/offapi/com/sun/star/chart2/ChartObjectType.idl 
b/offapi/com/sun/star/chart2/ChartObjectType.idl
new file mode 100644
index ..c84c99b661ef
--- /dev/null
+++ b/offapi/com/sun/star/chart2/ChartObjectType.idl
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef com_sun_star_chart2_ChartObjectType_idl__
+#define com_sun_star_chart2_ChartObjectType_idl__
+
+module com { module sun { module star { module chart2 {
+
+constants ChartObjectType
+{
+const short TITLE = 0;
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/offapi/com/sun/star/chart2/XChartStyle.idl 
b/offapi/com/sun/star/chart2/XChartStyle.idl
new file mode 100644
index ..a072d6f2c833
--- /dev/null
+++ b/offapi/com/sun/star/chart2/XChartStyle.idl
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef com_sun_star_chart2_XChartStyle
+#define com_sun_star_chart2_XChartStyle
+
+#include 
+#include 
+#include 
+
+module com { module sun { module star { module chart2 {
+
+interface XChartStyle : ::com::sun::star::uno::XInterface
+{
+com::sun::star::beans::XPropertySet getStyleForObject([in] short 
chartObjectType);
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: UI tests opening all possible dialogs

2019-06-22 Thread Markus Mohrhard
Hello Artur,

On Fri, Jun 21, 2019 at 12:06 PM Artur Neumann 
wrote:

> Forgot the link to the changes, here it is:
> https://gerrit.libreoffice.org/#/c/74333/
> On 2019-06-20 5:01 p.m., Artur Neumann wrote:
>
> I've made some UI tests that open every dialog in calc, close it with the
> "close" or "cancel" button and if there is an "OK" button open it again and
> click the "OK" button
>
> These tests should simply make sure there are no crashes by
> opening/closing the dialogues and protect against regressions like
> https://bugs.documentfoundation.org/show_bug.cgi?id=120227
> https://bugs.documentfoundation.org/show_bug.cgi?id=125982
> https://bugs.documentfoundation.org/show_bug.cgi?id=125985
>
> I just wanted to have some feedback if picking those low-hanging fruits is
> a valid approach and worth the effort and CI time.
>
>
I think that in general it is a good idea. Depending on how long it takes
to execute the test we might need to think about whether we can actually
include the tests in a normal make/make check or if they need to be treated
differently. Did you already have a chat with Raal who has been writing
tests for many bugs/dialogs already?

If yes I could extend the tests by:
>
>1. doing the same for writer, impress, etc.
>2. delete obsolete tests like uitest/calc_tests/about_test.py
>3. define preconditions for the "OK" click, e.g. input data into fields
>4. define assertion after the click on the "OK" button
>
>
In general this sounds like a good idea. As mentioned it might be good to
have a chat with Raal who might have an overview how far we are in opening
all dialogs already.

Regards,
Markus

>
>
> Thoughts? Ideas?
>
> --
> Artur Neumann
> Director/CTO
> Jankari Tech Pvt Ltdwww.jankaritech.com
> Phone: +977 9806639223
> Skype: artur.n.
> GitHub: https://github.com/individual-it
>
>
> ___
> LibreOffice mailing 
> listLibreOffice@lists.freedesktop.orghttps://lists.freedesktop.org/mailman/listinfo/libreoffice
>
> --
> Artur Neumann
> Director/CTO
> Jankari Tech Pvt Ltdwww.jankaritech.com
> Phone: +977 9806639223
> Skype: artur.n.
> GitHub: https://github.com/individual-it
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: UNO connection problems (GSOC Report Week 3)

2019-06-20 Thread Markus Mohrhard
Hey,

you can also have a look at the existing OfficeConnection class from
https://cgit.freedesktop.org/libreoffice/core/tree/uitest/libreoffice/connection.py

That one should contain quite some logic to handle different corner cases
and should warn if the environment is not set-up correctly.

Markus

On Thu, Jun 20, 2019 at 2:59 PM Stephan Bergmann 
wrote:

> On 19/06/2019 22:32, Rasmus Jonsson wrote:
> > On Wed, 19 Jun 2019 08:07:15 +0200
> > Stephan Bergmann  wrote:
> >
> > This worked, thanks. However, the project requires using whichever
> > LibreOffice installation is available.
>
> For C++ and Java there is helper functionality in the LO SDK for
> 3rd-party apps to find and access a LO installation, see
> <
> https://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C%2B%2B/Transparent_Use_of_Office_UNO_Components>
>
> and
> <
> https://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Transparent_Use_of_Office_UNO_Components>,
>
> respectively.  But I don't think something like that has ever been
> implemented for Python.
>
> >> The python interpreter needs to know about LO's UNO files, and a
> >
> > Which are these UNO files?
>
> Look into what instdir/program/python (a shell script) is doing before
> executing instdir/program/python.bin (the actual python executable).
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2019-05-10 Thread Markus Mohrhard (via logerrit)
 sc/source/filter/excel/xecontent.cxx |   27 ---
 1 file changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 569c2229dd890aad07035d81b1ce3b1b3d7bc244
Author: Markus Mohrhard 
AuthorDate: Sun Jul 15 00:18:58 2018 +0200
Commit: Andras Timar 
CommitDate: Fri May 10 08:25:43 2019 +0200

related tdf#117816, only export cond format formula to xlsx when required

Change-Id: I7523d17e9945dfbdf0c346fff8eddd40593f946a
Reviewed-on: https://gerrit.libreoffice.org/57444
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 16048ebc230880148346f02403820b7646b2649c)
Reviewed-on: https://gerrit.libreoffice.org/72007
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index 9c90d2d1c1bb..557ef69f3d93 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -939,6 +939,27 @@ bool IsTextRule(ScConditionMode eMode)
 return false;
 }
 
+bool RequiresFormula(ScConditionMode eMode)
+{
+if (IsTopBottomRule(eMode))
+return false;
+else if (IsTextRule(eMode))
+return false;
+
+switch (eMode)
+{
+case ScConditionMode::NoError:
+case ScConditionMode::Error:
+case ScConditionMode::Duplicate:
+case ScConditionMode::NotDuplicate:
+return false;
+default:
+break;
+}
+
+return true;
+}
+
 bool RequiresFixedFormula(ScConditionMode eMode)
 {
 switch(eMode)
@@ -965,9 +986,9 @@ OString GetFixedFormula(ScConditionMode eMode, const 
ScAddress& rAddress, const
 switch (eMode)
 {
 case ScConditionMode::Error:
-return "";
+return OString("ISERROR(" + aPos + ")") ;
 case ScConditionMode::NoError:
-return "";
+return OString("NOT(ISERROR(" + aPos + "))") ;
 case ScConditionMode::BeginsWith:
 return OString("LEFT(" + aPos + ",LEN(\"" + rText + "\"))=\"" + 
rText + "\"");
 case ScConditionMode::EndsWith:
@@ -1036,7 +1057,7 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
 rWorksheet->writeEscaped(aFormula.getStr());
 rWorksheet->endElement( XML_formula );
 }
-else if(!IsTextRule(eOperation) && !IsTopBottomRule(eOperation))
+else if(RequiresFormula(eOperation))
 {
 rWorksheet->startElement( XML_formula, FSEND );
 std::unique_ptr 
pTokenArray(mrFormatEntry.CreateFlatCopiedTokenArray(0));
___
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' - sc/qa

2019-05-10 Thread Markus Mohrhard (via logerrit)
 sc/qa/unit/data/ods/conditionalformat_containstext.ods |binary
 sc/qa/unit/subsequent_export-test.cxx  |   13 +
 2 files changed, 13 insertions(+)

New commits:
commit 02a57aa51d71680ed64ce6519d77e28db06b03b3
Author: Markus Mohrhard 
AuthorDate: Sat Jul 14 15:29:41 2018 +0200
Commit: Andras Timar 
CommitDate: Fri May 10 08:25:01 2019 +0200

add test for tdf#117816

Reviewed-on: https://gerrit.libreoffice.org/57433
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 7e8dbbb02f25278d5afc51ae4a397831f5b21239)

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

diff --git a/sc/qa/unit/data/ods/conditionalformat_containstext.ods 
b/sc/qa/unit/data/ods/conditionalformat_containstext.ods
new file mode 100644
index ..fa3e21e29f5a
Binary files /dev/null and 
b/sc/qa/unit/data/ods/conditionalformat_containstext.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index c095e9fb3847..831c98750454 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -110,6 +110,7 @@ public:
 void testDataBarExportODS();
 void testDataBarExportXLSX();
 void testConditionalFormatRangeListXLSX();
+void testConditionalFormatContainsTextXLSX();
 void testConditionalFormatPriorityCheckXLSX();
 void testMiscRowHeightExport();
 void testNamedRangeBugfdo62729();
@@ -237,6 +238,7 @@ public:
 CPPUNIT_TEST(testDataBarExportODS);
 CPPUNIT_TEST(testDataBarExportXLSX);
 CPPUNIT_TEST(testConditionalFormatRangeListXLSX);
+CPPUNIT_TEST(testConditionalFormatContainsTextXLSX);
 CPPUNIT_TEST(testConditionalFormatPriorityCheckXLSX);
 CPPUNIT_TEST(testMiscRowHeightExport);
 CPPUNIT_TEST(testNamedRangeBugfdo62729);
@@ -3922,6 +3924,17 @@ void ScExportTest::testConditionalFormatRangeListXLSX()
 assertXPath(pDoc, "//x:conditionalFormatting", "sqref", "F4 F10");
 }
 
+void ScExportTest::testConditionalFormatContainsTextXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("conditionalformat_containstext.", 
FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.is());
+
+xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, 
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+
+assertXPathContent(pDoc, "//x:conditionalFormatting/x:cfRule/x:formula", 
"NOT(ISERROR(SEARCH(\"test\",A1)))");
+}
+
 void ScExportTest::testConditionalFormatPriorityCheckXLSX()
 {
 ScDocShellRef xDocSh = loadDoc("conditional_fmt_checkpriority.", 
FORMAT_XLSX);
___
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' - sc/source

2019-05-10 Thread Markus Mohrhard (via logerrit)
 sc/source/filter/excel/xecontent.cxx |   64 ---
 1 file changed, 53 insertions(+), 11 deletions(-)

New commits:
commit 0420bf0da699493c91164cdd8b9f8fe488f0fb67
Author: Markus Mohrhard 
AuthorDate: Sat Jul 14 23:56:44 2018 +0200
Commit: Andras Timar 
CommitDate: Fri May 10 08:25:23 2019 +0200

related tdf#117816, add more work arounds for MS Excel bugs

Another set of cases where MS Excel needs the formula.

Change-Id: I58344a540ad69ff9b8c56aa817730079bd011acd
Reviewed-on: https://gerrit.libreoffice.org/57443
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 6df45ae3a85b21d984605a6656282e5feaf8dea9)
Reviewed-on: https://gerrit.libreoffice.org/72006
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index eda436ad1b84..9c90d2d1c1bb 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -939,6 +939,50 @@ bool IsTextRule(ScConditionMode eMode)
 return false;
 }
 
+bool RequiresFixedFormula(ScConditionMode eMode)
+{
+switch(eMode)
+{
+case ScConditionMode::NoError:
+case ScConditionMode::Error:
+case ScConditionMode::BeginsWith:
+case ScConditionMode::EndsWith:
+case ScConditionMode::ContainsText:
+case ScConditionMode::NotContainsText:
+return true;
+default:
+break;
+}
+
+return false;
+}
+
+OString GetFixedFormula(ScConditionMode eMode, const ScAddress& rAddress, 
const OString& rText)
+{
+OStringBuffer aBuffer;
+OStringBuffer aPosBuffer = XclXmlUtils::ToOString(aBuffer, rAddress);
+OString aPos = aPosBuffer.makeStringAndClear();
+switch (eMode)
+{
+case ScConditionMode::Error:
+return "";
+case ScConditionMode::NoError:
+return "";
+case ScConditionMode::BeginsWith:
+return OString("LEFT(" + aPos + ",LEN(\"" + rText + "\"))=\"" + 
rText + "\"");
+case ScConditionMode::EndsWith:
+return OString("RIGHT(" + aPos +",LEN(\"" + rText + "\"))=\"" + 
rText + "\"");
+case ScConditionMode::ContainsText:
+return OString("NOT(ISERROR(SEARCH(\"" + rText + "\"," + aPos + 
")))");
+case ScConditionMode::NotContainsText:
+return OString("ISERROR(SEARCH(\"" +  rText + "\"," + aPos + "))");
+default:
+break;
+}
+
+return OString("");
+}
+
 }
 
 void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
@@ -984,7 +1028,15 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
 XML_text, aText.getStr(),
 XML_dxfId, OString::number( GetDxfs().GetDxfId( 
mrFormatEntry.GetStyle() ) ).getStr(),
 FSEND );
-if(!IsTextRule(eOperation) && !IsTopBottomRule(eOperation))
+
+if (RequiresFixedFormula(eOperation))
+{
+rWorksheet->startElement( XML_formula, FSEND );
+OString aFormula = GetFixedFormula(eOperation, 
mrFormatEntry.GetValidSrcPos(), aText);
+rWorksheet->writeEscaped(aFormula.getStr());
+rWorksheet->endElement( XML_formula );
+}
+else if(!IsTextRule(eOperation) && !IsTopBottomRule(eOperation))
 {
 rWorksheet->startElement( XML_formula, FSEND );
 std::unique_ptr 
pTokenArray(mrFormatEntry.CreateFlatCopiedTokenArray(0));
@@ -1000,16 +1052,6 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
 rWorksheet->endElement( XML_formula );
 }
 }
-else if (IsTextRule(eOperation))
-{
-OStringBuffer aBufferOld;
-OStringBuffer aBuffer = XclXmlUtils::ToOString(aBufferOld, 
mrFormatEntry.GetValidSrcPos());
-OString aTextTopCell = aBuffer.makeStringAndClear();
-OString aFormula = "NOT(ISERROR(SEARCH(\"" + aText + "\"," + 
aTextTopCell + ")))";
-rWorksheet->startElement( XML_formula, FSEND );
-rWorksheet->writeEscaped(aFormula.getStr());
-rWorksheet->endElement( XML_formula );
-}
 // OOXTODO: XML_extLst
 rWorksheet->endElement( XML_cfRule );
 }
___
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' - sc/source

2019-05-10 Thread Markus Mohrhard (via logerrit)
 sc/source/filter/excel/xecontent.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 5328e04744bbf570e70b13917a2142c0aca159ae
Author: Markus Mohrhard 
AuthorDate: Sat Jul 14 15:16:46 2018 +0200
Commit: Andras Timar 
CommitDate: Fri May 10 08:24:39 2019 +0200

tdf#117816, work around MS Excel bug with containsText cond format

Excel seems to require the formula that is equal to the containsText
condition.

According to cfRule (18.3.1.10) "Only rules with a type attribute
 value of expression support formula syntax." which contradicts the
MS EXCEL behavior.

Change-Id: Ifa3f9fee58194f70a64b37c62922513435d43bb8
Reviewed-on: https://gerrit.libreoffice.org/57432
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit e77596be879c25f5766b73a2f67cf0ddf7775ccc)
Reviewed-on: https://gerrit.libreoffice.org/72004
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index d99607a1e0c2..eda436ad1b84 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1000,6 +1000,16 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
 rWorksheet->endElement( XML_formula );
 }
 }
+else if (IsTextRule(eOperation))
+{
+OStringBuffer aBufferOld;
+OStringBuffer aBuffer = XclXmlUtils::ToOString(aBufferOld, 
mrFormatEntry.GetValidSrcPos());
+OString aTextTopCell = aBuffer.makeStringAndClear();
+OString aFormula = "NOT(ISERROR(SEARCH(\"" + aText + "\"," + 
aTextTopCell + ")))";
+rWorksheet->startElement( XML_formula, FSEND );
+rWorksheet->writeEscaped(aFormula.getStr());
+rWorksheet->endElement( XML_formula );
+}
 // OOXTODO: XML_extLst
 rWorksheet->endElement( XML_cfRule );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Google Summer of Code Questions

2019-04-08 Thread Markus Mohrhard
Hey,

On Tue, Apr 9, 2019 at 1:16 AM Zhiye Hong 
wrote:

> Dear mentors.
>
> I'm undergraduate student from University of Sydney. I have high skills in
> python programming and wish to do Google summer code. But I'm brand new and
> have no idea how to write a decent proposal.
>
> My WAM is around 80 and have a good understanding on the skills listed in
> your GSOC page.
>
> Can I get some instructions? I know the decline is close, but I would like
> to have a go. Thanks you!
>


You are really late and would need to solve an easy hack and write a
proposal.

Our instructions for GSoC can be found at
https://wiki.documentfoundation.org/Development/GSoC/Ideas and the
instructions for getting involved which you need for an easy hack can be
found at https://wiki.documentfoundation.org/Development/GetInvolved

Regards,
Markus

>
> Regards,
>
> Roger Hong
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: 404 error gerrit docunentation website

2019-03-30 Thread Markus Mohrhard
Hey,

I doubt anyone really looks at the gerrit documentation. Most of what you
actually need, especially as a beginner, is documented in the TDF wiki.
What you found is the official gerrit documentation for the gerrit version
that we use.

If you are looking for instructions about LibreOffice development and
LibreOffice's gerrit instance have a look at
https://wiki.documentfoundation.org/Development/gerrit and
https://wiki.documentfoundation.org/Development/GetInvolved

Regards,
Markus



On Sat, Mar 30, 2019 at 11:40 PM krishna leela  wrote:

> the issue on page: https://gerrit.libreoffice.org/Documentation/index.html
>
> 1 d: Default Android Workflow (external)
>
> clicking the link: https://source.android.com/submit-patches/workflow
> shows error 404
>
> thank u :)
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: CppUnit updates

2019-03-29 Thread Markus Mohrhard
Hey,

On Sat, Mar 30, 2019 at 6:22 AM Andrés Maldonado 
wrote:

> Hello,
>
> I was working on EasyHack 122169
>  and
> submitted a patch  to Gerrit,
> but the Jenkins build failed because the commit
> 
> that adds the CPPUNIT_TEST_FIXTURE macro is not yet on a released version
> of CppUnit. Would it be possible to make a cppunit-1.14.1 release ? :)
>

There won't be a 1.14.1 release. At some point I'll release 1.15 but need
more time to polish the release. Currently the plan is not to include
CPPUNIT_TEST_FIXTURE in any future releases. I have realized that
CPPUNIT_TEST_FIXTURE is not a good API for cppunit.


> I would also like to suggest to create a page with the latest
> documentation ;) (the most recent doc that i found online
>  is from the
> original project, for version 1.10.2)
>

There is an up-to-date set of the documentation at
https://people.freedesktop.org/~mmohrhard/cppunit/index.html

Regards,
Markus

>
> Cheers,
> Andrés Maldonado
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] minutes of ESC call ...

2019-03-28 Thread Markus Mohrhard
Hey Michael, all,

On Fri, Mar 29, 2019 at 12:44 AM Michael Meeks 
wrote:

> Hi Markus,
>
> On 28/03/2019 16:13, Markus Mohrhard wrote:
> > so in general the fastest way to get some feedback might be to ping me
> > directly and give me some time to look into such issues. While I still
> > have quite bad internet and can't do any uploads of symbol information I
> > can still at least quickly inspect the problem.
>
> That would be wonderful ! =)
>


This one was caused by a missing symbol extraction after symbol upload. I
could not find any reason in the log files that explains why the upload of
the symbols would succeed but the unziping of the uploaded file would fail.
As a result the symbol information for most of our own symbols were missing.

After a manual extraction I can see at least most of the libmerged symbols
being resolved when I call minidump_stackwalk manually on the server.
However, the mentioned symbol information issue still remains and in some
cases where the top level stack frame is in a system library we still miss
some resolved stack frames.

Regards,
Markus


> > One general problem that we have is that we have no recent windows debug
> > symbol information. I tried to move that service from my local machine
> > to the server during the Munich hackfest but did not manage to replicate
> > my setup well enough that valid symbol information are generated. Sadly
> > this has some knock-on effects as can be seen by some of the unresolved
> > crash reports. At least on Windows getting a backtrace requires that
> > enough of the stack pointers can be guessed from the dumped stack. This
> > relies to some to degree on the system symbol informations.
>
> Interesting.
>
> > As soon as I have a non-mobile internet connection again I'll either run
> > a full set of system symbol download on my machine or finish the work on
> > moving that service to the server.
>
> Much appreciated ! our top crasher is (obviously) the one without
> any
> symbol information that lurks in libmerged currently ;-)
>
> Regards,
>
> Michael.
>
> --
> michael.me...@collabora.com <><, GM Collabora Productivity
> Hangout: mejme...@gmail.com, Skype: mmeeks
> (M) +44 7795 666 147 - timezone usually UK / Europe
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] minutes of ESC call ...

2019-03-28 Thread Markus Mohrhard
Hey,


* Crash Reporting (Xisco)
>   + http://crashreport.libreoffice.org/stats/version/6.1.4.2
> + 837 (+46)
>   + http://crashreport.libreoffice.org/stats/version/6.1.5.2
> + 875 634 (+241)
>   + http://crashreport.libreoffice.org/stats/version/6.2.0.3
> + 1295 (+59)
>   + http://crashreport.libreoffice.org/stats/version/6.2.1.2
> + 1227 (+79)
>   + http://crashreport.libreoffice.org/stats/version/6.2.2.2
> + 724 (-)
>   + looks good for latest version, still have a symbol issue
>   + not a generic issue with all reports (Christian)
> + just a display issue – all on the same category
> + all current versions should be handled correctly.
> + when searching for crash reports in libmerged: plenty have
>   symbols resolved.
> + problem is 6.2.2.2 (Michael)
>
> http://crashreport.libreoffice.org/stats/crash_details/49887f06-5a2e-49ad-baf0-9e542d00c08e
>+ 322 of these for 6.2.2.2 alone
>+ are these just the not-yet-processed ones ? (Miklos)
>   + as in those are from today.
>+ from the 25th first sampled: (Michael)
>
> http://crashreport.libreoffice.org/stats/crash_details/f58d07b9-4e38-480a-b0a4-8f92a2a4170e
> AI:+ take a look at it (Christian)
>
>
so in general the fastest way to get some feedback might be to ping me
directly and give me some time to look into such issues. While I still have
quite bad internet and can't do any uploads of symbol information I can
still at least quickly inspect the problem.

One general problem that we have is that we have no recent windows debug
symbol information. I tried to move that service from my local machine to
the server during the Munich hackfest but did not manage to replicate my
setup well enough that valid symbol information are generated. Sadly this
has some knock-on effects as can be seen by some of the unresolved crash
reports. At least on Windows getting a backtrace requires that enough of
the stack pointers can be guessed from the dumped stack. This relies to
some to degree on the system symbol informations.

As soon as I have a non-mobile internet connection again I'll either run a
full set of system symbol download on my machine or finish the work on
moving that service to the server.

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

Re: Query related compiler support in VisualDsp

2019-03-27 Thread Markus Mohrhard
Hey,

On Wed, Mar 27, 2019 at 8:29 PM Geeta Bahutale 
wrote:

> Hi,
>
>
>
> I am from L Mumbai Branch. I would like to know whether VisualDsp++
> support CppUnit framework? My code is in the VisiualDSP++. I need to write
> unit test cases in CppUnit.
>
> I have experience using CppUnit in IAR compiler.
>
>
>
> Can you help me with this?
>

we have no experience with VisualDsp++. Older versions up to cppunit-1.13
should only require a really old C++ compiler (most likely baseline is
somewhere around MSVC 6 or gcc 4.2, possibly even older). Newer cppunit
versions (1.14 and the unreleased 1.15) need C++11 support and don't
support compilers without namespaces, broken standard libraries or other
quirks.

Your best bet is to just clone the cppunit source code, built the source
and run the tests. If your compiler is limited you should checkout the 1-13
branch and use that.

Regards,
Markus


>
>
>
>
> Thanks,
>
> Geeta Bahutale
>
> 9920736014
>
> *L Technology Services Ltd*
>
> www.LntTechservices.com
>
> This Email may contain confidential or privileged information for the
> intended recipient (s). If you are not the intended recipient, please do
> not use or disseminate the information, notify the sender and delete it
> from your system.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Implementing interface for importing external data in calc

2019-03-21 Thread Markus Mohrhard
Hey,

On Fri, Mar 22, 2019 at 12:46 AM smooth_vaibhav 
wrote:

> Is there any documentation for the already available UI implementation and
> the data import code files. I have already gone through the data import
> code
> files like the ones residing in sc/source/ui/dataprovider/.
>

As you might have discovered this is the data provider and data
transformation code.

Can you provide me with some code pointers for the UI implementation of the
> data import functionality that you mentioned.
>


The corresponding UI code is in sc/source/ui/miscdlgs/dataproviderdlg.cxx
and sc/source/ui/inc/dataproviderdlg.hxx but as I mentioned it is quite
rough and might need some UX rethinking.

Regards,
Markus


>
>
>
>
> --
> 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 mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Implementing interface for importing external data in calc

2019-03-21 Thread Markus Mohrhard
Hey,

On Thu, Mar 21, 2019 at 5:37 PM smooth_vaibhav 
wrote:

> I have been keen about the project idea of implementing the import
> functionality of external data in calc. I have some queries regarding it.
>
> 1) There are numerous possibilities of external data sources like database,
> files. So should the implementation should be independent of external
> source
> of data or is it the case that we first gonna store it in a ScDBdata.
>

The project is about adding some external data sources and the possibility
to extend that through extensions. We already have a few providers for
external sources from last year's GSoC project. The second step of
transforming the data before we actually write it to the calc document
itself is independent of the actual source.


> 2) Its given that the user can select the range of data to be selected and
> imported. Does that imply we provide them with a UI such that they can
> choose the number of columns and rows to be imported.
>
> I acknowledge the fact that the Mail list is to be used just for important
> purposes but I have some queries to clear for better understanding of the
> project idea.
>


Yes. There is already a really ugly UI that I hacked together a year ago.
In a current master build just go to Data->Data Provider and play around.
You might need to define a DB Range before actually being able to import
the data into the document.

As can be seen by the ugly UI there is quite some work necessary to make
the feature user friendly and I think this should be a central part of this
year's GSoC project.

Regards,
Markus

>
> Thanks.
>
>
>
> --
> 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 mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Implementing interface for importing external data in calc

2019-03-21 Thread Markus Mohrhard
Hey,

please ignore this email. The original email is about a GSoC project and
not about macro progamming.

Kind regards,
Markus

On Fri, Mar 22, 2019 at 12:12 AM sos  wrote:

> hallo,
>
> you can import data into a spreadsheet in 2 ways
>
> Fast = connecting the Calcdoc to a databasedoc and using buildin
> "Importer" service oDBRange.getReferredCells.doImport(oDesc())
>
> Slow = import cell by cell using a dataset or a array
>
> fast
>
> function ConnectCalc_to_DBdoc(Optional sqlcalc as String, sDocURL as
> String , optional sArea as string)
> dim extt as string
> extt = right(bstandnm , 3)
> SearchFlags = com.sun.star.frame.FrameSearchFlag.CREATE +
> com.sun.star.frame.FrameSearchFlag.ALL
>
> if ucase(extt) = "OTS" then 'calc template
>  Dim args(3) As New com.sun.star.beans.PropertyValue
> Dim URL As String
>' URL = convertToUrl("T:\Template\TOOLS\Berichten_spreadsheet.ots")
> URL = convertToUrl(sDocurl)
> args(0).Name = "AsTemplate"
> args(0).Value = True
> args(1).Name = "MacroExecutionMode"
> args(1).Value =
> com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN
> args(2).Name = "FilterName"
> args(2).Value = "calc8_template"
> args(3).Name = "Hidden"
> args(3).Value = false
> ODS = StarDeskTop.LoadComponentFromUrl(URL, "_blank", 0, args())
> else
>  ODS =
> StarDesktop.loadComponentFromURL("private:factory/scalc","_blank",SearchFlags,Array())
>endif
>
> oSheet = ODS.Sheets.getByIndex(0)
> if ismissing(sArea) then
> sArea = "A1"
> endif
> area = osheet.getCellRangeByName(sArea).getRangeAddress()' adres is
> nodig, niet de range opzich
> if not oDS.DatabaseRanges.hasByName("MyImport") then
> oDS.DatabaseRanges.addNewByName("MyImport",area)
> endif
> oDBRange = oDS.DataBaseRanges.getByName("MyImport")
> oDBcontext = CreateUnoService("com.sun.star.sdb.DatabaseContext")
> if oDBcontext.hasbyname("mysql_native")then
> oDBcontext.revokeDatabaseLocation("mysql_native")
> endif
>
>
> oDBcontext.registerDatabaseLocation("mysql_native",converttoURL("\\your
> DBdoclocation")
>
> oDB = oDBcontext.GetByName("mysql_native")
> oDB.Password = "yourpassword"
>
> ' we make first a QUERY because a simple  SQLstring in the
> ImportDescritor only works with  OO-SQL en not with a native SQL  (this is
> a bug)
>
> oQdefs = oDB.QueryDefinitions
> oQ = createUnoService("com.sun.star.sdb.QueryDefinition")
> oQ.EscapeProcessing = False
> oQ.command = sqlcalc
> If oQDefs.hasByName("calcdoc") Then
>   oQDefs.removeByName("calcdoc")', oQueryObject)
>End If
> oQDefs.insertByName("calcdoc", oQ)
>
> Dim oDesc(3) as new com.sun.star.beans.PropertyValue
> oDesc(0).Name = "DatabaseName"
> oDesc(0).Value = "mysql_native"
> oDesc(1).Name = "SourceType"
> oDesc(1).Value = com.sun.star.sheet.DataImportMode.QUERY
> oDesc(2).Name = "SourceObject"
> oDesc(2).Value = "calcdoc"
>  '   oDesc(3).Name = "IsNative"  'must been false  !
>   '  oDesc(3).Value = false
> oDBRange.getReferredCells.doImport(oDesc())
> oDBcontext.revokeDatabaseLocation("mysql_native")
> oDS.DatabaseRanges.removeByName("MyImport")
>
> Dim FileProperties(1) As New com.sun.star.beans.PropertyValue
> Url = "file:///" & sDocurl
>FileProperties(0).Name = "Overwrite"
> FileProperties(0).Value = True
> FileProperties(1).Name = "FilterName"
> if lcase(extt) = "xls" then
> FileProperties(1).Value = "MS Excel 97"
> else
> FileProperties(1).Value = ""
> end if
>
> If NOT IsMissing(sDocurl) and len(sDocurl) > 5 and
> ucase(right(sDocurl,3)) <> "OTS" Then
> oDS.storeAsURL(Url, FileProperties())
> end if
> ConnectionviaDBdoc = ODS
> end FUNCTION
>
> slow
>
> Sub ResultSetToCalc(oResultGet)
> Dim args(3) As New com.sun.star.beans.PropertyValue
> args(1).Name = "MacroExecutionMode"
> args(1).Value =
> com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN
> args(2).name = "Hidden"
> args(2).Value = true
> ods = nothing
> ODS =
> StarDesktop.LoadComponentFromUrl("private:factory/scalc","_default",0,args())
> oSheet = ODS.Sheets.getByIndex(0)
> oCellCursor = oSheet.createCursor()
>
> xPos = 0
> yPos = 3
>
> For i = 0 To oResultGet.MetaData.ColumnCount - 1
> Cell = oSheet.getCellByPosition(xPos + i, yPos)
> Cell.String = oResultGet.MetaData.getColumnName(i+1)
> Next i
> oResultGet.beforeFirst()
> while oResultGet.next()
> yPos = yPos + 1
> For i = 0 To oResultGet.MetaData.ColumnCount - 1
> Cell = oSheet.getCellByPosition(xPos + i, yPos)
> Cell.String =
> oResultGet.getString(oResultGet.findColumn(oResultGet.MetaData.getColumnName(i+1)))
> Next i
> wend
>
> oCellCursor.gotoStartOfUsedArea(true)
> 

Re: [Libreoffice-qa] Extending subsequent tests with dogtail tests?

2019-03-10 Thread Markus Mohrhard
Hey,

On Fri, Mar 8, 2019 at 6:33 PM Miklos Vajna  wrote:

> Hi,
>
> The current practice is: if 'make check' passes (which is more or less
> enforced by Jenkins) and the change looks good to a reviewer, the change
> goes in. And then releases are based on time, so it's really rare that
> there are "blocker" bugs which would delay a release.
>
> The ideal for any new kind of testing (including accessibility) is that
> it's integrated into 'make check', and whatever those tests cover are
> not OK to be broken anytime.
>
> If the proposed a11y tests are part of make check, then it's easy to
> promise that they won't be broken; otherwise it's just a best effort
> thing without any guarantees.
>
> At least that's how I understood what Markus wrote, and I agree with
> that.
>

Exactly that. With the added comment about the reliability necessary or
developers will start ignoring test failures or even worse disable failing
tests.

Kind regards,
Markus


> Regards,
>
> Miklos
>
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: Extending subsequent tests with dogtail tests?

2019-03-10 Thread Markus Mohrhard
Hey,

On Fri, Mar 8, 2019 at 6:33 PM Miklos Vajna  wrote:

> Hi,
>
> The current practice is: if 'make check' passes (which is more or less
> enforced by Jenkins) and the change looks good to a reviewer, the change
> goes in. And then releases are based on time, so it's really rare that
> there are "blocker" bugs which would delay a release.
>
> The ideal for any new kind of testing (including accessibility) is that
> it's integrated into 'make check', and whatever those tests cover are
> not OK to be broken anytime.
>
> If the proposed a11y tests are part of make check, then it's easy to
> promise that they won't be broken; otherwise it's just a best effort
> thing without any guarantees.
>
> At least that's how I understood what Markus wrote, and I agree with
> that.
>

Exactly that. With the added comment about the reliability necessary or
developers will start ignoring test failures or even worse disable failing
tests.

Kind regards,
Markus


> Regards,
>
> Miklos
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] Extending subsequent tests with dogtail tests?

2019-03-07 Thread Markus Mohrhard
Hey,

let me at least add some comments.

On Thu, Mar 7, 2019 at 5:42 PM Jean-Philippe MENGUAL <
jean-philippe.meng...@libreoffice.org> wrote:

> Hi,
>
>
> Le 06/03/2019 à 20:52, Samuel Thibault a écrit :
> > Hello,
> >
> > Markus Mohrhard, le lun. 25 févr. 2019 00:34:33 +0800, a ecrit:
> >> On a slightly related note I think that we have already quite a few
> tests for
> >> the accessibility UNO layer but as that layer is full of bugs many of
> the tests
> >> are disabled. It might be a good idea to work on these tests before
> actually
> >> trying to implement more complex tests that depend on lower layers
> working
> >> correctly.
> >
> > I'm not sure which piece you are referring to.  Is that the AWB?  I
> > indeed see some source code in toolkit/test/accessibility but no
> > reference to it.
>

There should be accessibility UNO API tests in most top level modules. E.g.
from a quick git grep Accessible -- qadevOOo/Jar_OOoRunner.mk:

qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessible \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleText \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_basctl/AccessibleShape \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sch/AccessibleDocumentView \
qadevOOo/Jar_OOoRunner.mk:qadevOOo/tests/java/mod/_sc/ScAccessibleCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleDocument \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sd/AccessibleOutlineView \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sd/AccessibleSlideView \
qadevOOo/Jar_OOoRunner.mk:qadevOOo/tests/java/mod/_sm/SmEditAccessible \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sm/SmGraphicAccessible \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleTabBar \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry \
qadevOOo/Jar_OOo

Re: Extending subsequent tests with dogtail tests?

2019-03-07 Thread Markus Mohrhard
Hey,

let me at least add some comments.

On Thu, Mar 7, 2019 at 5:42 PM Jean-Philippe MENGUAL <
jean-philippe.meng...@libreoffice.org> wrote:

> Hi,
>
>
> Le 06/03/2019 à 20:52, Samuel Thibault a écrit :
> > Hello,
> >
> > Markus Mohrhard, le lun. 25 févr. 2019 00:34:33 +0800, a ecrit:
> >> On a slightly related note I think that we have already quite a few
> tests for
> >> the accessibility UNO layer but as that layer is full of bugs many of
> the tests
> >> are disabled. It might be a good idea to work on these tests before
> actually
> >> trying to implement more complex tests that depend on lower layers
> working
> >> correctly.
> >
> > I'm not sure which piece you are referring to.  Is that the AWB?  I
> > indeed see some source code in toolkit/test/accessibility but no
> > reference to it.
>

There should be accessibility UNO API tests in most top level modules. E.g.
from a quick git grep Accessible -- qadevOOo/Jar_OOoRunner.mk:

qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessible \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleText \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_basctl/AccessibleShape \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sch/AccessibleDocumentView \
qadevOOo/Jar_OOoRunner.mk:qadevOOo/tests/java/mod/_sc/ScAccessibleCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleDocument \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sd/AccessibleOutlineView \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sd/AccessibleSlideView \
qadevOOo/Jar_OOoRunner.mk:qadevOOo/tests/java/mod/_sm/SmEditAccessible \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_sm/SmGraphicAccessible \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleTabBar \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox \
qadevOOo/Jar_OOoRunner.mk:
qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry \
qadevOOo/Jar_OOo

Re: [Libreoffice-qa] Extending subsequent tests with dogtail tests?

2019-02-24 Thread Markus Mohrhard
Hello Samuel,

let me add a few comments based on many years implementing testing
frameworks for LibreOffice and most recently working on the UI testing.

On Sat, Feb 23, 2019 at 6:24 PM Samuel Thibault  wrote:

> Noel Grandin, le sam. 23 févr. 2019 12:19:19 +0200, a ecrit:
> > However, the current python UI test stuff talks directly to the vcl/
> widgets.
> > But between the vcl/ widgets and an actual accessibility user lies at
> least two
> > major chunks of code - the generic accessibility/ stuff, and the
> operating
> > system specific bridges.
>
> Yes, that's my concern with testing only at the vcl layer.
>
> That said, we could as well make tests work at both layers. Run them
> along uitests, thus very frequently, and run them periodically through
> the accessibility layer on a system which has it.
>
>
If my understanding of your idea is correct you want to test actually two
things that are required for working accessibility for users. On one hand
you need to test the accessibility APIs and on the other hand correct focus
handling. I think you most likely want to test them independently if
possible as I think you'll discover that combining them will lead to hard
to diagnose problems. Additionally, the target of any test framework has to
be that it minimizes the number of random test failures and requires as
little adoption for unrelated code changes as possible.

I noticed after quickly looking at your proposed tests is that you use UI
strings in your tests which I think you want to avoid as much as possible.
There are several problems with UI strings that make them a bad property
during testing: they change often, often not even by developers and are
localized. Especially the second point means that your tests suddenly only
work in en-US which surely limits a bit the usefulness of the tests. Even
more if you plan to generate test cases automatically as it means that the
tests can only be generated with an en-US locale.

On a slightly related note I think that we have already quite a few tests
for the accessibility UNO layer but as that layer is full of bugs many of
the tests are disabled. It might be a good idea to work on these tests
before actually trying to implement more complex tests that depend on lower
layers working correctly. The focus handling can be easily integrated into
the existing UI testing infrastructure and might benefit there from some of
the concepts that should make them more stable (deadlock detection,
addressing UI elements through ID instead of UI visible strings, mostly
working async dialog and action handling) and I think it makes sense to
check how much of the accessibility part can not be covered with a
combination of UI testing and accessibility UNO API testing. It might even
be possible to get accessibility event interception into the UI testing to
check that events are generated correctly during actions. I would need to
look into how our accessibility handling works in the VCL layer to be sure
that this actually works.

For the dependencies we surely don't want to include the source code itself
into LibreOffice's external dependency handling. At least for the beginning
the easiest approach might be something like an
--enable-accessibility-tests flag which can be checked in configure.ac
where we make sure all required dependencies are around. If we ever decide
that they should be run by default we can still switch the default value
and make it possible for people to override the setting in their autogen
settings.

On a slightly related note, please make sure that you are developing
against python 3. I did not check if you are actually using any pure
python2 features but at least "#!/usr/bin/python" will get you a python 2
interpreter on most systems.

Kind regards,
Markus
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: Extending subsequent tests with dogtail tests?

2019-02-24 Thread Markus Mohrhard
Hello Samuel,

let me add a few comments based on many years implementing testing
frameworks for LibreOffice and most recently working on the UI testing.

On Sat, Feb 23, 2019 at 6:24 PM Samuel Thibault  wrote:

> Noel Grandin, le sam. 23 févr. 2019 12:19:19 +0200, a ecrit:
> > However, the current python UI test stuff talks directly to the vcl/
> widgets.
> > But between the vcl/ widgets and an actual accessibility user lies at
> least two
> > major chunks of code - the generic accessibility/ stuff, and the
> operating
> > system specific bridges.
>
> Yes, that's my concern with testing only at the vcl layer.
>
> That said, we could as well make tests work at both layers. Run them
> along uitests, thus very frequently, and run them periodically through
> the accessibility layer on a system which has it.
>
>
If my understanding of your idea is correct you want to test actually two
things that are required for working accessibility for users. On one hand
you need to test the accessibility APIs and on the other hand correct focus
handling. I think you most likely want to test them independently if
possible as I think you'll discover that combining them will lead to hard
to diagnose problems. Additionally, the target of any test framework has to
be that it minimizes the number of random test failures and requires as
little adoption for unrelated code changes as possible.

I noticed after quickly looking at your proposed tests is that you use UI
strings in your tests which I think you want to avoid as much as possible.
There are several problems with UI strings that make them a bad property
during testing: they change often, often not even by developers and are
localized. Especially the second point means that your tests suddenly only
work in en-US which surely limits a bit the usefulness of the tests. Even
more if you plan to generate test cases automatically as it means that the
tests can only be generated with an en-US locale.

On a slightly related note I think that we have already quite a few tests
for the accessibility UNO layer but as that layer is full of bugs many of
the tests are disabled. It might be a good idea to work on these tests
before actually trying to implement more complex tests that depend on lower
layers working correctly. The focus handling can be easily integrated into
the existing UI testing infrastructure and might benefit there from some of
the concepts that should make them more stable (deadlock detection,
addressing UI elements through ID instead of UI visible strings, mostly
working async dialog and action handling) and I think it makes sense to
check how much of the accessibility part can not be covered with a
combination of UI testing and accessibility UNO API testing. It might even
be possible to get accessibility event interception into the UI testing to
check that events are generated correctly during actions. I would need to
look into how our accessibility handling works in the VCL layer to be sure
that this actually works.

For the dependencies we surely don't want to include the source code itself
into LibreOffice's external dependency handling. At least for the beginning
the easiest approach might be something like an
--enable-accessibility-tests flag which can be checked in configure.ac
where we make sure all required dependencies are around. If we ever decide
that they should be run by default we can still switch the default value
and make it possible for people to override the setting in their autogen
settings.

On a slightly related note, please make sure that you are developing
against python 3. I did not check if you are actually using any pure
python2 features but at least "#!/usr/bin/python" will get you a python 2
interpreter on most systems.

Kind regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

perf.libreoffice.org and Callgrind TB working again

2019-02-13 Thread Markus Mohrhard via LibreOffice
Hey,

the Callgrind tinderbox is after several updates (F20->F29) working again
and seems to produce results again. The first round of results have been
published on perf.libreoffice.org again.

If you still see issues please report back to me.

Kind regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] Automate the installation of the nightly releases

2019-01-12 Thread Markus Mohrhard
Hey Jean-Philippe,

On Sun, Jan 13, 2019 at 12:38 AM Jean-Philippe MENGUAL <
jean-philippe.meng...@libreoffice.org> wrote:

> Hi,
>
> I now can use the Debian packaged release of the nightly builds of
> Libreoffice. I use the French langpack as well.
>
> Could you help me for writing a script run as root, in order to:
> - download the tarballs
> - untar
> - install the Debian packages
> - remove the tarballs and untarred foldersdossiers décompressés
>
> The binary needs to be installed before the langpack.
> I know all right what I need, but: in the URL processed by wget, there is:
>
> https://dev-builds.libreoffice.org/daily/master/Linux-rpm_deb-x86_64@86-TDF/current/
> 
> master~2019-01-11_09.39.05_LibreOfficeDev_6.3.0.0.alpha0_Linux_x86-64_deb.tar.gz
> 
> and:
>
> https://dev-builds.libreoffice.org/daily/master/Linux-rpm_deb-x86_64@86-TDF/current/master~2019-01-11_09.39.05_LibreOfficeDev_6.3.0.0.alpha0_Linux_x86-64_deb_langpack_fr.tar.gz
>
> - how can I detect th exact name of Linux-rpm_deb-x86_64@86-TDF
> automatically (the end number (86) is ramdom)
>

The number is the number for the build machine. So the @86 means that the
build was produced by the build machine with the number 86 and the
following "-TDF" that it is a TDF controlled machine. The remaining parts
are branch name, date and time, product name (LibreOffice vs
LibreOfficeDev), the version string and finally the platform.

I hope this helps you figuring out how to always find the correct build. I
think you want to keep build machine, branch name, product name and
platform constant and the version string should only change after a new
version has been branched off (only every 6 months).

Actually I think most of that is handled for you by always using the same
directory e.g.
https://dev-builds.libreoffice.org/daily/master/Linux-rpm_deb-x86_64@86-TDF/current/

 and then just picking the *_deb.tar.gz and the *_deb_langpack_fr.tar.gz
files.

Kind regards,
Markus

- the filename is ramdom too
>
> How can I detect them automatically to make them untar and processed
> automatically?
>
> Thanks for your help.
>
> Regards
>
>
>
>
> --
> signature_jp_2
> Logo Hypra  JEAN-PHILIPPE MENGUAL
> DIRECTEUR TECHNIQUE ET QUALITÉ
> 102, rue des poissonniers, 75018, Paris
> Tel : +331 84 73 06 61  Mob : +336 76 34 93 37
> 
> jpmeng...@hypra.fr 
> www.hypra.fr 
> Facebook Hypra  Twitter Hypra
>  Linkedin Jean-Philippe
> 
>
>
> ___
> List Name: Libreoffice-qa mailing list
> Mail address: Libreoffice-qa@lists.freedesktop.org
> Change settings:
> https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
> Problems?
> http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
> Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
> List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: CppUnit compiler support

2018-12-11 Thread Markus Mohrhard
Hey Spencer,

On Tue, Dec 11, 2018 at 12:31 PM FRISBY, SPENCER G CIV USAF AFMC 518
SMXS/MXDX  wrote:

> Hi,
>
> I was wondering if CppUnit 1.14 has support to be compiled by Green Hills
> MULTI 4.2.4 C++ compiler.
>
> If it does, could you provide me documentation that outlines the steps to
> take?
>
>
>
As I don't have access to this compiler I can not confirm or deny that the
compiler supports CppUnit 1.14. The build should only require a C++11
compliant compiler. If the compiler supports C++11 a normal ./configure
with CC and CXX set should be enough. If your compiler supports C++11 and
still fails please let me know with the corresponding failure message.

Kind regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Compiler baselines

2018-12-11 Thread Markus Mohrhard
Hey,

On Mon, Dec 10, 2018 at 6:14 PM Stephan Bergmann 
wrote:

> On 08/12/2018 19:35, Markus Mohrhard wrote:
> > Gandalf is not a CentOS based buildbot but the self-built gcc is now
> > available under "/opt/rh/devtoolset-7/root/usr/bin/gcc" to reduce the
> > differences between the different buildbots and make it easier to move
> > jobs between different jenkins VMs. The only difference is that the gcc
> > is version 8.2 instead of 7.3.
> >
> > Additionally, I have now also used the same CC and CXX setting for the
> > random config build bot
> > (
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=ceb32911f07b63fda074facba377eeb4d5946cdf).
>
> > Based on that I think gandalf can be used again for the tinderbox job
> > and therefore hopefully take a bit of load of the gerrit build machines.
>
> But shared libs and executables built with that CXX, when executed
> during the build, will pick up an older libstdc++.so.6 from the system
> (and thus fail when they use functionality not present in the old
> libstdc++ version), no?
>

Just to document it here. I have adapted ld.so.conf to contain references
to  /opt/rh/devtoolset-7/root/usr/lib and
/opt/rh/devtoolset-7/root/usr/lib64. That ensures that always the new
libstdc++ from the gcc8 build is picked up.

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


Re: Compiler baselines

2018-12-08 Thread Markus Mohrhard
Hey,

On Mon, Dec 3, 2018 at 2:24 PM Stephan Bergmann  wrote:

> On 25/11/2018 23:35, Stephan Bergmann wrote:
> > * So Developer Toolset 7 has been installed on tb75-lilith, tb76-maggie,
> > and tb79-poolux, and Jenkins jobs linux_gcc_release_64
> > (<
> https://gerrit.libreoffice.org/plugins/gitiles/core/+/5b0b08e49ad344ceb043e0cdd1e45b0aea3f559c%5E!>
>
> > "Better way of enabling Developer Toolset 7 for Jenkins'
> > linux_gcc_release_64") and lo_tb_master_linux_dbg
> > (<
> https://gerrit.libreoffice.org/plugins/gitiles/core/+/ab8454eb26f72f2d4081d90cb7e60e53e4a5590d%5E!>
>
> > "Enabling Developer Toolset 7 for Jenkins' lo_tb_master_linux_dbg") have
> > been adapted.
>
> But enabling Developer Toolset 7 for specific Jenkins jobs by adding
> CC/CXX to the corresponding distro/Jenkins/* files turns out to not be
> the ideal solution either:  Jenkins' lo_tb_master_linux job was serviced
> by a heterogeneous set of nodes, most of which are CentOS-based, but
> gandalf is not.  So I had to remove gandalf from Jenkins' TB_Rel label
> now to adapt lo_tb_master_linux (see
> <
> https://gerrit.libreoffice.org/plugins/gitiles/core/+/0adc21fcff02d7172587c540a0d091e46dd399ca%5E!/>
>
> "Enabling Developer Toolset 7 for Jenkins' lo_tb_master_linux").
>
>
Gandalf is not a CentOS based buildbot but the self-built gcc is now
available under "/opt/rh/devtoolset-7/root/usr/bin/gcc" to reduce the
differences between the different buildbots and make it easier to move jobs
between different jenkins VMs. The only difference is that the gcc is
version 8.2 instead of 7.3.

Additionally, I have now also used the same CC and CXX setting for the
random config build bot (
https://cgit.freedesktop.org/libreoffice/core/commit/?id=ceb32911f07b63fda074facba377eeb4d5946cdf).
Based on that I think gandalf can be used again for the tinderbox job and
therefore hopefully take a bit of load of the gerrit build machines.

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


Re: [Libreoffice-qa] minutes of ESC call ...

2018-12-06 Thread Markus Mohrhard
Hey all,

On Thu, Dec 6, 2018 at 4:31 PM Michael Meeks 
wrote:

>  + minor complaint wrt. single Chart save removal in calc (Heiko)
> + how to know ? - checkout release notes
>
>

These people should feel free to complain to me. However the removal was
necessary and long overdue. Actually, the feature was responsible for many
regressions and was originally intended by me for debugging purposes.


> * Tinderbox bits (Stephan)
> + gandalf – too old compiler; keeps failing tinderboxen
>+ bit of a problem, needs SUSE goodwill to help us connect a
> console etc.
>+ can we not live-upgrade it ? (Thorsten)
>+ just needs a new gcc (Stephan)
>   + some SLES12 there – with internal repos etc. (Thorsten)
>  + in some odd state there.
>+ not eager to touch it unless we can afford to loose it (Thorsten)
> + rsync some container or other onto there ?
> + what jobs run there ? (Thorsten)
>+ lcov, perftest(?), random config,
>  UI testing, update, UI testing (Stephan, Christian)
>+ can we move jobs off it ?
>   + unclear if they have extra build deps ? (Christian)
>  + perhaps more sustainable to migrate this (Thorsten)
> + poke Guilhelm → to poke admins (Christian)
>


perftest is not running on gandalf, instead on vm139.

As I'm one of the main users of gandalf (e.g. update, UI testing, random
config) and some more exotic builds not managed by jenkins I will try to
take care of the update during the weekend. I already managed to get gperf
working but the SUSE network firewall blocks access to github so flex could
not be updated. The new compiler should be possible without major issues.

Regards,
Markus
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: minutes of ESC call ...

2018-12-06 Thread Markus Mohrhard
Hey all,

On Thu, Dec 6, 2018 at 4:31 PM Michael Meeks 
wrote:

>  + minor complaint wrt. single Chart save removal in calc (Heiko)
> + how to know ? - checkout release notes
>
>

These people should feel free to complain to me. However the removal was
necessary and long overdue. Actually, the feature was responsible for many
regressions and was originally intended by me for debugging purposes.


> * Tinderbox bits (Stephan)
> + gandalf – too old compiler; keeps failing tinderboxen
>+ bit of a problem, needs SUSE goodwill to help us connect a
> console etc.
>+ can we not live-upgrade it ? (Thorsten)
>+ just needs a new gcc (Stephan)
>   + some SLES12 there – with internal repos etc. (Thorsten)
>  + in some odd state there.
>+ not eager to touch it unless we can afford to loose it (Thorsten)
> + rsync some container or other onto there ?
> + what jobs run there ? (Thorsten)
>+ lcov, perftest(?), random config,
>  UI testing, update, UI testing (Stephan, Christian)
>+ can we move jobs off it ?
>   + unclear if they have extra build deps ? (Christian)
>  + perhaps more sustainable to migrate this (Thorsten)
> + poke Guilhelm → to poke admins (Christian)
>


perftest is not running on gandalf, instead on vm139.

As I'm one of the main users of gandalf (e.g. update, UI testing, random
config) and some more exotic builds not managed by jenkins I will try to
take care of the update during the weekend. I already managed to get gperf
working but the SUSE network firewall blocks access to github so flex could
not be updated. The new compiler should be possible without major issues.

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


Re:

2018-12-02 Thread Markus Mohrhard
Hey Jim,


On Sun, Dec 2, 2018 at 11:14 PM Jim Raykowski  wrote:

> Hello All,
>
> I have recently been granted the great privilege to be part of the
> Commiters group on gerrit. I have notice each time I have committed a patch
> a tinder box failure occurs and a message is sent saying "One of you broke
> the build of LibreOffice with your commit :-( Please commit and push a fix
> ASAP!"
>
> All commits have been +1'd by Jenkins.
>
> So before I break the build again I would very much appreciate commit
> pointers.
>

Great to see that you got commit access.

That mail is sent to anyone who has committed since the last time the
tinderbox succeeded. I think we still have one that fails quite regularly
and you can usually quickly check if there are only your commits and the
failure message looks related to your changes. More often than not the
message is sent to dozens of people either because the box is unreliable or
the box has not been updated to recent build requirements. Nevertheless,
please pay attention to the mail and always have a quick check (after some
time one sadly starts to ignore these mails).

Regards,
Markus

>
> Thank you,
> Jim
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: lode's "add a mode to consider autogen.sh failure 'ok'"

2018-11-30 Thread Markus Mohrhard
Hey Stephan,

On Fri, Nov 30, 2018 at 9:18 AM Stephan Bergmann 
wrote:

> Anybody remember what the lode repo's
> <
> https://gerrit.libreoffice.org/plugins/gitiles/lode/+/1d0e18c1ce4bf703efe1266db6ce692ae0e4bafd%5E!/>
>
> "add a mode to consider autogen.sh failure 'ok'" is supposed to achieve?
>   AFAICS, what it does now is consider "Random Config Linux builder"
> builds like
>  as
> successful, even thought they fail in the configure step:
>
> [...]
> > checking for gperf... /usr/bin/gperf
> > checking whether gperf is new enough... configure: error: "GNU gperf
> 3.0.4" is too old or unrecognized, must be at least gperf 3.1
> > Error running configure at ./autogen.sh line 296.
> > No emails were triggered.
> > Finished: SUCCESS
>


The Random Config Job takes random configure values and we consider a
combination that configure rejects as a success. The plan behind the job is
that either configure rejects a combination or the build needs to succeed.
It is unfortunate that during the update of the underlying VM we see
potential flase positives right now but we can just disable the job until
the machine has been updated.

Kind regards,
Markus

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


Re: LibreOffice ESC call, Thur - 16:00 central European (local) time

2018-11-06 Thread Markus Mohrhard
Hey,

On Tue, Nov 6, 2018 at 11:00 AM Michael Meeks 
wrote:

>
> * Pending Action Items:
>
> + investigate missing crash report signatures in 6.1.2 (Cloph)
>   [ not yet sure what’s happening ]
>
>
I have looked into this during the Munich hackfest and it seems that the
symbol information for several libraries (especially libmerged) have not
been uploaded. As some symbols have been uploaded I suspect that there was
some problem during the creation of the symbol information. I checked with
Cloph that the symbol information for 6.1.3.1 seem to be okay so I think
nothing to do here anymore.

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


Re: problems with LayerTabBar in unit tests

2018-10-08 Thread Markus Mohrhard
Hello Regina,

On Mon, Oct 8, 2018 at 7:54 PM Regina Henschel 
wrote:

> Hi all,
>
> does no one has an idea? I have put the problem as patch to Gerrit
> https://gerrit.libreoffice.org/61545. Perhaps my problem is easier
> understandable then.
>
> Problem: If I use the "Load"-method, I get the document loaded, but only
> the center pane has the correct size. All other window sizes have
> suspicious values. Especially the LayerTabBar has width 0, and therefore
> a click on it is not possible. But that would be needed for the unit test.
>

Many of the unit tests actually don't include any parts of the UI. So, they
are usually useless for testing that anything in the UI actually works. For
some tests you can work around it by hooking into the corresponding shell
but you will need to inspect the code and the setup of the test (e.g. your
test does not link against libsdui) to check if that is possible. I think
not many people can easily help you there for impress and draw code.

Regards,
Markus

>
> How to get the correct window sizes?
>
> Kind regards
> Regina
>
>
> Regina Henschel schrieb am 04-Oct-18 um 14:42:
> > Hi all,
> >
> > I'm still working on a unit test for bug tdf#119956. My current state
> > is, that the odg test document really opens in Draw. [On master it opens
> > in Impress.] But the layer tab bar has width 0. So simulating a click on
> > the layer tab bar is not possible, which is needed in case of bug
> > tdf#119956.
> >
> > Which layers are shown in the layer tab bar is calculated in
> > DrawViewShell::ResetActualLayer() in sd/source/ui/view/drviews1.cxx and
> > the actual width is calculated in TabBar::ImplFormat() in
> > svtools/source/control/tabbar.cxx. Please correct me, if I'm wrong about
> > this.
> >
> > So my questions are:
> >
> > What makes the method SdMiscTest::Load from misc-tests.cxx in sd/qa/unit
> > different from regular opening the file from a running LibreOffice via
> > click on Open button of the start center?
> >
> > How can I open the test file in a unit test the same way as a regular
> > Open does?
> >
> > Or what do I need to add/change in the SdMiscTest::Load method to get
> > the layer tab bar in the correct width?
> >
> > Any ideas or tips?
> >
> > Kind regards
> > Regina
> > ___
> > 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 mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: how to run single cppunit tests

2018-08-31 Thread Markus Mohrhard
Hey,

On Fri, Aug 31, 2018 at 6:06 PM Rahul Gurung  wrote:

> hey,
>
> can you tell me how to run a single and specific cpp test to check if it
> is working or not? I tried the methods told in the documentation it didn't
> work for me,(as a whole lot of unrelated tests started running) I think I
> am doing it wrong somewhere, so I need you to tell the exact command,
> taking a specific test into consideration is going to be helpful.
>


So there are two parts to it.

There is the CPPUNIT_TEST_NAME environment variable that you can use to
select a single test case from a whole test suite. E.g. from your recent
patch: CPPUNIT_TEST_NAME="sc_apitest::ScCellCursorObj::testGoToEnd" make
CppunitTest_sc_cellcursorobj would have just executed that one single case
from the whole test suite.

The make CppunitTest_sc_cellcursorobj part only rebuilds the corresponding
test and all its dependencies however if you call it from the top level
this means it will always rebuild a few targets that have not changed.
Often it is easier to switch to the corresponding module, in that case sc,
and run make -sr CppunitTest_sc_cellcursorobj, which will only rebuild
changed dependencies in the corresponding module.

Regards,
Markus

Thank,
> Rahul Gurung.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Jenkins CI behaviour

2018-08-28 Thread Markus Mohrhard
Hey,

On Tue, Aug 28, 2018 at 6:36 PM Rahul Gurung  wrote:

> How to do that, because rebasing twice doesn't seems possible?
>


You need at least one new commit on master, otherwise rebasing is not
possible. So unless you try to rebase quickly after each other it should be
possible.

Regards,
Markus

>
> On 28 August 2018 at 21:27, Markus Mohrhard <
> markus.mohrh...@googlemail.com> wrote:
>
>> Hey,
>>
>> On Tue, Aug 28, 2018 at 5:52 PM Rahul Gurung 
>> wrote:
>>
>>> What if it hiccups again in rebase ?
>>>
>>
>>
>> Rebase again. Sadly some of the tests are not as stable as they should
>> be. Some of the old java tests and some of the platform dependent tests
>> (either font based, or other platform parts) fail from time to time.
>>
>> Just make sure that you are not causing the test failure before rebasing.
>>
>> Regards,
>> Markus
>>
>>
>>> On 27 August 2018 at 19:11, Muhammet Kara 
>>> wrote:
>>>
>>>> Hi Rahul,
>>>>
>>>> On 08/27/2018 01:58 PM, Rahul Gurung wrote:
>>>>
>>>> hey,
>>>>
>>>> Why do we get that "junit test JunitTest_framework_complex failed"
>>>> message when we upload a patch and weird thing is it gets fixed by a
>>>> rebase? which rebase is recommended, normal or ticking that option we get ?
>>>> sorry im a newbie.
>>>>
>>>>
>>>> It is not something standard. Our Jenkins sometimes hiccups, which
>>>> causes such failures; and a rebase usually solves the issue for you by
>>>> triggering another build (with the latest commits).
>>>>
>>>> Thanks,
>>>> RG
>>>>
>>>>
>>>> ___
>>>> LibreOffice mailing 
>>>> listLibreOffice@lists.freedesktop.orghttps://lists.freedesktop.org/mailman/listinfo/libreoffice
>>>>
>>>>
>>>> Best,
>>>> Muhammet
>>>>
>>>
>>> ___
>>> LibreOffice mailing list
>>> LibreOffice@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>>>
>>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Jenkins CI behaviour

2018-08-28 Thread Markus Mohrhard
Hey,

On Tue, Aug 28, 2018 at 5:52 PM Rahul Gurung  wrote:

> What if it hiccups again in rebase ?
>


Rebase again. Sadly some of the tests are not as stable as they should be.
Some of the old java tests and some of the platform dependent tests (either
font based, or other platform parts) fail from time to time.

Just make sure that you are not causing the test failure before rebasing.

Regards,
Markus


> On 27 August 2018 at 19:11, Muhammet Kara 
> wrote:
>
>> Hi Rahul,
>>
>> On 08/27/2018 01:58 PM, Rahul Gurung wrote:
>>
>> hey,
>>
>> Why do we get that "junit test JunitTest_framework_complex failed"
>> message when we upload a patch and weird thing is it gets fixed by a
>> rebase? which rebase is recommended, normal or ticking that option we get ?
>> sorry im a newbie.
>>
>>
>> It is not something standard. Our Jenkins sometimes hiccups, which causes
>> such failures; and a rebase usually solves the issue for you by triggering
>> another build (with the latest commits).
>>
>> Thanks,
>> RG
>>
>>
>> ___
>> LibreOffice mailing 
>> listLibreOffice@lists.freedesktop.orghttps://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>>
>> Best,
>> Muhammet
>>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Error while make test

2018-08-25 Thread Markus Mohrhard
Hey Gurung,

On Fri, Aug 24, 2018 at 6:35 PM Rahul Gurung  wrote:

> Hey,
>
>
> I did the push, waiting to get it reviewed.
>

I just pushed a few fixes for the patch. You removed quite a few files from
the makefile which later breaks the build. Additionally, you forgot a ;
after CPPUNIT_TEST which caused some additional errors.

An unrelated thing that I would suggest for the future is to not push
patches as drafts as only admins and the people added by you as reviewers
will see the change. You miss all the helpful hands of the remaining
LibreOffice developers if they can not see your patch :)

Regards,
Markus


> Regards,
> Gurung
>
> On 22 August 2018 at 23:11, Markus Mohrhard <
> markus.mohrh...@googlemail.com> wrote:
>
>> Hey Rahul,
>>
>> can you push your current state to gerrit so that we can discuss the code
>> more easily?
>>
>> Regards,
>> Markus
>>
>> On Wed, Aug 22, 2018 at 7:28 PM Rahul Gurung 
>> wrote:
>>
>>> Hey,
>>>
>>> I was experimenting with cpp test by making a new test( transfered from
>>> java tests) and activating it when I run make test it threw this error,
>>> what can this error possibly mean, I know there can be many cases and this
>>> question may be unanswerable, but please help if possible.
>>>
>>>
>>> /home/gurungrahul2/libreoffice/workdir/CxxObject/test/source/mtfxmldump.o:
>>> In function `MetafileXmlDump::dumpAndParse(GDIMetaFile const&,
>>> rtl::OUString const&)':
>>> mtfxmldump.cxx:(.text+0x5868): undefined reference to
>>> `tools::XmlWriter::startDocument(int)'
>>> /home/gurungrahul2/libreoffice/workdir/CxxObject/test/source/primitive2dxmldump.o:
>>> In function
>>> `Primitive2dXmlDump::dumpAndParse(drawinglayer::primitive2d::Primitive2DContainer
>>> const&, rtl::OUString const&)':
>>> primitive2dxmldump.cxx:(.text+0x1608): undefined reference to
>>> `tools::XmlWriter::startDocument(int)'
>>> /home/gurungrahul2/libreoffice/workdir/CxxObject/test/source/screenshot_test.o:
>>> In function `ScreenshotTest::setUp()':
>>> screenshot_test.cxx:(.text+0x6a2): undefined reference to
>>> `test::Directories::getURLFromWorkdir(rtl::OUString const&) const'
>>> /home/gurungrahul2/libreoffice/workdir/CxxObject/test/source/screenshot_test.o:
>>> In function `ScreenshotTest::implSaveScreenshot(BitmapEx const&,
>>> rtl::OString const&)':
>>> screenshot_test.cxx:(.text+0xc68): undefined reference to
>>> `test::Directories::getURLFromWorkdir(rtl::OUString const&) const'
>>> /home/gurungrahul2/libreoffice/workdir/CxxObject/test/source/screenshot_test.o:
>>> In function `ScreenshotTest::processDialogBatchFile(rtl::OUString const&)':
>>> screenshot_test.cxx:(.text+0x2364): undefined reference to
>>> `test::Directories::getURLFromSrc(rtl::OUString const&) const'
>>> collect2: error: ld returned 1 exit status
>>> /home/gurungrahul2/libreoffice/solenv/gbuild/LinkTarget.mk:636: recipe
>>> for target
>>> '/home/gurungrahul2/libreoffice/workdir/LinkTarget/Library/libtest.so'
>>> failed
>>> make[1]: ***
>>> [/home/gurungrahul2/libreoffice/workdir/LinkTarget/Library/libtest.so]
>>> Error 1
>>> Makefile:120: recipe for target 'test' failed
>>> make: *** [test] Error 2
>>>
>>>
>>>
>>>
>>> Thanks.
>>> ___
>>> LibreOffice mailing list
>>> LibreOffice@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>>>
>>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Error while make test

2018-08-22 Thread Markus Mohrhard
Hey Rahul,

can you push your current state to gerrit so that we can discuss the code
more easily?

Regards,
Markus

On Wed, Aug 22, 2018 at 7:28 PM Rahul Gurung  wrote:

> Hey,
>
> I was experimenting with cpp test by making a new test( transfered from
> java tests) and activating it when I run make test it threw this error,
> what can this error possibly mean, I know there can be many cases and this
> question may be unanswerable, but please help if possible.
>
>
> /home/gurungrahul2/libreoffice/workdir/CxxObject/test/source/mtfxmldump.o:
> In function `MetafileXmlDump::dumpAndParse(GDIMetaFile const&,
> rtl::OUString const&)':
> mtfxmldump.cxx:(.text+0x5868): undefined reference to
> `tools::XmlWriter::startDocument(int)'
> /home/gurungrahul2/libreoffice/workdir/CxxObject/test/source/primitive2dxmldump.o:
> In function
> `Primitive2dXmlDump::dumpAndParse(drawinglayer::primitive2d::Primitive2DContainer
> const&, rtl::OUString const&)':
> primitive2dxmldump.cxx:(.text+0x1608): undefined reference to
> `tools::XmlWriter::startDocument(int)'
> /home/gurungrahul2/libreoffice/workdir/CxxObject/test/source/screenshot_test.o:
> In function `ScreenshotTest::setUp()':
> screenshot_test.cxx:(.text+0x6a2): undefined reference to
> `test::Directories::getURLFromWorkdir(rtl::OUString const&) const'
> /home/gurungrahul2/libreoffice/workdir/CxxObject/test/source/screenshot_test.o:
> In function `ScreenshotTest::implSaveScreenshot(BitmapEx const&,
> rtl::OString const&)':
> screenshot_test.cxx:(.text+0xc68): undefined reference to
> `test::Directories::getURLFromWorkdir(rtl::OUString const&) const'
> /home/gurungrahul2/libreoffice/workdir/CxxObject/test/source/screenshot_test.o:
> In function `ScreenshotTest::processDialogBatchFile(rtl::OUString const&)':
> screenshot_test.cxx:(.text+0x2364): undefined reference to
> `test::Directories::getURLFromSrc(rtl::OUString const&) const'
> collect2: error: ld returned 1 exit status
> /home/gurungrahul2/libreoffice/solenv/gbuild/LinkTarget.mk:636: recipe for
> target
> '/home/gurungrahul2/libreoffice/workdir/LinkTarget/Library/libtest.so'
> failed
> make[1]: ***
> [/home/gurungrahul2/libreoffice/workdir/LinkTarget/Library/libtest.so]
> Error 1
> Makefile:120: recipe for target 'test' failed
> make: *** [test] Error 2
>
>
>
>
> Thanks.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Questions about CppUnit

2018-08-09 Thread Markus Mohrhard
Hello Spencer,

On Thu, Aug 9, 2018 at 8:35 PM FRISBY, SPENCER G CIV USAF AFMC 518
SMXS/MXDPA  wrote:

> My team and I are interested in using CppUnit but in order to get it onto
> our networks we need some information.
>
> Is there a mailing address for CppUnit? If there is, what is it?
>

You are already on it. The libreoffice developer list is the mailing list
for CppUnit.


> Is CppUnit listed within the System for Award Management (SAM):
> https://www.sam.gov/portal/public/SAM ? If so, could you provide me with
> a specific search term to bring up the information?
>

I'm not sure if I understand this part. From a quick glance this is about
some system for doing business with the US government. Cppunit is freely
distributed and can be downloaded (
https://cgit.freedesktop.org/libreoffice/cppunit/ and
https://www.freedesktop.org/wiki/Software/cppunit/) and used according to
the LGPL license (
https://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License). Therefore
there is no business entity that provides CppUnit.

Kind regards,
Markus

>
> Best,
>
> ---
>
> Spencer  Frisby
> MMC 518 SMXS/MXDPA
> spencer.frisb...@us.af.mil
> 801 586 2873
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Converting java unit test to cppunit

2018-08-03 Thread Markus Mohrhard
Hello Rahul,


On Fri, Aug 3, 2018 at 7:27 PM, Rahul Gurung  wrote:

> Hi,
>
> I am trying to convert java unit tests to cppunit test and I am currently
> studying old commits, and came across this line,
>
>
> "UnoRuntime.queryInterface (XArrayFormulaRange.class, new_range);"
>
> I checked the documentation but couldn't find what this
> XArrayFormulaRange.class means, can anyone explain? I am new to Open Source.
>
>
>
UNO (our extension framework) works through interfaces. Usually names
starting with X like XArrayFormulaRange are an interface (
https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sheet_1_1XArrayFormulaRange.html
).

To access the corresponding methods of an interface that an object
implements we need to cast between the different interfaces. This is done
in Java through UnoRuntime.queryInterface and in C++ through
uno::Reference(new_range, UNO_QUERY);

Jens Carl is currently working on the same task and has many existing
patches that you can use to understand how to convert existing code. A
recent example is
https://cgit.freedesktop.org/libreoffice/core/commit/?id=8164399df0df976784ddc1a76b46939c53ae51ee
but you can find many more through
https://cgit.freedesktop.org/libreoffice/core/log/?qt=grep=45904

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


Re: New Windows Tinderbox Needed

2018-08-03 Thread Markus Mohrhard
Hey Luke,

On Fri, Aug 3, 2018 at 9:05 PM, Luke Benes  wrote:

> Currently all Windows tinderboxes that generated the daily builds are
> down: @39, @42, and @62
>
> Fortunately, I had the time this week to roll my own builds and in the
> process discovered 2 build breaking commits [1] [2], while another user
> found a 3rd one [3].  If the 3 win tinderboxes were up, the cause of these
> build breaking commits would be obvious to anyone monitoring the tinderbox
> status page.
>

Note that we still have Windows Tinderbox builds.
https://ci.libreoffice.org/ lists the Windows tinderbox builds done by tb72
and tb73. We will always have some platform related problems (e.g. compiler
or some specific system conditions) that will slip through our normal
tinderbox builds.



>
> Besides QA needing daily builds,  another advantage to having working
> tinderboxes is that developers don't need to rely on reports to verify that
> their fixes. For example Caolan was in the dark after his tried this 2nd
> attempt at a blind fix[4].
>

Developers don't need tinderboxes for getting feedback about their fixes.
Everything that will usually be discovered by one of the tinderbox will
also be covered by our gerrit buildbots and the Windows tinderboxes
configured in jenkins. The tinderbox page that you use is our old CI page
with the non-TDF infra managed builds.


> I have neither the computing resources nor time to constantly run builds
> to find breaking commits. Can TDF please put some resources towards this
> problem?  As you can see from the status page [5] the Linux tinderboxes are
> in great shape, but the Windows boxes need some attention.
>


As can be seen by our jenkins instance this is already handled. Of course
the availability of daily windows builds is another point.

Regards,
Markus


> -Luke
>
>
>
> [1] http://document-foundation-mail-archive.969070.n3.nabble.
> com/64-bit-Windows-build-failure-this-pointer-for-
> member-may-not-be-aligned-8-as-expected-by-the-construr-td4244874.html
>
> [2] http://document-foundation-mail-archive.969070.n3.nabble.
> com/Windows-Debug-builds-failure-DbgGUIInitSolarMutexCheck-
> identifier-not-found-td4245003.html
>
> [3] http://document-foundation-mail-archive.969070.n3.nabble.
> com/Segmentation-fault-when-compiling-td4245102.html
>
> [4] http://document-foundation-mail-archive.969070.n3.nabble.
> com/64-bit-Windows-build-failure-this-pointer-for-
> member-may-not-be-aligned-8-as-expected-by-the-construr-
> td4244874.html#a4245284
>
> [5] https://tinderbox.libreoffice.org/MASTER/status.html
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Equivalent of std::mktime in LO

2018-07-29 Thread Markus Mohrhard
Hey Vikas,

On Sun, Jul 29, 2018 at 8:49 AM, Vikas Mahato 
wrote:

> Hello All,
>
> I have a patch here, https://gerrit.libreoffice.org/#/c/58152/ and I am
> trying to replace
>
> std::tm getDateTime(double nDateTime)
> {
> long nDays = std::trunc(nDateTime);
> std::tm aDate = {};
> aDate.tm_year = 0;
> aDate.tm_mon  = 0;
> aDate.tm_mday = 0;
> aDate.tm_sec = getSecond(nDateTime);
> aDate.tm_min = getMinute(nDateTime);
> aDate.tm_hour = getHour(nDateTime);
> aDate.tm_wday = 0;
> aDate.tm_yday = 0;
> // Add number of days
> aDate.tm_mday += nDays;
> std::mktime();
> return aDate;
> }
>
> with css::util:DateTIme. I am  having trouble finding out what is the
> equivalent for std::mktime in LO.
>

The correct class is tools' DateTime which has a constructor  explicit
DateTime( DateTimeInitSystem );.


Regards,
Markus

>
> Thanks,
> Vikas Mahato
>
> ___
> 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] test-files.git: calc/conditional-formatting

2018-07-15 Thread Markus Mohrhard
 calc/conditional-formatting/all_advanced_cond_formats.xlsx |binary
 calc/conditional-formatting/all_text_cond_formats.xlsx |binary
 2 files changed

New commits:
commit 0a18f0eda1c8f4bc51df734b3b74b1d2009442f5
Author: Markus Mohrhard 
Date:   Sun Jul 15 21:25:23 2018 +0200

add conditional format test documents for XLSX

diff --git a/calc/conditional-formatting/all_advanced_cond_formats.xlsx 
b/calc/conditional-formatting/all_advanced_cond_formats.xlsx
new file mode 100644
index 000..d44bba2
Binary files /dev/null and 
b/calc/conditional-formatting/all_advanced_cond_formats.xlsx differ
diff --git a/calc/conditional-formatting/all_text_cond_formats.xlsx 
b/calc/conditional-formatting/all_text_cond_formats.xlsx
new file mode 100644
index 000..075fbf1
Binary files /dev/null and 
b/calc/conditional-formatting/all_text_cond_formats.xlsx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-07-11 Thread Markus Mohrhard
 sc/source/filter/xml/xmlexprt.cxx|9 -
 sc/source/ui/dataprovider/datatransformation.cxx |4 ++--
 sc/source/ui/inc/datatransformation.hxx  |2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 8e9d43546c8e46ea635472ddf07f5c183dc13360
Author: Markus Mohrhard 
Date:   Thu Jul 12 01:31:18 2018 +0200

fix the build

Change-Id: I661666166594ce3012767fac6edc64aa424442e5

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 63ec4abc9302..4f8b61980106 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4269,9 +4269,16 @@ void ScXMLExport::WriteExternalDataTransformations(const 
std::vectorgetColumn()));
 AddAttribute(XML_NAMESPACE_CALC_EXT, XML_PRECISION, 
OUString::number(aNumberTransformation->getPrecision()));
 SvXMLElementExport aTransformation(*this, 
XML_NAMESPACE_CALC_EXT, XML_COLUMN_NUMBER_TRANSFORMATION, true, true);
+
+std::set aColumns = aNumberTransformation->getColumn();
+for(auto& col : aColumns)
+{
+// Columns
+AddAttribute(XML_NAMESPACE_CALC_EXT, XML_COLUMN, 
OUString::number(col));
+SvXMLElementExport aCol(*this, XML_NAMESPACE_CALC_EXT, 
XML_COLUMN, true, true);
+}
 }
 break;
 default:
diff --git a/sc/source/ui/dataprovider/datatransformation.cxx 
b/sc/source/ui/dataprovider/datatransformation.cxx
index 0e2048d3dd43..95846470a847 100644
--- a/sc/source/ui/dataprovider/datatransformation.cxx
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -645,10 +645,10 @@ int NumberTransformation::getPrecision() const
 return maPrecision;
 }
 
-SCCOL NumberTransformation::getColumn() const
+std::set NumberTransformation::getColumn() const
 {
 return mnCol;
 }
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/datatransformation.hxx 
b/sc/source/ui/inc/datatransformation.hxx
index 71eb7406e5a4..0096e0c5a623 100644
--- a/sc/source/ui/inc/datatransformation.hxx
+++ b/sc/source/ui/inc/datatransformation.hxx
@@ -145,7 +145,7 @@ class SC_DLLPUBLIC NumberTransformation : public 
DataTransformation
 virtual TransformationType getTransformationType() const override;
 NUMBER_TRANSFORM_TYPE getNumberTransfromationType() const;
 int getPrecision() const;
-SCCOL getColumn() const;
+std::set getColumn() const;
 };
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-07-08 Thread Markus Mohrhard
 vcl/source/uitest/uiobject.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit a7699fc27240f1329602a5d442667c326525ad55
Author: Markus Mohrhard 
Date:   Mon Jul 9 00:48:16 2018 +0200

uitest: test for ui elements children first

Change-Id: I837721533bc40cea55cbccaa14e1f14686aa3e3a
Reviewed-on: https://gerrit.libreoffice.org/57165
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 1a292862ec52..0540b9ba0ec4 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -421,8 +421,15 @@ void addChildren(vcl::Window const * pParent, 
std::set& rChildren)
 
 std::unique_ptr WindowUIObject::get_child(const OUString& rID)
 {
-vcl::Window* pDialogParent = get_top_parent(mxWindow.get());
-vcl::Window* pWindow = findChild(pDialogParent, rID);
+// in a first step try the real children before moving to the top level 
parent
+// This makes it easier to handle cases with the same ID as there is a way
+// to resolve conflicts
+vcl::Window* pWindow = findChild(mxWindow.get(), rID);
+if (!pWindow)
+{
+vcl::Window* pDialogParent = get_top_parent(mxWindow.get());
+pWindow = findChild(pDialogParent, rID);
+}
 
 if (!pWindow)
 throw css::uno::RuntimeException("Could not find child with id: " + 
rID);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: bin/gbuild-to-ide

2018-07-08 Thread Markus Mohrhard
 bin/gbuild-to-ide |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d7166b448198875bdff43d7054d0f5914e675de
Author: Markus Mohrhard 
Date:   Mon Jul 9 00:54:02 2018 +0200

fix compile_commands.json when generated with modern gcc

Change-Id: I4a17cfb567f5ebec8bb416b9aa4d58763ff36c36

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 90a732d7c614..b016bfe02a0c 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -379,7 +379,7 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
 command += ' -c '
 command += file
 # Help clang when the tree is configured for gcc.
-for gnu in ('-std=gnu++11', '-std=gnu++1y'):
+for gnu in ('-std=gnu++11', '-std=gnu++1y', '-std=gnu++17'):
 command = command.replace(gnu, '-std=c++11')
 return command
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-07-08 Thread Markus Mohrhard
 sc/source/ui/dbgui/validate.cxx   |2 +-
 sc/uiconfig/scalc/ui/erroralerttabpage.ui |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c3c2ca43686b8cf63e60f783b81cb353d91973fa
Author: Markus Mohrhard 
Date:   Sun Jul 8 23:06:34 2018 +0200

rename UI element to prevent duplicate IDs in same dialog

Small improvement for the UI testing.

Change-Id: I49fa6a7566a492930532719271b6c83005bc85a8
Reviewed-on: https://gerrit.libreoffice.org/57163
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index fe6bd005f669..688ebe5b7043 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -767,7 +767,7 @@ ScTPValidationError::ScTPValidationError( vcl::Window*  
 pParent,
 get(m_pTsbShow,"tsbshow");
 get(m_pLbAction,"actionCB");
 get(m_pBtnSearch,"browseBtn");
-get(m_pEdtTitle,"title");
+get(m_pEdtTitle,"erroralert_title");
 get(m_pFtError,"errormsg_label");
 get(m_pEdError,"errorMsg");
 m_pEdError->set_height_request(m_pEdError->GetTextHeight() * 12);
diff --git a/sc/uiconfig/scalc/ui/erroralerttabpage.ui 
b/sc/uiconfig/scalc/ui/erroralerttabpage.ui
index 0abfaa75340a..ef8f9bc8191d 100644
--- a/sc/uiconfig/scalc/ui/erroralerttabpage.ui
+++ b/sc/uiconfig/scalc/ui/erroralerttabpage.ui
@@ -75,7 +75,7 @@
 0
 _Title:
 True
-title
+erroralert_title
   
   
 0
@@ -106,7 +106,7 @@
   
 
 
-  
+  
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-07-05 Thread Markus Mohrhard
 sc/inc/datamapper.hxx  |2 
 sc/qa/unit/dataproviders_test.cxx  |6 +-
 sc/source/filter/xml/xmlmappingi.cxx   |   14 ++---
 sc/source/ui/dataprovider/dataprovider.cxx |6 +-
 sc/source/ui/inc/dataproviderdlg.hxx   |5 +-
 sc/source/ui/miscdlgs/dataproviderdlg.cxx  |   23 -
 sc/source/ui/view/cellsh2.cxx  |4 -
 sc/uiconfig/scalc/ui/dataproviderdlg.ui|   68 ++---
 8 files changed, 98 insertions(+), 30 deletions(-)

New commits:
commit 3f66d987ce3a46eb836f2c11bbaf360bd6195e27
Author: Markus Mohrhard 
Date:   Thu Feb 8 22:49:55 2018 +0100

add a selection for the DB range to Dataprovider dlg

Change-Id: I02c63b46e21cd8d04e6b515e2cbbee08743d5657
Reviewed-on: https://gerrit.libreoffice.org/49459
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sc/inc/datamapper.hxx b/sc/inc/datamapper.hxx
index 75b04440153e..1d7e710051c0 100644
--- a/sc/inc/datamapper.hxx
+++ b/sc/inc/datamapper.hxx
@@ -89,7 +89,7 @@ public:
 const OUString& getID() const;
 double getUpdateFrequency() const;
 OUString getDBName() const;
-void setDBData(const ScDBData* pDBData);
+void setDBData(const OUString& rDBName);
 ScDBDataManager* getDBManager();
 
 void refresh(ScDocument* pDoc, bool bDeterministic = false);
diff --git a/sc/qa/unit/dataproviders_test.cxx 
b/sc/qa/unit/dataproviders_test.cxx
index d0df69c96d5c..1960fa59eecf 100644
--- a/sc/qa/unit/dataproviders_test.cxx
+++ b/sc/qa/unit/dataproviders_test.cxx
@@ -50,7 +50,7 @@ void ScDataProvidersTest::testCSVImport()
 OUString aFileURL;
 createFileURL("test1.", "csv", aFileURL);
 sc::ExternalDataSource aDataSource(aFileURL, "org.libreoffice.calc.csv", 
m_pDoc);
-aDataSource.setDBData(pDBData);
+aDataSource.setDBData(pDBData->GetName());
 
 
 m_pDoc->GetExternalDataMapper().insertDataSource(aDataSource);
@@ -78,7 +78,7 @@ void ScDataProvidersTest::testDataLargerThanDB()
 OUString aFileURL;
 createFileURL("test1.", "csv", aFileURL);
 sc::ExternalDataSource aDataSource(aFileURL, "org.libreoffice.calc.csv", 
m_pDoc);
-aDataSource.setDBData(pDBData);
+aDataSource.setDBData(pDBData->GetName());
 
 
 m_pDoc->GetExternalDataMapper().insertDataSource(aDataSource);
@@ -107,7 +107,7 @@ void ScDataProvidersTest::testHTMLImport()
 createFileURL("test1.", "html", aFileURL);
 sc::ExternalDataSource aDataSource(aFileURL, "org.libreoffice.calc.html", 
m_pDoc);
 aDataSource.setID("//table");
-aDataSource.setDBData(pDBData);
+aDataSource.setDBData(pDBData->GetName());
 
 
 m_pDoc->GetExternalDataMapper().insertDataSource(aDataSource);
diff --git a/sc/source/filter/xml/xmlmappingi.cxx 
b/sc/source/filter/xml/xmlmappingi.cxx
index c40734afc177..c2f8b4004213 100644
--- a/sc/source/filter/xml/xmlmappingi.cxx
+++ b/sc/source/filter/xml/xmlmappingi.cxx
@@ -105,15 +105,11 @@ ScXMLMappingContext::ScXMLMappingContext( ScXMLImport& 
rImport,
 if (!aProvider.isEmpty())
 {
 ScDocument* pDoc = GetScImport().GetDocument();
-ScDBData* pDBData = 
pDoc->GetDBCollection()->getNamedDBs().findByUpperName(ScGlobal::pCharClass->uppercase(aDBName));
-if (pDBData)
-{
-auto& rDataMapper = pDoc->GetExternalDataMapper();
-sc::ExternalDataSource aSource(aURL, aProvider, pDoc);
-aSource.setID(aID);
-aSource.setDBData(pDBData);
-rDataMapper.insertDataSource(aSource);
-}
+auto& rDataMapper = pDoc->GetExternalDataMapper();
+sc::ExternalDataSource aSource(aURL, aProvider, pDoc);
+aSource.setID(aID);
+aSource.setDBData(aDBName);
+rDataMapper.insertDataSource(aSource);
 }
 }
 
diff --git a/sc/source/ui/dataprovider/dataprovider.cxx 
b/sc/source/ui/dataprovider/dataprovider.cxx
index 161aaf502fa9..22a3be99475e 100644
--- a/sc/source/ui/dataprovider/dataprovider.cxx
+++ b/sc/source/ui/dataprovider/dataprovider.cxx
@@ -111,15 +111,15 @@ OUString ExternalDataSource::getDBName() const
 return OUString();
 }
 
-void ExternalDataSource::setDBData(const ScDBData* pDBData)
+void ExternalDataSource::setDBData(const OUString& rDBName)
 {
 if (!mpDBDataManager)
 {
-mpDBDataManager.reset(new ScDBDataManager(pDBData->GetName(), false, 
mpDoc));
+mpDBDataManager.reset(new ScDBDataManager(rDBName, false, mpDoc));
 }
 else
 {
-mpDBDataManager->SetDatabase(pDBData->GetName());
+mpDBDataManager->SetDatabase(rDBName);
 }
 }
 
diff --git a/sc/source/ui/inc/dataproviderdlg.hxx 
b/sc/source/ui/inc/dataproviderdlg.hxx
index a56f4f612b45..5b5c444d13d8 100644
--- a/sc/source/ui/inc/dataproviderdlg.hxx
+++ b/sc/source/ui/inc/dataproviderdlg.hxx
@@ -36

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

2018-07-03 Thread Markus Mohrhard
 sc/source/ui/inc/dataproviderdlg.hxx  |2 +-
 sc/source/ui/miscdlgs/dataproviderdlg.cxx |8 
 sc/source/ui/view/cellsh2.cxx |3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit bb1d5780226bb1b9156580972eea9aa849178742
Author: Markus Mohrhard 
Date:   Mon Jul 2 02:41:32 2018 +0200

store the data provider settings in the document

Change-Id: I049187432437a4bf2539fae54d44ad1266c54149
Reviewed-on: https://gerrit.libreoffice.org/56787
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/inc/dataproviderdlg.hxx 
b/sc/source/ui/inc/dataproviderdlg.hxx
index 5a45fb7cce39..a56f4f612b45 100644
--- a/sc/source/ui/inc/dataproviderdlg.hxx
+++ b/sc/source/ui/inc/dataproviderdlg.hxx
@@ -61,7 +61,7 @@ public:
 void splitColumn();
 void mergeColumns();
 
-void import();
+void import(ScDocument* pDoc);
 };
 
 #endif
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx 
b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index 78953cb3d4fd..8e07d04b8145 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -481,7 +481,7 @@ IMPL_LINK(ScDataProviderDlg, ImportHdl, Window*, pCtrl, 
void)
 {
 if (pCtrl == mpDataProviderCtrl.get())
 {
-import();
+import(mpDoc.get());
 }
 }
 
@@ -521,9 +521,9 @@ void ScDataProviderDlg::mergeColumns()
 mpList->addEntry(pMergeColumnEntry);
 }
 
-void ScDataProviderDlg::import()
+void ScDataProviderDlg::import(ScDocument* pDoc)
 {
-sc::ExternalDataSource aSource = 
mpDataProviderCtrl->getDataSource(mpDoc.get());
+sc::ExternalDataSource aSource = mpDataProviderCtrl->getDataSource(pDoc);
 std::vector> aListEntries = mpList->getEntries();
 for (size_t i = 1; i < aListEntries.size(); ++i)
 {
@@ -536,7 +536,7 @@ void ScDataProviderDlg::import()
 
aSource.AddDataTransformation(pTransformationCtrl->getTransformation());
 }
 aSource.setDBData(pDBData);
-aSource.refresh(mpDoc.get(), true);
+aSource.refresh(pDoc, true);
 mpTable->Invalidate();
 }
 
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 59d2466d420a..b8b64d869880 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -790,7 +790,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 ScopedVclPtrInstance< ScDataProviderDlg > aDialog( 
pTabViewShell->GetDialogParent(), xDoc);
 if (aDialog->Execute() == RET_OK)
 {
-// handle the import here
+ScDocument* pDoc = GetViewData()->GetDocument();
+aDialog->import(pDoc);
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-06-20 Thread Markus Mohrhard
 sc/source/filter/orcus/xmlcontext.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2acaf22274068fbc4181120084aa372254e11686
Author: Markus Mohrhard 
Date:   Wed Jun 20 00:04:55 2018 +0200

push the data from the temporary storage to the document for XML source

Change-Id: I93d489ef9b3fa105db2d364ad9133a26d5366361
Reviewed-on: https://gerrit.libreoffice.org/56126
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit ca49ed9c4342917ba616170e95d7614224a13a4b)
Reviewed-on: https://gerrit.libreoffice.org/56135
Reviewed-by: Eike Rathke 

diff --git a/sc/source/filter/orcus/xmlcontext.cxx 
b/sc/source/filter/orcus/xmlcontext.cxx
index 1e343ff57a38..5e97db9f84e9 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -289,6 +289,7 @@ void ScOrcusXMLContextImpl::importXML(const 
ScOrcusImportXMLParam& rParam)
 }
 
 filter.read_file(path);
+aFactory.finalize();
 }
 catch (const std::exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/uiconfig

2018-06-20 Thread Markus Mohrhard
 sc/uiconfig/scalc/menubar/menubar.xml |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 30acfd82f2bfd98674f0ad2cf5cf015880001994
Author: Markus Mohrhard 
Date:   Wed Jun 20 00:07:38 2018 +0200

data provider is not ready in 6-1 yet

Change-Id: I0b0e85e2402303664ebd49bfdc8582296d2d70e9
Reviewed-on: https://gerrit.libreoffice.org/56127
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 2c3b1d26df2e..137f0a39aee0 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -640,8 +640,6 @@
 
 
 
-
-
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-06-19 Thread Markus Mohrhard
 sc/source/filter/orcus/xmlcontext.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ca49ed9c4342917ba616170e95d7614224a13a4b
Author: Markus Mohrhard 
Date:   Wed Jun 20 00:04:55 2018 +0200

push the data from the temporary storage to the document for XML source

Change-Id: I93d489ef9b3fa105db2d364ad9133a26d5366361
Reviewed-on: https://gerrit.libreoffice.org/56126
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/filter/orcus/xmlcontext.cxx 
b/sc/source/filter/orcus/xmlcontext.cxx
index 1e343ff57a38..5e97db9f84e9 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -289,6 +289,7 @@ void ScOrcusXMLContextImpl::importXML(const 
ScOrcusImportXMLParam& rParam)
 }
 
 filter.read_file(path);
+aFactory.finalize();
 }
 catch (const std::exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - 9 commits - bin/upload_symbols.py cli_ure/Executable_climaker.mk cli_ure/Library_cli_cppuhelper_native.mk cli_ure/Library_cli_uno.mk

2018-06-08 Thread Markus Mohrhard
 bin/upload_symbols.py |1 
 cli_ure/Executable_climaker.mk|2 -
 cli_ure/Library_cli_cppuhelper_native.mk  |1 
 cli_ure/Library_cli_uno.mk|1 
 desktop/source/app/app.cxx|5 +-
 distro-configs/LibreOfficeLinux.conf  |1 
 distro-configs/LibreOfficeWin32.conf  |1 
 distro-configs/LibreOfficeWin64.conf  |1 
 external/breakpad/ExternalProject_breakpad.mk |2 -
 external/breakpad/UnpackedTarball_breakpad.mk |1 
 external/breakpad/breakpad-stackwalk.patch.1  |   32 +
 sal/inc/signalshared.hxx  |2 -
 sal/osl/all/signalshared.cxx  |9 +---
 sal/osl/unx/signal.cxx|2 -
 sal/osl/w32/signal.cxx|   48 --
 salhelper/source/thread.cxx   |   10 -
 solenv/gbuild/platform/com_MSC_defs.mk|2 -
 17 files changed, 48 insertions(+), 73 deletions(-)

New commits:
commit 22aab5f1e129ffb1c592e7b709d8d0b2a6deba48
Author: Markus Mohrhard 
Date:   Sun Jun 5 22:34:26 2016 +0200

enable breakpad in distro configs

Change-Id: Ib321a62223c77e3f62d48f358a228465280458ad
Reviewed-on: https://gerrit.libreoffice.org/26022
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 439b47e84bb12ec1c5cc2332b4c6a9ea59f462ad)

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index d57706cb5e6a..392b49562774 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -32,5 +32,6 @@
 --enable-epm
 --enable-python=internal
 --enable-online-update
+--enable-breakpad
 --disable-dconf
 --enable-mergelibs
diff --git a/distro-configs/LibreOfficeWin32.conf 
b/distro-configs/LibreOfficeWin32.conf
index cf32f30ef0bf..2b08ded2c179 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -7,6 +7,7 @@
 --enable-ext-wiki-publisher
 --enable-ext-nlpsolver
 --enable-online-update
+--enable-breakpad
 --with-help
 --with-myspell-dicts
 --with-package-format=msi
diff --git a/distro-configs/LibreOfficeWin64.conf 
b/distro-configs/LibreOfficeWin64.conf
index e2d7aca80b8a..de9172bfb774 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -8,6 +8,7 @@
 --enable-ext-wiki-publisher
 --enable-ext-nlpsolver
 --enable-online-update
+--enable-breakpad
 --with-help
 --with-myspell-dicts
 --with-package-format=msi
commit 8eacc3876969d8af49e011626b4491d93ff4d58f
Author: Markus Mohrhard 
Date:   Thu Jan 5 22:35:52 2017 +0100

add the locale info to the crashreporter metadata

We have a few crashes that seem locale dependent. Especially the font
related problems.

Change-Id: I0cc977413dc2328ea705c96c2d4048e4f3c58bbc
Reviewed-on: https://gerrit.libreoffice.org/32764
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 7a8636cb61fb..a2b18f201578 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2098,6 +2098,8 @@ void Desktop::OpenClients()
 }
 #if HAVE_FEATURE_BREAKPAD
 CrashReporter::writeCommonInfo();
+// write this information here to avoid depending on vcl in the crash 
reporter lib
+CrashReporter::AddKeyValue("Language", 
Application::GetSettings().GetLanguageTag().getBcp47());
 #endif
 
 RequestHandler::EnableRequests();
commit 66a0fc92ac37f4c632fe002902805bbf4df8df99
Author: Markus Mohrhard 
Date:   Mon Jun 27 04:42:22 2016 +0200

I screwed up with the breakpad minidump_stackwalk patch

This does not affect normal LibreOffice and is only important for the
server side.

Change-Id: I270262ed6e1b22c3ef41099fda19fa386f386203

diff --git a/external/breakpad/breakpad-stackwalk.patch.1 
b/external/breakpad/breakpad-stackwalk.patch.1
index 9a3ce954e8b3..8df1fa3e2f43 100644
--- a/external/breakpad/breakpad-stackwalk.patch.1
+++ b/external/breakpad/breakpad-stackwalk.patch.1
@@ -24,9 +24,9 @@ diff -ur breakpad.org/src/processor/stackwalk_common.cc 
breakpad/src/processor/s
 kOutputSeparator, base_address + module->size() - 1,
 kOutputSeparator,
 -   main_module != NULL && base_address == main_address ? 1 : 0);
-+   main_module != NULL && base_address == main_address ? 1 : 0),
++   main_module != NULL && base_address == main_address ? 1 : 0,
 +   kOutputSeparator,
-+   
StripSeparator(PathnameStripper::File(module->code_identifier())).c_str();
++   
StripSeparator(PathnameStripper::File(module->code_identifier())).c_str());
}
  }
  
commit 710bf7dda6a1d3f31e37e7a0f196d6f0feb92f95
Author: Markus Mohrhard 
Date:   Mon Jun 27 04:41:57 2016 +0200

always 

Re: [freedesktop/libreoffice-cppunit] Feature/cmake (#2)

2018-05-22 Thread Markus Mohrhard
Hello Claus,

sorry that it took some time to respond but I was and am still travelling.

On Thu, May 10, 2018 at 9:35 PM, <claus.klein@googlemail.com> wrote:

> Hi,
>
> there is a nice way on github to get my patch as a single file file:
>
> https://patch-diff.githubusercontent.com/raw/freedesktop/libreoffice-
> cppunit/pull/2.patch
>
> It would be nice to have cmake build generator support at the cppunit
> project.
>
> Kind regards,
> Claus
>


I'm a bit concerned about having two build systems especially one that I
can not maintain. In the past we solved this with the cmake branch but this
also causes its own problems as the branch is constantly behind. Currently
I have no good idea how to solve this problem but I'll try to spend some
time thinking about solutions. I plan to release a new version 1.15.0
sometime in June and will get back to with some plan by then.

Kind regards,
Markus



> *„*Es ist nicht genug, zu wissen, man muß auch anwenden;
>  es ist nicht genug, zu wollen, man muß auch tun.*“*
> *Johann Wolfgang von Goethe*
> <http://www.zitate-online.de/autor/goethe-johann-wolfgang-von/>* (Werk:
> Wilhelm Meisters Wanderjahre)*
>
> Am 10.05.2018 um 21:15 schrieb Markus Mohrhard <
> markus.mohrh...@googlemail.com>:
>
> Hey,
>
> oh I didn't know that there are freedesktop mirrors. Actually the main
> repository is hosted at https://gerrit.libreoffice.org/#/q/status:open
> and the freedesktop repositories are already mirrors.
>
> The easiest way is to push a change to gerrit as described at
> https://wiki.documentfoundation.org/Development/gerrit. However for
> cppunit I also accept mails tot he developer list with the patches.
>
> Kind regards,
> Markus
>
>
> On Thu, May 10, 2018 at 9:09 PM, <claus.klein@googlemail.com> wrote:
>
>> How can a contribute a new feature?
>>
>> Anfang der weitergeleiteten Nachricht:
>>
>> *Von: *fdo-mirror <notificati...@github.com>
>> *Betreff: **Aw: [freedesktop/libreoffice-cppunit] Feature/cmake (#2)*
>> *Datum: *10. Mai 2018 um 21:03:52 MESZ
>> *An: *freedesktop/libreoffice-cppunit <libreoffice-cppunit@noreply.g
>> ithub.com>
>> *Kopie: *Claus Klein <claus.klein@googlemail.com>, Author <
>> aut...@noreply.github.com>
>> *Antwort an: *freedesktop/libreoffice-cppunit <
>> reply+001bf85aeee7219e578b46559bb8fc76f33f01540ea54e9f92cf0
>> 001170c599892a169ce1331a...@reply.github.com>
>>
>> Closed #2 <https://github.com/freedesktop/libreoffice-cppunit/pull/2>.
>>
>> —
>> You are receiving this because you authored the thread.
>> Reply to this email directly, view it on GitHub
>> <https://github.com/freedesktop/libreoffice-cppunit/pull/2#event-1620471249>,
>> or mute the thread
>> <https://github.com/notifications/unsubscribe-auth/ABv4WhPPIdHGUH_KPxF7i-fuU3hQlDuTks5txI8YgaJpZM4T6RoG>
>> .
>>
>>
>>
>> ___
>> 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] cppunit.git: configure.ac include/cppunit

2018-05-22 Thread Markus Mohrhard
 configure.ac  |2 +-
 include/cppunit/Portability.h |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0f06c57cafbf050276bae3306aed3bcbb39ddc44
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Wed May 23 02:13:50 2018 +0200

next version will be 1.15.0

diff --git a/configure.ac b/configure.ac
index 21172f0..21e3249 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ([2.65])
 # Version informations
 # 
 m4_define([cppunit_version_major],[1])
-m4_define([cppunit_version_minor],[14])
+m4_define([cppunit_version_minor],[15])
 m4_define([cppunit_version_micro],[0])
 
m4_define([cppunit_version],[cppunit_version_major.cppunit_version_minor.cppunit_version_micro])
 m4_define([cppunit_interface_age], [0])
diff --git a/include/cppunit/Portability.h b/include/cppunit/Portability.h
index d7c4c11..c2e3bd0 100644
--- a/include/cppunit/Portability.h
+++ b/include/cppunit/Portability.h
@@ -20,7 +20,7 @@
 
 // Version number of package
 #ifndef CPPUNIT_VERSION 
-#define CPPUNIT_VERSION  "1.14.0"
+#define CPPUNIT_VERSION  "1.15.0"
 #endif
  
 #include // define CPPUNIT_API & 
CPPUNIT_NEED_DLL_DECL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] cppunit.git: 3 commits - autogen.sh configure.ac examples/money include/cppunit m4/ax_cxx_have_isfinite.m4 m4/README Makefile.am

2018-05-22 Thread Markus Mohrhard
 Makefile.am |1 
 autogen.sh  |2 -
 configure.ac|2 -
 examples/money/Makefile.am  |2 -
 include/cppunit/portability/FloatingPoint.h |   41 ++--
 m4/README   |1 
 m4/ax_cxx_have_isfinite.m4  |   27 --
 7 files changed, 4 insertions(+), 72 deletions(-)

New commits:
commit fd7111241a90b00eed45c7fb847101c732b9df83
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Wed May 23 02:06:52 2018 +0200

C++11 provides std::isfinite and std::isnan

diff --git a/Makefile.am b/Makefile.am
index 674afd3..90c6a1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,6 @@ m4internal = \
m4/ac_cxx_string_compare_string_first.m4 \
m4/ac_dll.m4 \
m4/ax_cxx_gcc_abi_demangle.m4 \
-   m4/ax_cxx_have_isfinite.m4 \
m4/ax_cxx_have_sstream.m4 \
m4/ax_cxx_namespaces.m4 \
m4/ax_cxx_compile_stdcxx_11.m4 \
diff --git a/configure.ac b/configure.ac
index b34947a..21172f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,6 @@ AC_LIBTOOL_WIN32_DLL
 AC_HEADER_STDC
 AC_LTDL_DLLIB
 AC_CHECK_HEADERS(cmath,[],[],[/**/])
-AX_CXX_HAVE_ISFINITE
-AC_CHECK_FUNCS(finite)
 AX_CXX_HAVE_SSTREAM
 AC_CXX_HAVE_STRSTREAM
 
diff --git a/include/cppunit/portability/FloatingPoint.h 
b/include/cppunit/portability/FloatingPoint.h
index 15bf95b..56138fa 100644
--- a/include/cppunit/portability/FloatingPoint.h
+++ b/include/cppunit/portability/FloatingPoint.h
@@ -2,39 +2,13 @@
 #define CPPUNIT_PORTABILITY_FLOATINGPOINT_H_INCLUDED
 
 #include 
-#include 
-
-#if defined(__sun) && !defined(CPPUNIT_HAVE_ISFINITE) && 
defined(CPPUNIT_HAVE_FINITE)
-#include 
-  //  is still needed for usage of fabs in TestAssert.cpp
-#endif
+#include 
 
 CPPUNIT_NS_BEGIN
 
-/// \brief Tests if a floating-point is a NaN.
-// According to IEEE-754 floating point standard, 
-// (see e.g. page 8 of
-// http://www.cs.berkeley.edu/~wkahan/ieee754status/ieee754.ps) 
-// all comparisons with NaN are false except "x != x", which is true.
-//
-// At least Microsoft Visual Studio 6 is known not to implement this test 
correctly.
-// It emits the following code to test equality:
-//  fcomp   qword ptr [nan]
-//  fnstsw  ax// copie fp (floating-point) status 
register to ax
-//  testah,40h// test bit 14 of ax (0x4000) => C3 
of fp status register
-// According to the following documentation on the x86 floating point status 
register,
-// the C2 bit should be tested to test for NaN value. 
-// http://webster.cs.ucr.edu/AoA/Windows/HTML/RealArithmetic.html#1000117
-// In Microsoft Visual Studio 2003 & 2005, the test is implemented with:
-//  testah,44h // Visual Studio 2005 test both C2 & C3...
-//
-// To work around this, a NaN is assumed to be detected if no strict ordering 
is found.
 inline bool floatingPointIsUnordered( double x )
 {
-   // x != x will detect a NaN on conformant platform
-   // (2.0 < x  &&  x < 1.0) will detect a NaN on non conformant platform:
-   // => no ordering can be found for x.
-   return  (x != x) ||  (2.0 < x  &&  x < 1.0);
+return std::isnan(x);
 }
 
 
@@ -42,16 +16,7 @@ inline bool floatingPointIsUnordered( double x )
 /// @return \c true if x is neither a NaN, nor +inf, nor -inf, \c false 
otherwise.
 inline int floatingPointIsFinite( double x )
 {
-#if defined(CPPUNIT_HAVE_ISFINITE)
-   return isfinite( x );
-#elif defined(CPPUNIT_HAVE_FINITE)
-   return finite( x );
-#elif defined(CPPUNIT_HAVE__FINITE)
-   return _finite(x);
-#else
-   double testInf = x * 0.0;  // Produce 0.0 if x is finite, a NaN otherwise.
-   return testInf == 0.0  &&  !floatingPointIsUnordered(testInf);
-#endif
+return std::isfinite(x);
 }
 
 CPPUNIT_NS_END
diff --git a/m4/README b/m4/README
index 90a85e2..b082695 100644
--- a/m4/README
+++ b/m4/README
@@ -3,6 +3,5 @@
 # Exceptions internal code:
 #bb_enable_doxygen.m4
 #ac_cxx_string_compare_string_first.m4
-#ax_cxx_have_isfinite.m4
 #ac_dll.m4
 #    ac_cxx_have_strstream.m4
commit 03fe3b83eb95a20a3397a0b5c19c25f02986c888
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Wed May 23 02:06:03 2018 +0200

fix make distcheck, part2

diff --git a/examples/money/Makefile.am b/examples/money/Makefile.am
index f6afb40..5db63fb 100644
--- a/examples/money/Makefile.am
+++ b/examples/money/Makefile.am
@@ -1,5 +1,5 @@
 # Include cookbook.html in distro
-EXTRA_DIST = money.dsp money.dsw configure.in StdAfx.cpp
+EXTRA_DIST = money.dsp money.dsw configure.ac StdAfx.cpp
 
 AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 
commit 66e39e76d7f9acc27522b0a25cd6e538ecc920f0
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Wed M

Re: External Data providersin Calc - GSoC project

2018-05-15 Thread Markus Mohrhard
Hello Vikas,

On Tue, May 15, 2018 at 11:13 AM, Vikas Mahato 
wrote:

> Hi all,
>
> I looked into how to make UNO components for calc and referred to
> Solver.idl and XSolver.idl in  offapi module for more understanding.
>
> I am thinking of moving the existing implementation of dataproviders and
> datatransformations (located at sc/source/ui/dataproviders) to two UNO
> components.
>

Please don't. The internal ones are the canonical data providers and I
would like to keep them as it is much easier to design APIs and debug
general problems through internal API code. The UNO API will allow
extensions to add additional data providers and data transformations. In
the end you will notice that you will map some of the UNO API code to
internal code anyway and your internal code will help you shape the API.


> This would mean creating 4 new files in offapi/com/sun/star/sheet namely
>
> ExternalDataProvider.idl
> XExternalDataProvider.idl
> DataTransformations.idl
> XDataTransformations.idl
>

That sounds about right.


> ExternalDataProvider will host the following methods:
> 1. void Import()
> 2. OUString& GetURL()
> 3. map getDataSourcesForURL(const OUString& rURL)
> 4. unique_ptr FetchStreamFromURL(const OUString&,
> OStringBuffer& rBuffer)
>


Note that in UNO API we can not use most of the C++ classes. unique_ptr
needs no equivalent anyway as all UNO API objects are reference counted
(uno::Reference, rtl::Reference). Finding a good replacement for
map will be more challenging and might require using
something along the lines of uno::Sequence.

I'm not sure if we need the Import function in the API. Keep in mind that
the importing is completely handled by the internal code and should not be
started by an extension. I suppose it will be enough for the actual uno
object implementation to have an object which provides all the necessary
methods.


>
>
> DataTransformation will host all the methods defined in
> datatransformation.hxx
>
> I want to convert the existing implementations to UNO so that external
> application developers can make use of the functionality as well.
>

As mentioned, we should have the UNO API as layer on top of the internal
API. At least in Calc (and Charts) we have made bad experiences in the past
with pure UNO API features.

Regards,
Markus

>
> Looking for suggestions and feedback.
>
> Kind Regards,
> Vikas Mahato
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [freedesktop/libreoffice-cppunit] Feature/cmake (#2)

2018-05-10 Thread Markus Mohrhard
Hey,

oh I didn't know that there are freedesktop mirrors. Actually the main
repository is hosted at https://gerrit.libreoffice.org/#/q/status:open and
the freedesktop repositories are already mirrors.

The easiest way is to push a change to gerrit as described at
https://wiki.documentfoundation.org/Development/gerrit. However for cppunit
I also accept mails tot he developer list with the patches.

Kind regards,
Markus


On Thu, May 10, 2018 at 9:09 PM,  wrote:

> How can a contribute a new feature?
>
> Anfang der weitergeleiteten Nachricht:
>
> *Von: *fdo-mirror 
> *Betreff: **Aw: [freedesktop/libreoffice-cppunit] Feature/cmake (#2)*
> *Datum: *10. Mai 2018 um 21:03:52 MESZ
> *An: *freedesktop/libreoffice-cppunit  github.com>
> *Kopie: *Claus Klein , Author <
> aut...@noreply.github.com>
> *Antwort an: *freedesktop/libreoffice-cppunit  001bf85aeee7219e578b46559bb8fc76f33f01540ea54e9f92cf0001
> 170c599892a169ce1331a...@reply.github.com>
>
> Closed #2 .
>
> —
> You are receiving this because you authored the thread.
> Reply to this email directly, view it on GitHub
> ,
> or mute the thread
> 
> .
>
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2018-04-10 Thread Markus Mohrhard
 sw/source/ui/frmdlg/frmpage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d3444ffe5b0ec37ad99d6969179184abea21385
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Sun Apr 8 12:43:13 2018 +0200

fix global-buffer-overflow found through UI testing on UBSAN jenkins job

Change-Id: Ie4d81561057bb4d67fe050ca7fb82861d5d207a2
Reviewed-on: https://gerrit.libreoffice.org/52587
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
(cherry picked from commit c442ac8c20cfceb8c87e96c494dcd8372dc6e206)
Reviewed-on: https://gerrit.libreoffice.org/52609
Reviewed-by: Michael Stahl <michael.st...@cib.de>

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index d2ab2ce96c8d..a69f8c59d6d8 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -782,7 +782,7 @@ void SwFramePage::setOptimalFrameWidth()
 { aHFrameMap, SAL_N_ELEMENTS(aHFrameMap) },
 { aHFlyHtmlMap, SAL_N_ELEMENTS(aHFlyHtmlMap) },
 { aVFrameMap, SAL_N_ELEMENTS(aVFrameMap) },
-{ aVFlyHtmlMap, SAL_N_ELEMENTS(aVFrameMap) },
+{ aVFlyHtmlMap, SAL_N_ELEMENTS(aVFlyHtmlMap) },
 { aHParaMap, SAL_N_ELEMENTS(aHParaMap) },
 { aHParaHtmlMap, SAL_N_ELEMENTS(aHParaHtmlMap) },
 { aHParaHtmlAbsMap, SAL_N_ELEMENTS(aHParaHtmlAbsMap) },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-04-08 Thread Markus Mohrhard
 accessibility/source/standard/vclxaccessiblebox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 929aff6d2d25c4b1e72f9326e597f04ba7e9e4b4
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Sun Apr 8 15:35:41 2018 +0200

fix wrong mismatch of type modifiers

Change-Id: I204b2ad15958a3782c27cc20f07f37b917eae02f
Reviewed-on: https://gerrit.libreoffice.org/52598
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx 
b/accessibility/source/standard/vclxaccessiblebox.cxx
index c9561c352bdb..e80c14abee3c 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -263,7 +263,7 @@ Reference< XAccessibleContext > SAL_CALL 
VCLXAccessibleBox::getAccessibleContext
 
 //=  XAccessibleContext  ==
 
-sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount()
+sal_Int32 VCLXAccessibleBox::getAccessibleChildCount()
 {
 SolarMutexGuard aSolarGuard;
 ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-04-08 Thread Markus Mohrhard
 sw/source/ui/frmdlg/frmpage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c442ac8c20cfceb8c87e96c494dcd8372dc6e206
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Sun Apr 8 12:43:13 2018 +0200

fix global-buffer-overflow found through UI testing on UBSAN jenkins job

Change-Id: Ie4d81561057bb4d67fe050ca7fb82861d5d207a2
Reviewed-on: https://gerrit.libreoffice.org/52587
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 2742b3512337..a619dbe42386 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -783,7 +783,7 @@ void SwFramePage::setOptimalFrameWidth()
 { aHFrameMap, SAL_N_ELEMENTS(aHFrameMap) },
 { aHFlyHtmlMap, SAL_N_ELEMENTS(aHFlyHtmlMap) },
 { aVFrameMap, SAL_N_ELEMENTS(aVFrameMap) },
-{ aVFlyHtmlMap, SAL_N_ELEMENTS(aVFrameMap) },
+{ aVFlyHtmlMap, SAL_N_ELEMENTS(aVFlyHtmlMap) },
 { aHParaMap, SAL_N_ELEMENTS(aHParaMap) },
 { aHParaHtmlMap, SAL_N_ELEMENTS(aHParaHtmlMap) },
 { aHParaHtmlAbsMap, SAL_N_ELEMENTS(aHParaHtmlAbsMap) },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [Libreoffice-qa] minutes of ESC call ...

2018-04-05 Thread Markus Mohrhard
Hey,

On Thu, Apr 5, 2018 at 4:48 PM, Michael Meeks 
wrote:

>
>
> * GSoC Application (Thorsten, Heiko)
>+ 42 final applications – deadline is over, please review!
>   + somewhat down on previous years; similar to other projects.
>+ 16+ mentors
>+ 10-15 interested students discussing on ML.
>+ A bit confused here – no E-mail (Michael)
>   + can admins assign mentors based on project ownership in wiki ?
>   + do we push the “I want to mentor this student” button ? (Miklos)
>   + do this only for good proposals (Heiko)
>  + would be good to mail people to push button (Miklos)
>   + slot allocation deadline ~4 days from now (Miklos)
>+ do we have a plan for slots to request ?
>+ previously a min & max required.
>+ need someone with expertise to check the submissions (Heiko)
>+ one of the admins: Thorsten/Markus/Heiko would be good (Michael)
> + lots of cruft in there still – only 1-2 Androids possible
> + useful to have a spreadsheet for ranking if possible with
>   links for the proposals.
> + important to make sure promising students ‘have a mentor’
> AI:+ poke admins / come up with this ~4 days to slot count (Heiko)
>+ quite a number of ignored proposals : is there rational ? (Miklos)
>+ not me who set that so (Heiko)
>+ seems Markus did – see the ‘Ingored’ tab at the top (Michael)
>


As can be seen by the ignored proposals I already did an initial round of
proposal reviews (right now we have just the ones left with a proper
proposal). Now it would help especially for the projects with more than one
proposal if the potential mentors of the corresponding proposals could
leave a comment whether they are happy with the proposals. I will use that
to mark the ones that have been sorted out by the mentors also as ignored
and come up with a final list of projects.

I will check the list and see how many projects we have and most likely
after talking with Thorsten during the hackfest propose a minimum and
maximum number of slots that we want to request. A full ranking of
proposals is not necessary yet.

Regards,
Markus

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


[Libreoffice-commits] cppunit.git: include/cppunit include/msvc6 src/cppunit

2018-04-02 Thread Markus Mohrhard
 include/cppunit/plugin/TestPlugIn.h|2 ++
 include/msvc6/testrunner/TestPlugInInterface.h |2 ++
 src/cppunit/Win32DynamicLibraryManager.cpp |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 5ee5394ccec1e9fa07f2a84d73209472c8a1daab
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Mon Apr 2 23:17:19 2018 +0200

tdf#116653, avoid NOMINMAX redefinition warnings with mingw

diff --git a/include/cppunit/plugin/TestPlugIn.h 
b/include/cppunit/plugin/TestPlugIn.h
index 52b5b35..4c57093 100644
--- a/include/cppunit/plugin/TestPlugIn.h
+++ b/include/cppunit/plugin/TestPlugIn.h
@@ -146,7 +146,9 @@ typedef CppUnitTestPlugIn *(*TestPlugInSignature)();
 #define NOUSER
 #define NOKERNEL
 #define NOSOUND
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #define BLENDFUNCTION void// for mingw & gcc
 #include 
 #endif
diff --git a/include/msvc6/testrunner/TestPlugInInterface.h 
b/include/msvc6/testrunner/TestPlugInInterface.h
index 7b35a08..79c128d 100644
--- a/include/msvc6/testrunner/TestPlugInInterface.h
+++ b/include/msvc6/testrunner/TestPlugInInterface.h
@@ -10,7 +10,9 @@
 #define NOUSER
 #define NOKERNEL
 #define NOSOUND
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include 
 #endif
 
diff --git a/src/cppunit/Win32DynamicLibraryManager.cpp 
b/src/cppunit/Win32DynamicLibraryManager.cpp
index acadf46..5dac4fa 100644
--- a/src/cppunit/Win32DynamicLibraryManager.cpp
+++ b/src/cppunit/Win32DynamicLibraryManager.cpp
@@ -8,7 +8,9 @@
 #define NOUSER
 #define NOKERNEL
 #define NOSOUND
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #define BLENDFUNCTION void// for mingw & gcc  
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Build aborting

2018-04-01 Thread Markus Mohrhard
Hey,

On Sun, Apr 1, 2018 at 11:44 PM, Chris Sherlock 
wrote:

> Hi all,
>
> Does anyone know why the following patch’s build is aborting?
>
> https://gerrit.libreoffice.org/#/c/51808/9
>
>
>
"Build timed out (after 45 minutes). Marking the build as aborted." (see
https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/2493/console and
https://ci.libreoffice.org/job/gerrit_linux_gcc_release/2443/console)

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


Re: GSoC 2018 : LIbreOffice | LOEclipse | Introduction : Shobhan Mandal

2018-03-25 Thread Markus Mohrhard
Hello Shobhan,

On Wed, Mar 21, 2018 at 10:23 AM, Shobhan Mandal <
dev.shobhanman...@gmail.com> wrote:

> Greetings LibreOffice Community,
>
> I am Shobhan Mandal, currently pursuing my Masters Degree in Computer
> Science from International Institute of Information Technology - Hyderabad,
> Hyderabad, Telangana, India.
>
> I am interested in working on the GSoC 2018 project in LOEclipse under
> LibreOffice. I have also started submitting patches towards LOEclipse for
> the same. With experience in making projects using C, Java and Python and
> help from this beautiful community, I believe we can make some fruitful
> contribution to the LOEclipse code-base.
>
> Any help from you guys on improving how I contribute will always be
> appreciated. Looking forward to working with you guys.
>
>
You should get in contact with Samuel and discuss your ideas to write a
good application.

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


Re: Serdar Oktay TUNÇ GSoC Introducyion

2018-03-25 Thread Markus Mohrhard
Hello Serdar,

On Sun, Mar 18, 2018 at 4:49 PM, serdar tunc  wrote:

> Hello Everyone!
> I am Serdar and I am last undergraduate year in Computer Engineering
> at Çanakkale Onsekiz Mart University. I know C++, python, git, gerrit,
> reading others code and gdb.
> I am interested in "Fix shape and text rotation in xlsx files". I've
> worked with this bug and solved one bug about this code section. I
> know how OOXML filter works.
>
> this is my contributions https://gerrit.libreoffice.org/#/q/serdar
>
>
>
I just noticed that you plan to apply for this project and that you have
added the corresponding project idea to the wiki page. Note that I had to
remove the project as I'm sure that I will not mentor such a project and I
assume that Eike will not have the time to mentor it. Additionally, I don't
think that the project idea is suitable for GSoC. Fixing shape and text
rotation in xlsx files would be about a week of work for me so it is quite
far from the required 3 month of at least 30 hour work.

I would suggest that you try to find a mentor for this project right now or
apply for a different idea that is already on the list.

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


Re: File Handling in Calc

2018-03-18 Thread Markus Mohrhard
Hey Vikas,

On Sun, Mar 18, 2018 at 10:21 AM, Vikas Mahato 
wrote:

> Hello Developers,
>
> Can you please provide me a link to documentation or code snippets
> regarding file handling (opening, saving and closing files in ODS format)
> in Calc?
>
>
File handling in LibreOffice is split across many pieces. The most
important ones for ODS are sc/source/filter/xml, containing the Calc
specific parts of ODF import, and xmloff/, containing the shared ODF
import/export code. Usually you don't have to worry about the low level xml
parser and some of the remaining infrastructure when you work on import and
export code.

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


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

2018-03-15 Thread Markus Mohrhard
 sc/source/core/data/table7.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 15443038c4b8d4c1e7d1aa32df72f41ba93b5b8b
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Thu Feb 22 22:43:35 2018 +0100

copy multiple single row cond formats correctly, tdf#115835

Change-Id: Ic20cc27f03edf3dbd27975f99c788bf5bffd4c48
Reviewed-on: https://gerrit.libreoffice.org/50211
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
(cherry picked from commit c557889748292d25996ea8f587d7564c74e6f121)
Reviewed-on: https://gerrit.libreoffice.org/50292
Reviewed-by: Michael Meeks <michael.me...@collabora.com>

diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index 6fe30a795fa7..47bcfbd5117f 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -130,10 +130,10 @@ void ScTable::CopyOneCellFromClip(
 assert(nColOffset >= 0);
 aCol[nCol].CopyOneCellFromClip(rCxt, nRow1, nRow2, nColOffset);
 
-if ((rCxt.getInsertFlag() & InsertDeleteFlags::ATTRIB) && (nColOffset 
== 0))
+if (rCxt.getInsertFlag() & InsertDeleteFlags::ATTRIB)
 {
 for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
-CopyConditionalFormat(nCol, nRow, nCol + nSrcColSize - 1, 
nRow, nCol - aSrcRange.aStart.Col(),
+CopyConditionalFormat(nCol, nRow, nCol, nRow, nCol - 
aSrcRange.aStart.Col() - nColOffset,
 nRow - nSrcRow, pSrcTab);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Request for GSoC project Integrate ui dialogs with translation tooling

2018-03-08 Thread Markus Mohrhard
Hello Sanan,

On Sat, Mar 3, 2018 at 7:04 AM, SANAN ANSARI  wrote:

> Hi , I'm Sanan Ansari. I am pursing my B.E in computer Engineering from
> Mumbai university India.I just read the project idea of Integrate .ui
> dialogs with translation tooling. I have knowledge about Python. I would
> love to work on the project. Please , If you can give more documentation
> about project it will help me.
>
>
>
> By the way this my first GSoc and I’m new to open source , real world
> project.
>
>
>
> Hope you will help me as I’m a beginner.
>
>
>
>
I think that Christian who proposed to mentor the project is currently on
vacation. So here just some initial pointers for the project:

https://translations.documentfoundation.org is our translation service
based on pootle. If you go to one of the UI strings you often find as
location a reference to somename.ui (e.g.
https://translations.documentfoundation.org/wo/libo60_ui/translate/cui/messages.po#unit=143989122=414)
. However, for a translator this might not be obvious where this dialog is
used and how the string is used in the UI.

I think the idea is to make it more obvious for the translators where a
string is used and how the dialog looks. But keep in mind that not all
translated strings are stored in UI files. Many of the strings are also
defined in source files and used directly in the code.

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


Re: [GSoC] Discussion on project idea "interface for external data source import into Calc"

2018-03-08 Thread Markus Mohrhard
Hello Manuj,

On Wed, Mar 7, 2018 at 6:48 PM, Manuj Vashist 
wrote:

> Hello everyone,
>
> I am a sophomore student persuing B.E. In Birla Institute of Technology &
> Science Pilani.
>
> I am exploring the LO code base since January and have merged a couple of
> easyHacks too :)
>
> I would like to work on the project idea " Implement interface for
> external data source import into Calc
> 
> " in this summers as GSoC student.
>
> As the currently available dialog imports data from other csv files and
> html web pages.as the project is about extending the existing data
> providers and data transformation.
> I can think of data providers like a sql table that can be included to
> it,please give some more information on what kind of data transformation is
> referred here.
>
> Also there are two dialogs doing the same thing here link to external data
> dialog and data provider dialog, what are the use case of having two diff
> dialogs? can't both be merged together?
> A bit more info on project will be helpful.
>
>
>
The idea is similar to PowerQuery for Excel but with a more limited focus.
As a simple example take the stock data of the last week that is published
on some website and that we would like to integrate into our spreadsheet.
Currently this happens by downloading the csv file (hopefully the data is
in csv format or another spreadsheet format) and either copying the data or
using the link to external data. Both features don't handle updating the
data very well or transforming the data.

The idea now is to take all the different ways that we have to import
external data (link to external data, xml source, data streaming) and
combine them in one common feature. To make working with the external data
easier we also want to be able to apply simple transformations to the data
before importing them (like deleting a column, applying a filter,
sanitizing data, ...). The concept that I already started is to have a
second hidden document with a sheet that we use to import the data and then
apply the transformations before finally copying the data from the hidden
document to the final document. Currently the data is always imported into
a database range (Data->Define) that stores the range of the imported data.

You can already test some parts of the feature in current master by
enabling experimental features and then going to Data->Data Provider. The
implementation right now does most of the work in an own thread to allow
slow data fetching and transformations while keeping the UI responsive.
Most of the current code can be found at sc/source/ui/dataprovider/* except
for the ugly UI that is currently available (and which needs to be made
more user friendly) at sc/source/ui/miscdlgs/dataproviderdlg.cxx
Additionally there are some initial tests at sc/qa/unit/dataproviders_test.cxx
and sc/qa/unit/datatransformation_test.cxx that I used to prototype some of
the code.

Work during GSoC may include work on an improved UI for the feature, new
data providers and data transformations, storing the information about data
providers and transformations in files (ods and possibly xlsx), adding a
UNO interface to allow extension authors to add their own data providers
and data transformations and many more features that may be interesting.

Maybe start by having a look at the already implemented feature and then at
the code. I hope that at least most of the data providers and data
transformations are actually quite simple. If you are through that and have
more questions about some of the other ideas that I mentioned above feel
free to request more information.

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


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

2018-03-06 Thread Markus Mohrhard
 sc/source/ui/uitest/uiobject.cxx |4 +++-
 uitest/calc_tests/gridwin.py |   17 +
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit ab26cddc3325a6422993a3421a557536d6023936
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Wed Mar 7 01:36:12 2018 +0100

uitest: add demo showing how to select different sheet

Change-Id: I1ddc8e9855832df7176d768e73d062e7f601a62c
Reviewed-on: https://gerrit.libreoffice.org/50854
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/uitest/calc_tests/gridwin.py b/uitest/calc_tests/gridwin.py
index 1afbe8142f54..7c9c87de0b03 100644
--- a/uitest/calc_tests/gridwin.py
+++ b/uitest/calc_tests/gridwin.py
@@ -6,6 +6,7 @@
 #
 
 from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
 
 from uitest.framework import UITestCase
 
@@ -28,4 +29,20 @@ class GridWinTest(UITestCase):
 
 self.ui_test.close_doc()
 
+def test_select_sheet(self):
+
+self.ui_test.create_doc_in_start_center("calc")
+xCalcDoc = self.xUITest.getTopFocusWindow()
+xGridWindow = xCalcDoc.getChild("grid_window")
+
+for i in range(3):
+self.ui_test.execute_dialog_through_command(".uno:Insert")
+current_dialog = self.xUITest.getTopFocusWindow()
+
+xOkButton = current_dialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkButton)
+
+xGridWindow.executeAction("SELECT", mkPropertyValues({"TABLE": "2"}))
+self.assertEqual(get_state_as_dict(xGridWindow)["SelectedTable"], "2")
+
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
commit 455fe33df4d498d8c374d43f57caf14897636749
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Wed Mar 7 01:33:25 2018 +0100

uitest: fix small bug when trying to select different sheet in calc

Change-Id: I83e2b8dc1b0da9f28475994493e3776c898a5729
    Reviewed-on: https://gerrit.libreoffice.org/50853
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/sc/source/ui/uitest/uiobject.cxx b/sc/source/ui/uitest/uiobject.cxx
index 323ae82e517a..3e98e1535bfc 100644
--- a/sc/source/ui/uitest/uiobject.cxx
+++ b/sc/source/ui/uitest/uiobject.cxx
@@ -131,7 +131,9 @@ void ScGridWinUIObject::execute(const OUString& rAction,
 auto itr = rParameters.find("TABLE");
 const OUString rStr = itr->second;
 sal_Int32 nTab = rStr.toUInt32();
-mxGridWindow->getViewData()->SetTabNo(nTab);
+ScTabView* pTabView = mxGridWindow->getViewData()->GetView();
+if (pTabView)
+pTabView->SetTabNo(nTab);
 }
 else if (rParameters.find("OBJECT") != rParameters.end())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Cppunit

2018-02-28 Thread Markus Mohrhard
Hey,

On Thu, Mar 1, 2018 at 5:55 AM, Z223I .  wrote:

> Thanks for keeping the project alive!   It is been 10 years since I have
> used the program.
>
> I am getting an error while loading shared libraries: libcppunit-1.14.so.0.
>
> Made a copy of the money example. Used the command:
> g++ -std=c++11 -lcppunit -L/usr/local/lib MoneyApp.cpp MoneyTest.cpp
>
>
Can you please also paste the exact error message?

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


[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/galaxy

2018-02-26 Thread Markus Mohrhard
 icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png |binary
 1 file changed

New commits:
commit 575549e9d2dcbc63daf872f3302eedd68f6dddcc
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Fri Feb 23 02:36:14 2018 +0100

fix incorrect icon set size

Change-Id: Iadd08f5a95121cc2c5e6ac0d5719bdfa07b5c95a
Reviewed-on: https://gerrit.libreoffice.org/50220
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
(cherry picked from commit f5eb32c635a07f6977b8e613ac8732242e8682e7)
Reviewed-on: https://gerrit.libreoffice.org/50221
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png 
b/icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png
index 50f7e818d8bb..13c306e7f348 100644
Binary files a/icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png and 
b/icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-02-23 Thread Markus Mohrhard
 sc/qa/unit/ucalc.hxx|2 +
 sc/qa/unit/ucalc_condformat.cxx |   41 +++-
 2 files changed, 38 insertions(+), 5 deletions(-)

New commits:
commit 93117a98e870804ad0ac0152e87355edd1dd5889
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Fri Feb 23 02:04:50 2018 +0100

add test for deduplicating cond format against same format

Change-Id: I9e21b5b53f7a3c579bdaf5dc0dd6102be805faf9
Reviewed-on: https://gerrit.libreoffice.org/50217
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 6ee3d2c988bc..630e9b09b0a0 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -515,6 +515,7 @@ public:
 
 void testCondFormatUndoList();
 void testMultipleSingleCellCondFormatCopyPaste();
+void testDeduplicateMultipleCondFormats();
 
 void testImportStream();
 void testDeleteContents();
@@ -797,6 +798,7 @@ public:
 CPPUNIT_TEST(testCondFormatUpdateReferenceInsRow);
 CPPUNIT_TEST(testCondFormatUndoList);
 CPPUNIT_TEST(testMultipleSingleCellCondFormatCopyPaste);
+CPPUNIT_TEST(testDeduplicateMultipleCondFormats);
 CPPUNIT_TEST(testIconSet);
 CPPUNIT_TEST(testDataBarLengthAutomaticAxis);
 CPPUNIT_TEST(testDataBarLengthMiddleAxis);
diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
index bd79b68526ab..0e8721a0acb8 100644
--- a/sc/qa/unit/ucalc_condformat.cxx
+++ b/sc/qa/unit/ucalc_condformat.cxx
@@ -1108,14 +1108,14 @@ void Test::testCondFormatUndoList()
 
 namespace {
 
-sal_uInt32 addSingleCellCondFormat(ScDocument* pDoc, const ScAddress& rAddr, 
sal_uInt32 nKey)
+sal_uInt32 addSingleCellCondFormat(ScDocument* pDoc, const ScAddress& rAddr, 
sal_uInt32 nKey, const OUString& rCondition)
 {
 ScConditionalFormat* pFormat = new ScConditionalFormat(nKey, pDoc);
 ScRange aCondFormatRange(rAddr);
 ScRangeList aRangeList(aCondFormatRange);
 pFormat->SetRange(aRangeList);
 
-ScCondFormatEntry* pEntry = new ScCondFormatEntry(ScConditionMode::Direct, 
"=B2" + OUString::number(nKey), "",
+ScCondFormatEntry* pEntry = new ScCondFormatEntry(ScConditionMode::Direct, 
rCondition, "",
 pDoc, ScAddress(0,0,0), 
ScGlobal::GetRscString(STR_STYLENAME_RESULT));
 pFormat->AddEntry(pEntry);
 return pDoc->AddCondFormat(pFormat, 0);
@@ -1127,8 +1127,40 @@ void Test::testMultipleSingleCellCondFormatCopyPaste()
 {
 m_pDoc->InsertTab(0, "Test");
 
-sal_uInt32 nFirstCondFormatKey = addSingleCellCondFormat(m_pDoc, 
ScAddress(0, 0, 0), 1);
-sal_uInt32 nSecondCondFormatKey = addSingleCellCondFormat(m_pDoc, 
ScAddress(1, 0, 0), 2);
+sal_uInt32 nFirstCondFormatKey = addSingleCellCondFormat(m_pDoc, 
ScAddress(0, 0, 0), 1, "=A2");
+sal_uInt32 nSecondCondFormatKey = addSingleCellCondFormat(m_pDoc, 
ScAddress(1, 0, 0), 2, "=B3");
+
+ScDocument aClipDoc(SCDOCMODE_CLIP);
+copyToClip(m_pDoc, ScRange(0,0,0,2,0,0), );
+ScRange aTargetRange(2,4,0,7,4,0);
+pasteOneCellFromClip(m_pDoc, aTargetRange, );
+
+for (SCCOL nCol = 2; nCol <= 7; ++nCol)
+{
+ScConditionalFormat* pFormat = m_pDoc->GetCondFormat(nCol, 4, 0);
+if (((nCol - 2) % 3) == 0)
+{
+CPPUNIT_ASSERT_EQUAL(pFormat->GetKey(), nFirstCondFormatKey);
+}
+else if (((nCol - 2) % 3) == 1)
+{
+CPPUNIT_ASSERT_EQUAL(pFormat->GetKey(), nSecondCondFormatKey);
+}
+else
+{
+CPPUNIT_ASSERT(!pFormat);
+}
+}
+
+m_pDoc->DeleteTab(0);
+}
+
+void Test::testDeduplicateMultipleCondFormats()
+{
+m_pDoc->InsertTab(0, "Test");
+
+sal_uInt32 nFirstCondFormatKey = addSingleCellCondFormat(m_pDoc, 
ScAddress(0, 0, 0), 1, "=B2");
+sal_uInt32 nSecondCondFormatKey = addSingleCellCondFormat(m_pDoc, 
ScAddress(1, 0, 0), 2, "=B2");
 
 ScDocument aClipDoc(SCDOCMODE_CLIP);
 copyToClip(m_pDoc, ScRange(0,0,0,2,0,0), );
@@ -1137,7 +1169,6 @@ void Test::testMultipleSingleCellCondFormatCopyPaste()
 
 for (SCCOL nCol = 2; nCol <= 7; ++nCol)
 {
-std::cout << nCol << std::endl;
 ScConditionalFormat* pFormat = m_pDoc->GetCondFormat(nCol, 4, 0);
 if (((nCol - 2) % 3) == 0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


  1   2   3   4   5   6   7   8   9   10   >