[Libreoffice-commits] core.git: bean/com

[Andrea Gelmini (via logerrit)]

 bean/com/sun/star/comp/beans/OOoBean.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 30a9bfec76c807d203b39bfcdeed1cb0c3118719
Author: Andrea Gelmini 
AuthorDate: Thu Apr 4 19:21:25 2019 +
Commit: Julien Nabet 
CommitDate: Tue Apr 9 07:56:02 2019 +0200

Fix typo

Change-Id: Ifb1b63c27816c244d98fabfd97114c21c9e4ffa4
Reviewed-on: https://gerrit.libreoffice.org/70443
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 0e427e325622..72acb9c03f87 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -441,7 +441,7 @@ public class OOoBean
 was showing, then this method needs to be called after the container 
window
 was made visible (java.lang.Component.setVisible(true)).
 
-Another scenario is that a OOoBean contains a document and is removed
+Another scenario is that an OOoBean contains a document and is removed
 from a Java container and later added again. Then aquireSystemWindow 
needs
 to be called after the container window is displayed.
 
@@ -1419,7 +1419,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
public void queryTermination( /*IN*/ com.sun.star.lang.EventObject 
Event )
 throws com.sun.star.frame.TerminationVetoException
 {
-// disallow termination of OOo while a OOoBean exists
+// disallow termination of OOo while an OOoBean exists
 throw new com.sun.star.frame.TerminationVetoException();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 bean/qa/complex/bean/OOoBeanTest.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e7646280d33c38079a2a1086f5e8c7470a2cdd6
Author: Andrea Gelmini 
AuthorDate: Thu Apr 4 19:21:23 2019 +
Commit: Julien Nabet 
CommitDate: Tue Apr 9 07:31:22 2019 +0200

Fix typo

Change-Id: Ibc0b22ac1e3b58d91674822a2378703c681c6a7c
Reviewed-on: https://gerrit.libreoffice.org/70445
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/bean/qa/complex/bean/OOoBeanTest.java 
b/bean/qa/complex/bean/OOoBeanTest.java
index eebf3721f3a3..0e23e1701345 100644
--- a/bean/qa/complex/bean/OOoBeanTest.java
+++ b/bean/qa/complex/bean/OOoBeanTest.java
@@ -258,7 +258,7 @@ public class OOoBeanTest
 }
 
 /**
-   1. Create a OOoBean
+   1. Create an OOoBean
2. Load a document
3. Create Frame (do not show yet)
4. Add OOoBean to Frame
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

[Andrea Gelmini (via logerrit)]

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 350d159754110a600b94eb27e294b035c73a7ced
Author: Andrea Gelmini 
AuthorDate: Mon Apr 8 09:52:29 2019 +
Commit: Julien Nabet 
CommitDate: Tue Apr 9 07:27:35 2019 +0200

Fix typo

Change-Id: Ia52e717551d50e57d59feba5709d6bf25e1dc1a2
Reviewed-on: https://gerrit.libreoffice.org/70441
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index a77c30d3e533..f76bec0564ad 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -192,7 +192,7 @@ public class LocalOfficeConnection
 /**
  * Sets an AWT container factory.
  *
- * @param containerFactory This is a application provided AWT container
+ * @param containerFactory This is an application provided AWT container
  *  factory.
  */
 @Deprecated
@@ -448,7 +448,7 @@ public class LocalOfficeConnection
 
 /**
  * Parses a connection URL.
- * This method accepts a UNO URL with following format:
+ * This method accepts an UNO URL with following format:
  * 
  * url:= uno:localoffice[,];urp;StarOffice.NamingService
  * params := [,]
@@ -632,7 +632,7 @@ public class LocalOfficeConnection
 */
 private static String getPipeName() throws UnsupportedEncodingException
 {
-// turn user name into a URL and file system safe name (% chars will 
not work)
+// turn user name into an URL and file system safe name (% chars will 
not work)
 String aPipeName = System.getProperty("user.name") + OFFICE_ID_SUFFIX;
 aPipeName = aPipeName.replace( "_", "%B7" );
 return java.net.URLEncoder.encode( aPipeName, "UTF-8" ).replace( "+", 
"%20" ).replace( "%", "_" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 icon-themes/colibre/links.txt |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b3d415fb3e740f873d64c2138db5d7186e9561fe
Author: andreas kainz 
AuthorDate: Tue Apr 9 00:42:14 2019 +0200
Commit: andreas_kainz 
CommitDate: Tue Apr 9 07:18:55 2019 +0200

tdf#122924 wrong link in colibre links.txt

Change-Id: I322657823888d33e8dceb63d95251bde54227da9
Reviewed-on: https://gerrit.libreoffice.org/70435
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index c836629cf5da..d72b9c04bfa7 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1622,7 +1622,6 @@ svx/res/symphony/rotate_left.png cmd/sc_rotateleft.png
 svx/res/symphony/rotate_right.png cmd/sc_rotateright.png
 svx/res/symphony/sch_backgroundcolor.png cmd/sc_backgroundcolor.png
 svx/res/symphony/spacing3.png cmd/sc_spacepara1.png
-svx/res/symphony/last_custom_common_grey.png cmd/last_custom_common_grey.png
 svx/res/symphony/last_custom_common.png cmd/last_custom_common.png
 
 # sw
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 svx/source/accessibility/svxrectctaccessiblecontext.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7b701367d5534c097e352571ebb2ce63364f
Author: Andrea Gelmini 
AuthorDate: Mon Apr 8 10:51:05 2019 +
Commit: Jens Carl 
CommitDate: Tue Apr 9 07:15:28 2019 +0200

Removed duplicated include

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

diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx 
b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 8e44a2574cc6..55e1f2410d2e 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 0 files changed

New commits:
commit 23dc2e99b433f63992fee76555ae321edb5104a3
Author: Andrea Gelmini 
AuthorDate: Mon Apr 8 10:51:31 2019 +
Commit: Jens Carl 
CommitDate: Tue Apr 9 07:14:18 2019 +0200

Removed executable permission on source

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

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 package/source/xstor/xstorage.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5143a5725ccc74209f0b5f2f903983622d328d0c
Author: Andrea Gelmini 
AuthorDate: Mon Apr 8 10:52:49 2019 +
Commit: Jens Carl 
CommitDate: Tue Apr 9 07:13:36 2019 +0200

Fix typos

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

diff --git a/package/source/xstor/xstorage.cxx 
b/package/source/xstor/xstorage.cxx
index c963820def7f..28e20c43703a 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -1028,7 +1028,7 @@ void OStorage_Impl::Commit()
 while (  mapIter != m_aChildrenMap.end() )
 {
 // renamed and inserted elements must be really inserted to package 
later
-// since thay can conflict with removed elements
+// since they can conflict with removed elements
 auto & pElement = mapIter->second;
 if ( pElement->m_bIsRemoved )
 {
@@ -1050,7 +1050,7 @@ void OStorage_Impl::Commit()
 for ( auto& pair : m_aChildrenMap )
 {
 // if it is a 'duplicate commit' inserted elements must be really 
inserted to package later
-// since thay can conflict with renamed elements
+// since they can conflict with renamed elements
 auto & pElement = pair.second;
 if ( !pElement->m_bIsInserted )
 {
@@ -1570,7 +1570,7 @@ void OStorage_Impl::CloneStreamElement( const OUString& 
aStreamName,
 // the copy will be created internally
 
 // usual copying is not applicable here, only last flushed version of the
-// child stream should be used for copiing. Probably the children 
m_xPackageStream
+// child stream should be used for copying. Probably the children 
m_xPackageStream
 // can be used as a base of a new stream, that would be copied to result
 // storage. The only problem is that some package streams can be accessed 
from outside
 // at the same time (now solved by wrappers that remember own position).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 fpicker/source/win32/VistaFilePickerImpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5785e4344f8e56aacbeb4d72e5e1f3066b2ec9b8
Author: Andrea Gelmini 
AuthorDate: Thu Apr 4 19:13:59 2019 +
Commit: Jens Carl 
CommitDate: Tue Apr 9 07:13:06 2019 +0200

Fix typo

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

diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index a2cc6d01468b..a4b5a88c5d48 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -763,7 +763,7 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const 
RequestRef& rRequest)
 // Vista stores last used folders for file dialogs
 // so we don't want the application to change the folder
 // in most cases.
-// Store the requested folder in the mean time and decide later
+// Store the requested folder in the meantime and decide later
 // what to do
 m_sDirectory = sDirectory;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

[Andrea Gelmini (via logerrit)]

 bean/com/sun/star/comp/beans/OfficeConnection.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a78ffa922eda80317c1d24bd1e552eb57122a8d1
Author: Andrea Gelmini 
AuthorDate: Thu Apr 4 19:21:24 2019 +
Commit: Jens Carl 
CommitDate: Tue Apr 9 07:10:46 2019 +0200

Fix typo

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

diff --git a/bean/com/sun/star/comp/beans/OfficeConnection.java 
b/bean/com/sun/star/comp/beans/OfficeConnection.java
index 08bcff345218..8795f0d5a017 100644
--- a/bean/com/sun/star/comp/beans/OfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/OfficeConnection.java
@@ -42,7 +42,7 @@ public interface OfficeConnection
 /**
  * Sets an AWT container factory.
  *
- * @param containerFactory This is a application provided AWT container
+ * @param containerFactory This is an application provided AWT container
  *  factory.
  */
 void setContainerFactory(ContainerFactory containerFactory);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aditya (via logerrit)]

 include/svx/tbxcolorupdate.hxx |1 +
 svx/source/tbxctrls/tbcontrl.cxx   |2 +-
 svx/source/tbxctrls/tbxcolorupdate.cxx |   13 +
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit f512f8818aec08a5b463c8acdf781e7ab27036f5
Author: Aditya 
AuthorDate: Sat Apr 6 13:23:48 2019 +0530
Commit: Jim Raykowski 
CommitDate: Tue Apr 9 03:54:41 2019 +0200

tdf#124247: Fix tooltip message when color added to recent colors

Presently, the tool tip text in recent colors is shown in its
 hexadecimal representation when the split color button is clicked.
 Change the hexadecimal representation of the colors in 'recent
 colors' to its actual color name.

Change-Id: I59636eb124b75a9397337c9560bfff72804424ae
Reviewed-on: https://gerrit.libreoffice.org/70337
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index 03b6a091a8eb..ec7639bac3c7 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -52,6 +52,7 @@ namespace svx
 voidUpdate( const NamedColor& rNamedColor );
 voidUpdate( const Color& rColor, bool bForceUpdate = false );
 Color const & GetCurrentColor() const { return maCurColor; }
+OUStringGetCurrentColorName();
 
 private:
 ToolboxButtonColorUpdater(ToolboxButtonColorUpdater const &) = delete;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 1843e0490fc6..0208ae8e335a 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3507,7 +3507,7 @@ void SvxColorToolBoxControl::execute(sal_Int16 
/*nSelectModifier*/)
 dispatchCommand( aCommand, aArgs );
 
 EnsurePaletteManager();
-OUString sColorName = "#" + aColor.AsRGBHexString().toAsciiUpperCase();
+OUString sColorName = m_xBtnUpdater->GetCurrentColorName();
 m_xPaletteManager->AddRecentColor(aColor, sColorName);
 }
 
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx 
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 378f48721c7a..f7524c02bc1a 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -142,6 +142,19 @@ namespace svx
 
 mpTbx->SetItemOverlayImage(mnBtnId, 
Image(pVirDev->GetBitmapEx(Point(0,0), aItemSize)));
 }
+
+OUString ToolboxButtonColorUpdater::GetCurrentColorName()
+{
+OUString sColorName = mpTbx->GetQuickHelpText(mnBtnId);
+// The obtained string is of format: color context (color name)
+// Generate a substring which contains only the color name
+sal_Int32 nStart = sColorName.indexOf('(');
+sColorName = sColorName.copy( nStart + 1 );
+sal_Int32 nLength = sColorName.getLength();
+if(nLength > 0)
+sColorName = sColorName.copy( 0, nLength - 1);
+return sColorName;
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Add AdjustX method to basegfx::B2DPoint

[Alexander Farrow]

Hi Noel,

Noel Grandin wrote:
>Are we going to be doing this behind the
>   VCL_FLOAT_DEVICE_PIXEL
>define and using the DeviceCoordinate typedef ?

I'm assuming your referring to my recent patch:
https://gerrit.libreoffice.org/#/c/70329/ 


That's a good point, do you mean doing something like:
#if VCL_FLOAT_DEVICE_PIXEL
    B2DPoint aCurrPos(0.0, 0.0);
#else
    B2IPoint aCurrPos(0, 0);
#endif


>(as a side note I had no idea we had this enabled on mac and ios already)

That's interesting, I didn't know that. I've OpenGrok searched the code for
where we are doing this but I couldn't find it. I found line 10247 in
configure.ac, which looks related:
https://opengrok.libreoffice.org/xref/core/configure.ac?r=c51b68dd#10247 

But it's commented out (line starts with dnl).


With many thanks,
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Jens Carl (via logerrit)]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv |4 
 sc/qa/extras/sceditfieldobj-cell.cxx   |   78 
+-
 sc/qa/extras/sceditfieldobj-header.cxx |   57 ---
 3 files changed, 79 insertions(+), 60 deletions(-)

New commits:
commit 6c50ee3377756ae7da1ae039da35775c0a97ef2f
Author: Jens Carl 
AuthorDate: Mon Apr 8 21:45:18 2019 +
Commit: Jens Carl 
CommitDate: Tue Apr 9 01:29:36 2019 +0200

tdf#45904 Move XPropertySet Java tests to C++

Move remaining XPropertySet Java tests to ScEditFieldObj_Cell and
ScEditFieldObj_Header.

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

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
index 8ca686fff172..1912ae235b3b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
@@ -4,7 +4,3 @@
 "ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorType#optional"
 "ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorTypes#optional"
 "ScCellFieldObj";"com::sun::star::text::TextContent";"TextWrap#optional"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"addPropertyChangeListener()"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"removePropertyChangeListener()"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"addVetoableChangeListener()"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"removeVetoableChangeListener()"
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx 
b/sc/qa/extras/sceditfieldobj-cell.cxx
index 7f39e88f1752..071be82489ff 100644
--- a/sc/qa/extras/sceditfieldobj-cell.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -13,19 +13,29 @@
 #include 
 
 #include 
+#include 
 #include 
+#include 
+#include 
+#include 
 #include 
+#include 
+#include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
-using namespace css;
-using namespace css::uno;
+#include 
 
-namespace sc_apitest {
+using namespace css;
 
-class ScEditFieldObj_Cell : public CalcUnoApiTest, public apitest::XTextField, 
public apitest::XTextContent, public apitest::XPropertySet
+namespace sc_apitest
+{
+class ScEditFieldObj_Cell : public CalcUnoApiTest,
+public apitest::XPropertySet,
+public apitest::XTextContent,
+public apitest::XTextField
 {
 public:
 ScEditFieldObj_Cell();
@@ -45,6 +55,8 @@ public:
 CPPUNIT_TEST(testGetPropertySetInfo);
 CPPUNIT_TEST(testGetPropertyValue);
 CPPUNIT_TEST(testSetPropertyValue);
+CPPUNIT_TEST(testPropertyChangeListener);
+CPPUNIT_TEST(testVetoableChangeListener);
 
 // XTextField
 CPPUNIT_TEST(testGetPresentation);
@@ -66,7 +78,7 @@ private:
 uno::Reference ScEditFieldObj_Cell::mxField;
 
 ScEditFieldObj_Cell::ScEditFieldObj_Cell()
- : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+: CalcUnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -84,41 +96,41 @@ void ScEditFieldObj_Cell::tearDown()
 CalcUnoApiTest::tearDown();
 }
 
-namespace {
-
+namespace
+{
 uno::Reference getNewField(const 
uno::Reference& xSM)
 {
-uno::Reference xField(
-xSM->createInstance("com.sun.star.text.TextField.URL"), 
UNO_QUERY_THROW);
-uno::Reference xPropSet(xField, UNO_QUERY_THROW);
+uno::Reference 
xField(xSM->createInstance("com.sun.star.text.TextField.URL"),
+uno::UNO_QUERY_THROW);
+uno::Reference xPropSet(xField, uno::UNO_QUERY_THROW);
 xPropSet->setPropertyValue("Representation", 
uno::makeAny(OUString("LibreOffice")));
 xPropSet->setPropertyValue("URL", 
uno::makeAny(OUString("http://www.libreoffice.org/";)));
 return xField;
 }
 
-}
+} // namespace
 
 uno::Reference ScEditFieldObj_Cell::init()
 {
 // Return a field that's already in the cell.
 if (!mxField.is())
 {
-uno::Reference xSM(mxComponent, 
UNO_QUERY_THROW);
+uno::Reference xSM(mxComponent, 
uno::UNO_QUERY_THROW);
 
 // Create a new URL field object, and populate it with name and URL.
 mxField = getNewField(xSM);
 
 // Insert this field into a cell.
-uno::Reference xDoc(mxComponent, 
UNO_QUERY_THROW);
-uno::Reference xIA(xDoc->getSheets(), 
UNO_QUERY_THROW);
-uno::Reference xSheet(xIA->getByIndex(0), 
UNO_QUERY_THROW);
+uno::Reference xDoc(mxComponent, 
uno::UNO_QUERY_THROW);
+uno::Reference xIA(xDoc->getSheets(), 
uno::UNO_QUERY_THROW);
+uno::Reference xSheet(xIA->getByIndex(0), 
uno::UNO_QUERY_THROW);
 // Use cell A1 for this.
 uno::Reference xCell = xSheet->getCellByPosition(0, 0);
-uno::Reference xText(xCel

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

[Jens Carl (via logerrit)]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv |6 --
 1 file changed, 6 deletions(-)

New commits:
commit a496096b4ecc4ffb45bc7dc25753c970bf5ca487
Author: Jens Carl 
AuthorDate: Mon Apr 8 21:25:48 2019 +
Commit: Jens Carl 
CommitDate: Tue Apr 9 01:29:06 2019 +0200

tdf#45904 Remove obsolete/disabled tests

The some of the ScCellFieldObj tests are already written in C++
since commit d0af33e87db753d6d171548f75c2e242cde00497.

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

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
index bcb16d0a0c59..8ca686fff172 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
@@ -4,13 +4,7 @@
 "ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorType#optional"
 "ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorTypes#optional"
 "ScCellFieldObj";"com::sun::star::text::TextContent";"TextWrap#optional"
-"ScCellFieldObj";"com::sun::star::text::XTextField";"getPresentation()"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"getPropertySetInfo()"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"setPropertyValue()"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"getPropertyValue()"
 
"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"addPropertyChangeListener()"
 
"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"removePropertyChangeListener()"
 
"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"addVetoableChangeListener()"
 
"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"removeVetoableChangeListener()"
-"ScCellFieldObj";"com::sun::star::text::XTextContent";"attach()"
-"ScCellFieldObj";"com::sun::star::text::XTextContent";"getAnchor()"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 dev/null   |binary
 icon-themes/sifr/links.txt | 1174 -
 icon-themes/sifr_svg/cmd/lc_centerpara.svg |6 
 icon-themes/sifr_svg/cmd/lc_connectorcircles.svg   |6 
 icon-themes/sifr_svg/cmd/lc_connectorcurvecircles.svg  |6 
 icon-themes/sifr_svg/cmd/lc_connectorlinecircles.svg   |6 
 icon-themes/sifr_svg/cmd/lc_connectorlinescircles.svg  |6 
 icon-themes/sifr_svg/cmd/lc_dbnewtable.svg |6 
 icon-themes/sifr_svg/cmd/lc_dbtableedit.svg|6 
 icon-themes/sifr_svg/cmd/lc_deleteslide.svg|6 
 icon-themes/sifr_svg/cmd/lc_duplicateslide.svg |6 
 icon-themes/sifr_svg/cmd/lc_ellipsetoolbox.svg |6 
 icon-themes/sifr_svg/cmd/lc_fillstyle.svg  |   10 
 icon-themes/sifr_svg/cmd/lc_fliphorizontal.svg |6 
 icon-themes/sifr_svg/cmd/lc_flipvertical.svg   |6 
 icon-themes/sifr_svg/cmd/lc_grafattrcrop.svg   |   10 
 icon-themes/sifr_svg/cmd/lc_gridvisible.svg|6 
 icon-themes/sifr_svg/cmd/lc_headerandfooter.svg|6 
 icon-themes/sifr_svg/cmd/lc_hfixedline.svg |6 
 icon-themes/sifr_svg/cmd/lc_hyperlinkdialog.svg|6 
 icon-themes/sifr_svg/cmd/lc_insertcurrentdate.svg  |6 
 icon-themes/sifr_svg/cmd/lc_insertcurrenttime.svg  |6 
 icon-themes/sifr_svg/cmd/lc_insertheaderfootermenu.svg |6 
 icon-themes/sifr_svg/cmd/lc_insertslide.svg|6 
 icon-themes/sifr_svg/cmd/lc_justifypara.svg|6 
 icon-themes/sifr_svg/cmd/lc_leftpara.svg   |6 
 icon-themes/sifr_svg/cmd/lc_linespacing.svg|6 
 icon-themes/sifr_svg/cmd/lc_linetoolbox.svg|   10 
 icon-themes/sifr_svg/cmd/lc_movepagedown.svg   |6 
 icon-themes/sifr_svg/cmd/lc_movepageup.svg |6 
 icon-themes/sifr_svg/cmd/lc_numberformatcurrency.svg   |6 
 icon-themes/sifr_svg/cmd/lc_protecttracechangemode.svg |6 
 icon-themes/sifr_svg/cmd/lc_rightpara.svg  |6 
 icon-themes/sifr_svg/cmd/lc_savesimple.svg |6 
 icon-themes/sifr_svg/cmd/lc_sortdown.svg   |6 
 icon-themes/sifr_svg/cmd/lc_sortup.svg |6 
 icon-themes/sifr_svg/cmd/lc_underlinesimple.svg|6 
 icon-themes/sifr_svg/cmd/lc_xlinestyle.svg |6 
 icon-themes/sifr_svg/cmd/sc_accepttrackedchange.svg|6 
 icon-themes/sifr_svg/cmd/sc_apply.svg  |6 
 icon-themes/sifr_svg/cmd/sc_arrowstoolbox.svg  |6 
 icon-themes/sifr_svg/cmd/sc_basicshapes.svg|   10 
 icon-themes/sifr_svg/cmd/sc_cellcontentsmenu.svg   |6 
 icon-themes/sifr_svg/cmd/sc_centerpara.svg |6 
 icon-themes/sifr_svg/cmd/sc_characterbackgroundpattern.svg |   10 
 icon-themes/sifr_svg/cmd/sc_closewin.svg   |6 
 icon-themes/sifr_svg/cmd/sc_connectortoolbox.svg   |   10 
 icon-themes/sifr_svg/cmd/sc_datapilotmenu.svg  |6 
 icon-themes/sifr_svg/cmd/sc_dbnewquerysql.svg  |6 
 icon-themes/sifr_svg/cmd/sc_dbtableedit.svg|6 
 icon-themes/sifr_svg/cmd/sc_deleteslide.svg|6 
 icon-themes/sifr_svg/cmd/sc_diagramdata.svg|6 
 icon-themes/sifr_svg/cmd/sc_duplicateslide.svg |6 
 icon-themes/sifr_svg/cmd/sc_edithyperlink.svg  |6 
 icon-themes/sifr_svg/cmd/sc_ellipsetoolbox.svg |6 
 icon-themes/sifr_svg/cmd/sc_exitsearch.svg |6 
 icon-themes/sifr_svg/cmd/sc_fieldmenu.svg  |6 
 icon-themes/sifr_svg/cmd/sc_fillcolor.svg  |   10 
 icon-themes/sifr_svg/cmd/sc_fillstyle.svg  |   10 
 icon-themes/sifr_svg/cmd/sc_fliphorizontal.svg |6 
 icon-themes/sifr_svg/cmd/sc_flipmenu.svg   |6 
 icon-themes/sifr_svg/cmd/sc_flipvertical.svg   |6 
 icon-themes/sifr_svg/cmd/sc_fontcolor.svg  |6 
 icon-themes/sifr_svg/cmd/sc_functionbox.svg|6 
 icon-themes/sifr_svg/cmd/sc_grafattrcrop.svg   |   10 
 icon-themes/sifr_svg/cmd/sc_gridmenu.svg   |6 
 icon-themes/sifr_svg/cmd/sc_gridvisible.svg|6 
 icon-themes/sifr_svg/cmd/sc_headerandfooter.svg|6 
 icon-themes/sifr_svg/cmd/sc_hfixedline.svg |   53 
 icon-themes/sifr_svg/cmd/sc_hyperlinkdialog.svg|6 
 icon-themes/sifr_svg/cmd/sc_hyphenation.svg|6 
 icon-themes/sifr_svg/cmd/sc_insertcolumnsmenu.svg  |   10 
 icon-themes/sifr_svg/cmd/sc_insertcurrentdate.svg  |6 
 icon-themes/sifr_svg/

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

[andreas kainz (via logerrit)]

 icon-themes/sifr/cmd/lc_horizontalline.png  |binary
 icon-themes/sifr/cmd/sc_horizontalline.png  |binary
 icon-themes/sifr_dark/cmd/lc_horizontalline.png |binary
 icon-themes/sifr_dark/cmd/sc_horizontalline.png |binary
 icon-themes/sifr_svg/cmd/lc_horizontalline.svg  |6 +
 icon-themes/sifr_svg/cmd/sc_horizontalline.svg  |   53 
++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   11 ++
 7 files changed, 70 insertions(+)

New commits:
commit d68dcb179d3350488f89a53321f913f1d66bb876
Author: andreas kainz 
AuthorDate: Mon Apr 8 23:40:34 2019 +0200
Commit: andreas_kainz 
CommitDate: Tue Apr 9 01:08:12 2019 +0200

tdf#124200 missing icon: for HorizontalLine

Change-Id: Ib2ffb703b2649a629c06ee5a50603912bf615cf2
Reviewed-on: https://gerrit.libreoffice.org/70433
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/icon-themes/sifr/cmd/lc_horizontalline.png 
b/icon-themes/sifr/cmd/lc_horizontalline.png
new file mode 100644
index ..3d5d267ae68a
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_horizontalline.png differ
diff --git a/icon-themes/sifr/cmd/sc_horizontalline.png 
b/icon-themes/sifr/cmd/sc_horizontalline.png
new file mode 100644
index ..edf619515304
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_horizontalline.png differ
diff --git a/icon-themes/sifr_dark/cmd/lc_horizontalline.png 
b/icon-themes/sifr_dark/cmd/lc_horizontalline.png
new file mode 100644
index ..2a65b9a3b635
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_horizontalline.png 
differ
diff --git a/icon-themes/sifr_dark/cmd/sc_horizontalline.png 
b/icon-themes/sifr_dark/cmd/sc_horizontalline.png
new file mode 100644
index ..ab1a57ee93e3
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/sc_horizontalline.png 
differ
diff --git a/icon-themes/sifr_svg/cmd/lc_horizontalline.svg 
b/icon-themes/sifr_svg/cmd/lc_horizontalline.svg
new file mode 100644
index ..cbc64a1271e8
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/lc_horizontalline.svg
@@ -0,0 +1,6 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+  
+
diff --git a/icon-themes/sifr_svg/cmd/sc_horizontalline.svg 
b/icon-themes/sifr_svg/cmd/sc_horizontalline.svg
new file mode 100644
index ..8f1ec3c9a201
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/sc_horizontalline.svg
@@ -0,0 +1,53 @@
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="sc_hfixedline.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+  
+
+  
+  
+  
+  
+
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 645754a8837a..4b74356c7e3f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2953,6 +2953,17 @@
   Horizontal ~Line
 
   
+  
+
+  Horizontal ~Line
+
+
+  .uno:StyleApply?Style:string=Horizontal 
Line&FamilyName:string=ParagraphStyles
+
+
+  9
+
+  
   
 
   Default ~Paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Faulty handle position in shapes imported from MS Office

[Regina Henschel]

Hi all,

I'm looking at https://bugs.documentfoundation.org/show_bug.cgi?id=115813
"Position shifted while moving the handle of OOXML Callout shape".

Unfortunately not only the Callout shape is affected.
There are 106 shapes in MS Office, which have handles. 38 are OK with 
the current implementation and 68 have at least one handle, which reacts 
wrongly. These are only those from ooxml, not from binary format.


The calculation is in method 
EnhancedCustomShape2d::SetHandleControllerPosition in 
svx\source\customshapes\EnhancedCustomShape2d.cxx. The relevant part 
starts about #1230


The relation ship between handle position and adjustment value is in 
most cases not direct but via formulas. For to get an adjustment value 
from a handle position you need to apply the formulas backwards.


It might be possible to identify handles, which behave similar. For 
example some Star-shapes use the adjust value as factor to the radius 
with 0 in center and 1 at the edge. But other adjust values are used in 
other ways. I have not tried to find groups of similar usage yet.


What to do? In principle you can get the needed operations from the 
presets as defined in the standard. But how to organize that, so that it 
can be done step by step and perhaps can be done by several people? 
And, of course, the code should still be readable and clear.


Kind regards
Regina


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

Re: [GSoC] Subpixel glyph positioning - Looking for a mentor

[Alexander Farrow]

Hi Mike,

Kaganski Mike wrote:
>Oh! I didn't realize that I was in the explicit CC list; since I never
>worked with font rendering stuff closely, I even didn't consider myself
>as a potential mentor. Sorry, but I don't have required skills.

Not a problem, apologies for the confusion.


>But of course, I'm ready to answer any questions in the course of the project
>(be it GSoC or otherwise) as much as I have knowledge. I consider this
>task an important thins, so it's in my scope of interest.

Awesome, thanks in advance for your help.

- Alex

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

Re: Add AdjustX method to basegfx::B2DPoint

[Alexander Farrow]

Hi Thorsten,

Thanks for your reply.

Thorsten Behrens wrote:
>tools::Point is not exactly a role model for a nicely designed class,
>so I'd hesitate to take any literal bits out of that. ;)

Good to know, I'm new to the codebase so I'll keep that in mind.


>Many places using AdjustX() also call AdjustY() just the next line, so
>for that you could use basegfx::B2DPoint::operator+=(const B2DTuple&)

Sure but there are occasions in the code where we are just modifying
a single coordinate. My recent patch is an example:
https://gerrit.libreoffice.org/#/c/70329/ 



>If you believe you *must* use a single-component modifier

A single-component modifier isn't a must but it might be nice for
when we are only changing one coordinate.


> please come up with something that blends well with the b2dtuple/point
>concept. Also ideally, you will maintain some amount of internal
>consistency (e.g. compare how operator*, *= etc. all got added in
>farious flavours, such that math with b2dtuples works like the
>'canonical' way when done with skalars or various forms of vectors).

If we do decide to go ahead with this I'll be sure to follow your
implementation requirements.

With many thanks,
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara (via logerrit)]

 sc/inc/scabstdlg.hxx  |2 
 sc/source/ui/attrdlg/scdlgfact.cxx|   26 ++---
 sc/source/ui/attrdlg/scdlgfact.hxx|2 
 sc/source/ui/docshell/docsh4.cxx  |3 
 sc/source/ui/inc/hfedtdlg.hxx |   28 ++---
 sc/source/ui/pagedlg/hfedtdlg.cxx |  105 ++--
 sc/source/ui/pagedlg/tphf.cxx |2 
 sc/uiconfig/scalc/ui/allheaderfooterdialog.ui |  132 +++---
 sc/uiconfig/scalc/ui/footerdialog.ui  |   84 +---
 sc/uiconfig/scalc/ui/headerdialog.ui  |   84 +---
 sc/uiconfig/scalc/ui/headerfooterdialog.ui|   84 +---
 sc/uiconfig/scalc/ui/leftfooterdialog.ui  |   60 ---
 sc/uiconfig/scalc/ui/leftheaderdialog.ui  |   60 ---
 sc/uiconfig/scalc/ui/rightfooterdialog.ui |   60 ---
 sc/uiconfig/scalc/ui/rightheaderdialog.ui |   60 ---
 sc/uiconfig/scalc/ui/sharedfooterdialog.ui|  108 ++---
 sc/uiconfig/scalc/ui/sharedheaderdialog.ui|  108 ++---
 17 files changed, 775 insertions(+), 233 deletions(-)

New commits:
commit de8ea47ecdaa33934e47a6ee9bfa742698311534
Author: Caolán McNamara 
AuthorDate: Mon Apr 8 14:53:19 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 22:26:59 2019 +0200

weld ScHFEditDlg

Change-Id: I2f17dfb1f8193730b26e7c338100a786ddbb87c7
Reviewed-on: https://gerrit.libreoffice.org/70418
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 5bcfd9d5fab4..7b2c458ee7eb 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -520,7 +520,7 @@ public:
 virtual VclPtr CreateScAttrDlg(weld::Window* pParent,
 const SfxItemSet* 
pCellAttrs) = 0;
 
-virtual VclPtr CreateScHFEditDlg(vcl::Window*   
pParent,
+virtual VclPtr CreateScHFEditDlg(weld::Window*   
pParent,
 const SfxItemSet&   
rCoreSet,
 const OUString& 
rPageStyle,
 sal_uInt16  nResId 
) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 740c06ffc2a2..f2074b170845 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -989,51 +989,51 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScAttrDlg(weld:
 return 
VclPtr::Create(std::make_unique(pParent,
 pCellAttrs));
 }
 
-VclPtr ScAbstractDialogFactory_Impl::CreateScHFEditDlg( 
vcl::Window* pParent,
+VclPtr ScAbstractDialogFactory_Impl::CreateScHFEditDlg( 
weld::Window* pParent,
 const 
SfxItemSet&   rCoreSet,
 const 
OUString& rPageStyle,
 
sal_uInt16  nResId )
 {
-VclPtr pDlg;
+std::unique_ptr xDlg;
 
 switch (nResId)
 {
 case RID_SCDLG_HFED_HEADER:
 case RID_SCDLG_HFEDIT_HEADER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFED_FOOTER:
 case RID_SCDLG_HFEDIT_FOOTER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_LEFTHEADER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_RIGHTHEADER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_LEFTFOOTER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_RIGHTFOOTER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_SHDR:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, 
rCoreSet, rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_SFTR:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, 
rCoreSet, rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_ALL:
-pDlg = VclPtr::Creat

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

[Caolán McNamara (via logerrit)]

 include/sfx2/basedlgs.hxx   |   27 
 sfx2/source/dialog/basedlgs.cxx |  127 
 2 files changed, 154 deletions(-)

New commits:
commit 623d7a94a57860b0b227e6ebad6d0d3fcaf11333
Author: Caolán McNamara 
AuthorDate: Mon Apr 8 12:32:19 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 22:24:04 2019 +0200

drop newly unused SfxSingleTabDialog

Change-Id: I3b445aba89ce62d7890d387a962f12a7055dc7b4
Reviewed-on: https://gerrit.libreoffice.org/70416
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index ed7df91b3883..7a29b9f1bd02 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -203,33 +203,6 @@ struct SingleTabDlgImpl
 
 typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international 
Which values
 
-class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog
-{
-public:
-SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet,
-const OUString& rID = OUString("SingleTabDialog"),
-const OUString& rUIXMLDescription = 
OUString("sfx/ui/singletabdialog.ui"));
-
-SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet* pInSet,
-const OUString& rID = OUString("SingleTabDialog"),
-const OUString& rUIXMLDescription = 
OUString("sfx/ui/singletabdialog.ui"));
-
-virtual ~SfxSingleTabDialog() override;
-virtual voiddispose() override;
-
-voidSetTabPage(SfxTabPage* pTabPage);
-SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; }
-
-private:
-VclPtr  pOKBtn;
-VclPtr  pCancelBtn;
-VclPtrpHelpBtn;
-
-DECL_DLLPRIVATE_LINK(OKHdl_Impl, Button*, void);
-
-std::unique_ptr   pImpl;
-};
-
 class SFX2_DLLPUBLIC SfxOkDialogController : public SfxDialogController
 {
 public:
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index aed00aa2042a..f6f3e1b5a46a 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -709,133 +709,6 @@ void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) 
const
 rInfo.nFlags |= SfxChildWindowFlags::ZOOMIN;
 }
 
-// SfxSingleTabDialog 
-
-IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl, Button*, void)
-
-/*  [Description]
-
-Ok_Handler; FillItemSet() is called for setting of Page.
-*/
-
-{
-if ( !GetInputItemSet() )
-{
-// TabPage without ItemSet
-EndDialog( RET_OK );
-return;
-}
-
-if ( !GetOutputItemSet() )
-{
-CreateOutputItemSet( *GetInputItemSet() );
-}
-bool bModified = false;
-
-if ( pImpl->m_pSfxPage->HasExchangeSupport() )
-{
-DeactivateRC nRet = pImpl->m_pSfxPage->DeactivatePage( 
GetOutputSetImpl() );
-if ( nRet != DeactivateRC::LeavePage )
-return;
-else
-bModified = ( GetOutputItemSet()->Count() > 0 );
-}
-else
-bModified = pImpl->m_pSfxPage->FillItemSet( GetOutputSetImpl() );
-
-if ( bModified )
-{
-// Save user data in IniManager.
-pImpl->m_pSfxPage->FillUserData();
-OUString sData( pImpl->m_pSfxPage->GetUserData() );
-
-OUString sConfigId = 
OStringToOUString(pImpl->m_pSfxPage->GetConfigId(),
-RTL_TEXTENCODING_UTF8);
-SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId);
-aPageOpt.SetUserItem( USERITEM_NAME, makeAny( sData ) );
-EndDialog( RET_OK );
-}
-else
-EndDialog();
-}
-
-
-SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& 
rSet,
-const OUString& rID, const OUString& rUIXMLDescription)
-: SfxModalDialog(pParent, rID, rUIXMLDescription)
-, pImpl(new SingleTabDlgImpl)
-{
-get(pOKBtn, "ok");
-pOKBtn->SetClickHdl( LINK( this, SfxSingleTabDialog, OKHdl_Impl ) );
-get(pCancelBtn, "cancel");
-get(pHelpBtn, "help");
-SetInputSet( &rSet );
-}
-
-SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window* pParent, const SfxItemSet* 
pInSet,
-const OUString& rID, const OUString& rUIXMLDescription)
-: SfxModalDialog(pParent, rID, rUIXMLDescription)
-, pImpl(new SingleTabDlgImpl)
-{
-get(pOKBtn, "ok");
-pOKBtn->SetClickHdl( LINK( this, SfxSingleTabDialog, OKHdl_Impl ) );
-get(pCancelBtn, "cancel");
-get(pHelpBtn, "help");
-SetInputSet( pInSet );
-}
-
-SfxSingleTabDialog::~SfxSingleTabDialog()
-{
-disposeOnce();
-}
-
-void SfxSingleTabDialog::dispose()
-{
-pImpl->m_pSfxPage.disposeAndClear();
-pImpl.reset();
-pOKBtn.clear();
-pCancelBtn.clear();
-pHelpBtn.clear();
-SfxModalDialog::dispose();
-}
-
-/*  [Description]
-
-Insert a (new) TabPage; an existing page is deleted.
-The passed on page is initialized with the initially given Itemset
-through calling Reset().
-*/
-void SfxSingleTa

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/pagedlg/tphf.cxx |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 319c0b2433bb8dd405ed1630dd464ed2b11afefb
Author: Caolán McNamara 
AuthorDate: Mon Apr 8 12:29:04 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 22:22:20 2019 +0200

weld calc header/footer dialog

Change-Id: Ied5ca56637b2f7be2d769d8f773a6e012d6e5b1f
Reviewed-on: https://gerrit.libreoffice.org/70415
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 6065acfac08c..bac0f9a26c18 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -193,37 +193,38 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
 else
 {
 OUString  aText;
-VclPtrInstance< SfxSingleTabDialog > pDlg(nullptr, aDataSet);
+SfxSingleTabDialogController aDlg(GetDialogFrameWeld(), &aDataSet);
+TabPageParent pPageParent(aDlg.get_content_area(), &aDlg);
 bool bRightPage = m_xCntSharedBox->get_active() || (SvxPageUsage::Left 
!= nPageUsage);
 
 if ( nId == SID_ATTR_PAGE_HEADERSET )
 {
 aText = ScResId( STR_PAGEHEADER );
 if ( bRightPage )
-pDlg->SetTabPage( ScRightHeaderEditPage::Create( 
pDlg->get_content_area(), &aDataSet ) );
+aDlg.SetTabPage(ScRightHeaderEditPage::Create(pPageParent, 
&aDataSet));
 else
-pDlg->SetTabPage( ScLeftHeaderEditPage::Create( 
pDlg->get_content_area(), &aDataSet ) );
+aDlg.SetTabPage(ScLeftHeaderEditPage::Create(pPageParent, 
&aDataSet));
 }
 else
 {
 aText = ScResId( STR_PAGEFOOTER );
 if ( bRightPage )
-pDlg->SetTabPage( ScRightFooterEditPage::Create( 
pDlg->get_content_area(), &aDataSet ) );
+aDlg.SetTabPage(ScRightFooterEditPage::Create(pPageParent, 
&aDataSet));
 else
-pDlg->SetTabPage( ScLeftFooterEditPage::Create( 
pDlg->get_content_area(), &aDataSet ) );
+aDlg.SetTabPage(ScLeftFooterEditPage::Create(pPageParent, 
&aDataSet));
 }
 
 SvxNumType eNumType = aDataSet.Get(ATTR_PAGE).GetNumType();
-static_cast(pDlg->GetTabPage())->SetNumType(eNumType);
+static_cast(aDlg.GetTabPage())->SetNumType(eNumType);
 
 aText += " (" + ScResId( STR_PAGESTYLE );
 aText += ": " + aStrPageStyle + ")";
 
-pDlg->SetText( aText );
+aDlg.set_title(aText);
 
-if ( pDlg->Execute() == RET_OK )
+if (aDlg.run() == RET_OK)
 {
-aDataSet.Put( *pDlg->GetOutputItemSet() );
+aDataSet.Put(*aDlg.GetOutputItemSet());
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source include/vcl sc/source sc/uiconfig solenv/bin svx/source

[Caolán McNamara (via logerrit)]

 extras/source/glade/libreoffice-catalog.xml.in |4 
 include/vcl/customweld.hxx |3 
 sc/source/ui/inc/AccessibleContextBase.hxx |   11 
 sc/source/ui/inc/scuitphfedit.hxx  |   77 ++-
 sc/source/ui/inc/tphfedit.hxx  |   42 +-
 sc/source/ui/pagedlg/scuitphfedit.cxx  |  513 +++--
 sc/source/ui/pagedlg/tphfedit.cxx  |  129 +++---
 sc/uiconfig/scalc/ui/headerfootercontent.ui|  112 +++--
 solenv/bin/native-code.py  |1 
 svx/source/dialog/ClassificationEditView.cxx   |2 
 10 files changed, 481 insertions(+), 413 deletions(-)

New commits:
commit 2fb6e8365c6792422c10c56e2c976b781c194b77
Author: Caolán McNamara 
AuthorDate: Sun Apr 7 21:45:01 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 22:21:57 2019 +0200

weld ScHFEditPage

Change-Id: Icf40e51ed40659cc79b61798de47132162e86541
Reviewed-on: https://gerrit.libreoffice.org/70414
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index afd5a35b392d..0c2957caa44b 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -328,10 +328,6 @@
 generic-name="Cursor Reference Edit" 
parent="foruilo-RefEdit"
 icon-name="widget-gtk-textentry"/>
 
-
-
 
diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx
index e8bbb2129912..a003d6b4bace 100644
--- a/include/vcl/customweld.hxx
+++ b/include/vcl/customweld.hxx
@@ -38,6 +38,7 @@ public:
 virtual tools::Rectangle GetFocusRect() { return tools::Rectangle(); }
 virtual FactoryFunction GetUITestFactory() const { return nullptr; }
 virtual OUString RequestHelp(tools::Rectangle&) { return OUString(); }
+virtual OUString GetHelpText() const { return 
m_pDrawingArea->get_tooltip_text(); }
 Size const& GetOutputSizePixel() const { return m_aSize; }
 void SetOutputSizePixel(const Size& rSize) { m_aSize = rSize; }
 virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) { 
m_pDrawingArea = pDrawingArea; }
@@ -124,6 +125,8 @@ public:
 void set_sensitive(bool bSensitive) { 
m_xDrawingArea->set_sensitive(bSensitive); }
 bool get_sensitive() const { return m_xDrawingArea->get_sensitive(); }
 bool get_visible() const { return m_xDrawingArea->get_visible(); }
+void set_grid_left_attach(int nAttach) { 
m_xDrawingArea->set_grid_left_attach(nAttach); }
+int get_grid_left_attach() const { return 
m_xDrawingArea->get_grid_left_attach(); }
 };
 }
 #endif
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx 
b/sc/source/ui/inc/AccessibleContextBase.hxx
index d8e7353f123b..8451169a8f70 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -241,6 +241,12 @@ public:
 void
 CommitChange(const css::accessibility::AccessibleEventObject& rEvent) 
const;
 
+/// Use this method to set initial Name without notification
+void SetName(const OUString& rName) { msName = rName; }
+
+/// Use this method to set initial Description without notification
+void SetDescription(const OUString& rDesc) { msDescription = rDesc; }
+
 protected:
 /// Calls all FocusListener to tell they that the focus is gained.
 void CommitFocusGained() const;
@@ -253,11 +259,6 @@ protected:
 /// @throws css::lang::DisposedException
 void IsObjectValid() const;
 
-/// Use this method to set initial Name without notification
-void SetName(const OUString& rName) { msName = rName; }
-/// Use this method to set initial Description without notification
-void SetDescription(const OUString& rDesc) { msDescription = rDesc; }
-
 /// Reference to the parent object.
 css::uno::Reference mxParent;
 
diff --git a/sc/source/ui/inc/scuitphfedit.hxx 
b/sc/source/ui/inc/scuitphfedit.hxx
index 541ff19b76ee..d377a12d0cba 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_SC_SOURCE_UI_INC_SCUITPHFEDIT_HXX
 
 #include "tphfedit.hxx"
-#include 
-#include 
+#include 
+#include 
 
 enum ScHFEntryId
 {
@@ -54,40 +54,48 @@ public:
 voidClearTextAreas();
 
 protected:
-ScHFEditPage( vcl::Window*   pParent,
+ScHFEditPage( TabPageParent pParent,
   const SfxItemSet& rCoreSet,
   sal_uInt16nWhich,
   bool  bHeader );
 virtual ~ScHFEditPage() override;
-virtual void dispose() override;
 
 private:
-VclPtrm_pWndLeft;
-VclPtrm_pWndCenter;
-VclPtrm_pWndRight;
-VclPtr   m_pFtDefinedHF;
-VclPtr m_pLbDefined;
-VclPtr   m_pFtCusto

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

[Caolán McNamara (via logerrit)]

 sc/qa/unit/data/wks/fail/ofz14129-1.wks |binary
 sc/source/filter/lotus/tool.cxx |7 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6e7bfc896e6cb4d91dcecf974f0d9ee41f35b86a
Author: Caolán McNamara 
AuthorDate: Mon Apr 8 15:21:09 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 22:12:27 2019 +0200

ofz#14129 assert on empty string

Change-Id: I9ef3ef2b3b853df43b2f84bfd7e5da824682
Reviewed-on: https://gerrit.libreoffice.org/70419
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/qa/unit/data/wks/fail/ofz14129-1.wks 
b/sc/qa/unit/data/wks/fail/ofz14129-1.wks
new file mode 100644
index ..016d87e63a86
Binary files /dev/null and b/sc/qa/unit/data/wks/fail/ofz14129-1.wks differ
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index dabbd05dcd03..2c0a0f7465e9 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -480,9 +480,10 @@ bool RangeNameBufferWK3::FindRel( const OUString& rRef, 
sal_uInt16& rIndex )
 
 bool RangeNameBufferWK3::FindAbs( const OUString& rRef, sal_uInt16& rIndex )
 {
-OUStringaTmp( rRef );
-aTmp = aTmp.copy(1);
-StringHashEntry aRef( aTmp ); // search w/o '$'!
+if (rRef.isEmpty())
+return false;
+OUString aTmp(rRef.copy(1));
+StringHashEntry aRef(aTmp); // search w/o '$'!
 
 std::vector::iterator itr = std::find_if(maEntries.begin(), 
maEntries.end(),
 [&aRef](const Entry& rEntry) { return aRef == rEntry.aStrHashEntry; });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/dinfdlg.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 386b9a1bebb56367977ebc276d85f5f10d252be6
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 13:09:17 2019 +0100
Commit: Xisco Faulí 
CommitDate: Mon Apr 8 20:28:44 2019 +0200

Resolves: tdf#122780 limit massive template names in ui to a sane length

Reviewed-on: https://gerrit.libreoffice.org/70255
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 9db7130e05b79fdcb9a60a3f1f4801e5401427de)

Change-Id: I053b30b00dbda67819af68020e2f6fa4a5b5134e
Reviewed-on: https://gerrit.libreoffice.org/70259
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 296fda7cc639..128f7f8c3192 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -969,8 +969,14 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
 const SfxDocumentInfoItem& rInfoItem = rSet->Get(SID_DOCINFO);
 
 // template data
-if ( rInfoItem.HasTemplate() )
-m_pTemplValFt->SetText( rInfoItem.getTemplateName() );
+if (rInfoItem.HasTemplate())
+{
+const OUString& rName = rInfoItem.getTemplateName();
+if (rName.getLength() > SAL_MAX_INT16) // tdf#122780 pick some 
~arbitrary max size
+m_pTemplValFt->SetText(rName.copy(0, SAL_MAX_INT16));
+else
+m_pTemplValFt->SetText(rName);
+}
 else
 {
 m_pTemplFt->Hide();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Google Summer of Code Questions

[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

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - external/openssl

[Michael Stahl (via logerrit)]

 external/openssl/UnpackedTarball_openssl.mk |1 
 external/openssl/opensslmingw.patch |  123 
 2 files changed, 124 deletions(-)

New commits:
commit 9ae9d12035db8accfdca8d329401e8534fec0972
Author: Michael Stahl 
AuthorDate: Mon Apr 8 19:25:27 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon Apr 8 19:26:23 2019 +0200

openssl: remove MinGW patch

This breaks the OPENSSL_IMPLEMENT_GLOBAL macro quite badly, which is
also used on MSVC builds, and MSVC warns about the breakage.

Change-Id: I8f4c7c8097e7d737ca32d6a020a569c0a99b92d4

diff --git a/external/openssl/UnpackedTarball_openssl.mk 
b/external/openssl/UnpackedTarball_openssl.mk
index 9fc5f72656e3..5845e31a436a 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -13,7 +13,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl
 
 $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
external/openssl/openssllnx.patch \
-   external/openssl/opensslmingw.patch \
external/openssl/opensslwnt.patch \
external/openssl/openssl-1.0.1h-win64.patch.1 \
external/openssl/opensslsol.patch \
diff --git a/external/openssl/opensslmingw.patch 
b/external/openssl/opensslmingw.patch
deleted file mode 100644
index 2a8729cbc26e..
--- a/external/openssl/opensslmingw.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -ru openssl.orig/Makefile.shared openssl/Makefile.shared
 a/openssl.orig/Makefile.shared 2016-03-03 21:16:48.751822016 +0100
-+++ b/openssl/Makefile.shared  2016-03-03 21:27:12.615802449 +0100
-@@ -278,7 +278,7 @@
- link_a.cygwin:
-   @ $(CALC_VERSIONS); \
-   INHIBIT_SYMLINKS=yes; \
--  SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); SHLIB_SUFFIX=.dll; \
-+  SHLIB=cyg$(LIBNAME); SHLIB_SOVER=; SHLIB_SUFFIX=.dll; \
-   dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \
-   base=-Wl,--enable-auto-image-base; \
-   if expr $(PLATFORM) : 'mingw' > /dev/null; then \
-@@ -289,7 +289,11 @@
-   SHLIB_SOVER=32; \
-   extras="$(LIBNAME).def"; \
-   $(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \
--  base=; [ $(LIBNAME) = "crypto" -a -n "$(FIPSCANLIB)" ] && 
base=-Wl,--image-base,0x6300; \
-+base=;  \
-+ if test $(LIBNAME) = "crypto"; then \
-+ SHLIB=libeay32; \
-+ base=-Wl,--image-base,0x6300; \
-+ fi; \
-   fi; \
-   dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
-   $(PERL) util/mkrc.pl $$dll_name | \
-@@ -297,7 +301,7 @@
-   extras="$$extras rc.o"; \
-   ALLSYMSFLAGS='-Wl,--whole-archive'; \
-   NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
--  SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic 
-Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \
-+  SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base 
-Wl,-s,-Bsymbolic -Wl,--export-all-symbols -Wl,--out-implib,lib$(LIBNAME).dll.a 
$$extras"; \
-   [ -f apps/$$dll_name ] && rm apps/$$dll_name; \
-   [ -f test/$$dll_name ] && rm test/$$dll_name; \
-   $(LINK_SO_A) || exit 1; \
-diff -ru openssl.orig/e_os2.h openssl/e_os2.h
 a/openssl.orig/e_os2.h 2016-03-01 14:35:53.0 +0100
-+++ b/openssl/e_os2.h  2016-03-03 21:27:33.179801804 +0100
-@@ -293,7 +293,7 @@
- # ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION
- #  define OPENSSL_IMPLEMENT_GLOBAL(type,name,value)  \
- type *_shadow_##name(void)  \
--{ static type _hide_##name=value; return &_hide_##name; }
-+{ type _hide_##name=value; return &_hide_##name; }
- #  define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
- #  define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
- # else
-diff -ru openssl.orig/ms/mingw32.bat openssl/ms/mingw32.bat
 a/openssl.orig/ms/mingw32.bat  2016-03-01 14:35:05.0 +0100
-+++ b/openssl/ms/mingw32.bat   2016-03-03 21:27:56.487801073 +0100
-@@ -75,15 +75,41 @@
- rem copy ms\tlhelp32.h outinc
- 
- echo Building the libraries
--mingw32-make -f ms/mingw32a.mak
-+make -f ms/mingw32a.mak
- if errorlevel 1 goto end
- 
- echo Generating the DLLs and input libraries
--dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def 
ms/libeay32.def out/libcrypto.a -lws2_32 -lgdi32
-+mv out/libcrypto.a out/libcrypto_static.a
-+mv out/libssl.a out/libssl_static.a
-+dlltool --dllname libeay32.dll --output-lib out/libcrypto.a --input-def 
ms/libeay32.def
- if errorlevel 1 goto end
--dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def 
ms/ssleay32.def out/libssl.a out/libeay32.a
-+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def 
-o out/libeay32.dll out/libcrypto_static.a -lws2_32 -lgdi32
- if errorlevel 1 goto end
-+dlltool --dllname ssleay32.dll --output-li

Re: questions about LibreOffice API version and jars available on https://mvnrepository.com

[sophi]

Hi Vincent,
Le 08/04/2019 à 09:31, LORENZO Vincent a écrit :
> Hello Miklos, 
>   Thank you for your answer. 
>   Yes, of course, I could compile it myself, but I would prefer avoid 
> this step  :-).
> I think I understood, but please, could you explicit what means TDF ?

TDF stands for The Document Foundation, the foundation behind LibreOffice.
Kind regards
Sophie
-- 
Sophie Gautier sophie.gaut...@documentfoundation.org
GSM: +33683901545
IRC: sophi
Release coordinator
The Document Foundation
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Google Summer of Code Questions

[Zhiye Hong]

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! 

Regards,

Roger Hong

smime.p7s
Description: S/MIME cryptographic signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: android/app

[Libreoffice Gerrit user]

 android/app/build.gradle   
 |7 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
   |5 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
 |  178 +
 
android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudProvider.java
 |  192 ++
 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
  |3 
 android/app/src/main/res/values/strings.xml
 |4 
 6 files changed, 384 insertions(+), 5 deletions(-)

New commits:
commit 8ff2ac2142498a600506927154fb6b513e55e3a7
Author: kaishu-sahu 
AuthorDate: Tue Apr 2 00:51:06 2019 +0530
Commit: Jan Holesovsky 
CommitDate: Mon Apr 8 18:45:30 2019 +0200

android: add ownCloud support from old app.

Change-Id: I11f38bc7b35d2c7d9cc8a718232eac2efe13388f
Reviewed-on: https://gerrit.libreoffice.org/70084
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/android/app/build.gradle b/android/app/build.gradle
index fca7f39fe..522ff61b9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -50,12 +50,19 @@ android {
 }
 }
 
+repositories {
+flatDir {
+dirs 
"${liboWorkdir}/UnpackedTarball/owncloud_android_lib/build/outputs/aar"
+}
+}
+
 dependencies {
 implementation fileTree(dir: 'libs', include: ['*.jar'])
 implementation 'androidx.appcompat:appcompat:1.0.2'
 implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 implementation 'androidx.recyclerview:recyclerview:1.0.0'
 implementation 'com.google.android.material:material:1.1.0-alpha04'
+implementation(name:'owncloud_android_lib', ext:'aar')
 }
 
 task copyUnpackAssets(type: Copy) {
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
index 2fc3e031a..eb4a0ac91 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
@@ -16,12 +16,11 @@ import 
org.libreoffice.androidapp.storage.external.ExtsdDocumentsProvider;
 import org.libreoffice.androidapp.storage.external.OTGDocumentsProvider;
 import 
org.libreoffice.androidapp.storage.local.LocalDocumentsDirectoryProvider;
 import org.libreoffice.androidapp.storage.local.LocalDocumentsProvider;
+import org.libreoffice.androidapp.storage.owncloud.OwnCloudProvider;
 
 import java.util.HashSet;
 import java.util.Set;
 
-//import org.libreoffice.androidapp.storage.owncloud.OwnCloudProvider;
-
 /**
  * Keeps the instances of the available IDocumentProviders in the system.
  * Instances are maintained in a sorted list and providers have to be
@@ -64,7 +63,7 @@ public final class DocumentProviderFactory {
 instance.providers[0] = new LocalDocumentsDirectoryProvider(0);
 instance.providers[1] = new LocalDocumentsProvider(1);
 instance.providers[OTG_PROVIDER_INDEX] = new 
OTGDocumentsProvider(OTG_PROVIDER_INDEX, context);
-//instance.providers[4] = new OwnCloudProvider(4, context);
+instance.providers[4] = new OwnCloudProvider(4, context);
 
 instance.providers[EXTSD_PROVIDER_INDEX] = new 
ExtsdDocumentsProvider(EXTSD_PROVIDER_INDEX, context);
 
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
new file mode 100644
index 0..21d800234
--- /dev/null
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
@@ -0,0 +1,178 @@
+package org.libreoffice.androidapp.storage.owncloud;
+
+import android.content.Context;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.libreoffice.androidapp.storage.IFile;
+
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import 
com.owncloud.android.lib.resources.files.ChunkedUploadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
+import com.owncloud.android.lib.resources.files.RemoteFile;
+import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
+
+/**
+ * Implementation of IFile for ownCloud servers.
+ */
+public class OwnCloudFile implements IFile {
+
+private OwnCloudProvider provider;
+private RemoteFile file;
+
+private String name;
+private String parentPa

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/colibre icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg officecfg/registry sc/uiconfig

[andreas kainz (via logerrit)]

 icon-themes/breeze/links.txt  |   13 
 icon-themes/breeze/mapping|4 
 icon-themes/colibre/links.txt |   12 
 icon-themes/sifr/cmd/lc_accent1cellstyles.png |binary
 icon-themes/sifr/cmd/lc_accent2cellstyles.png |binary
 icon-themes/sifr/cmd/lc_accent3cellstyles.png |binary
 icon-themes/sifr/cmd/sc_accent1cellstyles.png |binary
 icon-themes/sifr/cmd/sc_accent2cellstyles.png |binary
 icon-themes/sifr/cmd/sc_accent3cellstyles.png |binary
 icon-themes/sifr/cmd/sc_errorcellstyle.png|binary
 icon-themes/sifr/cmd/sc_warningcellstyle.png  |binary
 icon-themes/sifr/links.txt|   13 
 icon-themes/sifr_dark/cmd/lc_accent1cellstyles.png|binary
 icon-themes/sifr_dark/cmd/lc_accent2cellstyles.png|binary
 icon-themes/sifr_dark/cmd/lc_accent3cellstyles.png|binary
 icon-themes/sifr_dark/cmd/sc_accent1cellstyles.png|binary
 icon-themes/sifr_dark/cmd/sc_accent2cellstyles.png|binary
 icon-themes/sifr_dark/cmd/sc_accent3cellstyles.png|binary
 icon-themes/sifr_dark/cmd/sc_errorcellstyle.png   |binary
 icon-themes/sifr_dark/cmd/sc_warningcellstyle.png |binary
 icon-themes/sifr_svg/cmd/lc_accent1cellstyles.svg |6 
 icon-themes/sifr_svg/cmd/lc_accent2cellstyles.svg |6 
 icon-themes/sifr_svg/cmd/lc_accent3cellstyles.svg |   12 
 icon-themes/sifr_svg/cmd/sc_accent1cellstyles.svg |6 
 icon-themes/sifr_svg/cmd/sc_accent2cellstyles.svg |6 
 icon-themes/sifr_svg/cmd/sc_accent3cellstyles.svg |   12 
 icon-themes/sifr_svg/cmd/sc_errorcellstyle.svg|6 
 icon-themes/sifr_svg/cmd/sc_warningcellstyle.svg  |6 
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |  168 
++
 sc/uiconfig/scalc/menubar/menubar.xml |   24 -
 sc/uiconfig/scalc/popupmenu/cell.xml  |   22 -
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui|   39 --
 32 files changed, 304 insertions(+), 51 deletions(-)

New commits:
commit 08557a159bde7dab626f36488c88af94d7da0deb
Author: andreas kainz 
AuthorDate: Mon Apr 8 06:18:58 2019 +0200
Commit: andreas_kainz 
CommitDate: Mon Apr 8 18:37:54 2019 +0200

tdf#124200 calc add icons for CellStyles

Change-Id: I6037c61e8bf4e58e37bd8f77b8ef284dedfc5b29
Reviewed-on: https://gerrit.libreoffice.org/70412
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 6e5ae3fb5966..f5c6fa6716bf 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1806,3 +1806,16 @@ cmd/lc_macrodialog.png cmd/lc_scriptorganizer.png
 
 cmd/lc_donation.png cmd/lc_currencyfield.png
 cmd/sc_donation.png cmd/sc_currencyfield.png
+
+# Calc Style
+cmd/lc_defaultcellstyles.png cmd/lc_defaultcharstyle.png
+cmd/sc_defaultcellstyles.png cmd/sc_defaultcharstyle.png
+cmd/lc_heading1cellstyles.png cmd/lc_heading1parastyle.png
+cmd/sc_heading1cellstyles.png cmd/sc_heading1parastyle.png
+cmd/lc_heading2cellstyles.png cmd/lc_heading2parastyle.png
+cmd/sc_heading2cellstyles.png cmd/sc_heading2parastyle.png
+cmd/lc_footnotecellstyles.png cmd/lc_insertfootnote.png
+cmd/sc_footnotecellstyles.png cmd/sc_insertfootnote.png
+cmd/lc_notecellstyles.png cmd/lc_showannotations.png
+cmd/sc_notecellstyles.png cmd/sc_showannotations.png
+
diff --git a/icon-themes/breeze/mapping b/icon-themes/breeze/mapping
deleted file mode 100644
index 7f3184518744..
--- a/icon-themes/breeze/mapping
+++ /dev/null
@@ -1,4 +0,0 @@
-actions/toolbar/document-save.svg cmd/lc_save.png 26
-actions/toolbar/document-save.svg cmd/sc_save.png 16
-actions/toolbar/document-save-as.svg cmd/lc_saveas.png 26
-actions/toolbar/document-save-as.svg cmd/sc_saveas.png 16
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index ccacbf53bba8..c836629cf5da 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1828,3 +1828,15 @@ cmd/sc_basicideappear.png cmd/sc_toolsmacroedit.png
 
 cmd/lc_donation.png cmd/lc_currencyfield.png
 cmd/sc_donation.png cmd/sc_currencyfield.png
+
+# Calc Style
+cmd/lc_defaultcellstyles.png cmd/lc_defaultcharstyle.png
+cmd/sc_defaultcellstyles.png cmd/sc_defaultcharstyle.png
+cmd/lc_heading1cellstyles.png cmd/lc_heading1parastyle.png
+cmd/sc_heading1cellstyles.png cmd/sc_heading1parastyle.png
+cmd/lc_heading2cellstyles.png cmd/lc_heading2parastyle.png
+cmd/sc_heading2cellstyles.png cmd/sc_heading2parastyle.png
+cmd/lc_footnotecellst

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

[Dennis Francis (via logerrit)]

 sc/inc/dpsave.hxx |2 
 sc/qa/unit/data/ods/tdf123421_1datafield.ods  |binary
 sc/qa/unit/data/ods/tdf123421_2datafields.ods |binary
 sc/qa/unit/pivottable_filters_test.cxx|   56 ++
 sc/source/filter/excel/xepivotxml.cxx |   11 +++--
 5 files changed, 65 insertions(+), 4 deletions(-)

New commits:
commit 97af58093978d8e6b9d90eedcc59141304e7200e
Author: Dennis Francis 
AuthorDate: Fri Apr 5 22:04:13 2019 +0530
Commit: Andras Timar 
CommitDate: Mon Apr 8 17:55:31 2019 +0200

tdf#123421 : xlsx export : Don't write data field entry...

under colFields tag if there is only one data-field.


  <--- -2 indicates data field.


Excel 2013/2016 seems to crash at the presence of ''
in colFields when there is only one data-field.

Additionally, call 
GetOutputRangeByType(sheet::DataPilotOutputRangeType::TABLE)
on all ScDPObject's in non-const mode, so that the internal
pOuput member of ScDPObject is populated. Otherwise the
const GetOutputRangeByType(sheet::DataPilotOutputRangeType::TABLE)
call always return an invalid range.

This also adds 2 unit tests :-
1. To check the presence of  in colFields tag
   if there are more than one data-fields.
2. To ensure the absence of  in colFields tag
   if there is only one data-field.

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

diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 7558a6b2588d..49cb240ffd24 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -315,7 +315,7 @@ public:
 
 ScDPSaveDimension* 
GetInnermostDimension(css::sheet::DataPilotFieldOrientation nOrientation);
 ScDPSaveDimension* GetFirstDimension(css::sheet::DataPilotFieldOrientation 
eOrientation);
-long GetDataDimensionCount() const;
+SC_DLLPUBLIC long GetDataDimensionCount() const;
 
 void SetPosition( ScDPSaveDimension* pDim, long nNew );
 SC_DLLPUBLIC void SetColumnGrand( bool bSet );
diff --git a/sc/qa/unit/data/ods/tdf123421_1datafield.ods 
b/sc/qa/unit/data/ods/tdf123421_1datafield.ods
new file mode 100644
index ..985d6c0c44b6
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf123421_1datafield.ods differ
diff --git a/sc/qa/unit/data/ods/tdf123421_2datafields.ods 
b/sc/qa/unit/data/ods/tdf123421_2datafields.ods
new file mode 100644
index ..c5d8a09647b0
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf123421_2datafields.ods 
differ
diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index 014c1fdab035..739af618ec7d 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -58,6 +58,8 @@ public:
 
 // Export
 void testPivotTableExportXLSX();
+void testPivotTableExportXLSXSingleDataField();
+void testPivotTableExportXLSXMultipleDataFields();
 void testPivotCacheExportXLSX();
 void testPivotTableXLSX();
 void testPivotTableTwoDataFieldsXLSX();
@@ -98,6 +100,8 @@ public:
 CPPUNIT_TEST(testTdf112501);
 
 CPPUNIT_TEST(testPivotTableExportXLSX);
+CPPUNIT_TEST(testPivotTableExportXLSXSingleDataField);
+CPPUNIT_TEST(testPivotTableExportXLSXMultipleDataFields);
 CPPUNIT_TEST(testPivotCacheExportXLSX);
 CPPUNIT_TEST(testPivotTableXLSX);
 CPPUNIT_TEST(testPivotTableTwoDataFieldsXLSX);
@@ -758,6 +762,58 @@ void ScPivotTableFiltersTest::testPivotTableExportXLSX()
 xShell->DoClose();
 }
 
+void ScPivotTableFiltersTest::testPivotTableExportXLSXSingleDataField()
+{
+ScDocShellRef xShell = loadDoc("tdf123421_1datafield.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+xmlDocPtr pTable
+= XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/pivotTables/pivotTable1.xml");
+CPPUNIT_ASSERT(pTable);
+
+assertXPath(pTable, "/x:pivotTableDefinition/x:location", "ref", "A3:B6");
+assertXPath(pTable, "/x:pivotTableDefinition/x:location", 
"firstHeaderRow", "1");
+assertXPath(pTable, "/x:pivotTableDefinition/x:location", "firstDataRow", 
"1");
+assertXPath(pTable, "/x:pivotTableDefinition/x:location", "firstDataCol", 
"1");
+assertXPath(pTable, "/x:pivotTableDefinition/x:dataFields", "count", "1");
+
+// There should not be any colFields tag, before the fix there used to be 
a singleton with
+//  as child node.
+assertXPath(pTable, "/x:pivotTableDefinition/x:colFields", 0);
+
+xShell->DoClose();
+}
+
+void ScPivotTableFiltersTest::testPivotTableExportXLSXMultipleDataFields()
+{
+ScDocShellRef xShell = loadDoc("tdf123421_2datafields.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XL

Re: Tagging text as being in arbitrary complex-script languages

[Stephan Bergmann]

On 08/04/2019 16:17, Eike Rathke wrote:

My guess (didn't try) would be in dictionaries.xcu

  
 
 ...
 
 
 
 
 Language UI name
 
 
 3
 

 
  


ExtraLanguages is a set whose elements presumably must be named with the 
BCP47 tags (and the "Name" prop is localizable even), so something like


[...]

 
   
 
   Default US English UI name
   Your favorite translation here...
 
 
   3
 
   
 

[...]

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

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

[Caolán McNamara (via logerrit)]

 vcl/source/control/combobox.cxx |4 +++-
 vcl/source/control/listbox.cxx  |4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit ea3a1b075154a665d30aaac6513812ceb839f64b
Author: Caolán McNamara 
AuthorDate: Mon Apr 8 14:25:53 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 16:54:04 2019 +0200

IsInPopupMode returns true when !mbInPopupMode

it returns mbPopupMode which is set to false on the next event cycle after 
the
one where mbIsInPopupMode is set to false

Change-Id: I66b0812cb9b9fc5cfe00c88f145f704bd1ecce2f
Reviewed-on: https://gerrit.libreoffice.org/70413
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index a13ee2e4b2b7..0b5ad0ad624a 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -983,7 +983,9 @@ bool ComboBox::IsTravelSelect() const
 
 bool ComboBox::IsInDropDown() const
 {
-return m_pImpl->m_pFloatWin && m_pImpl->m_pFloatWin->IsInPopupMode();
+// when the dropdown is dismissed, first mbInPopupMode is set to false, 
and on the next event iteration then
+// mbPopupMode is set to false
+return m_pImpl->m_pFloatWin && m_pImpl->m_pFloatWin->IsInPopupMode() && 
m_pImpl->m_pFloatWin->ImplIsInPrivatePopupMode();
 }
 
 void ComboBox::EnableMultiSelection( bool bMulti )
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index b5e924a52b5f..050faa2d13d8 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -1120,7 +1120,9 @@ bool ListBox::IsTravelSelect() const
 
 bool ListBox::IsInDropDown() const
 {
-return mpFloatWin && mpFloatWin->IsInPopupMode();
+// when the dropdown is dismissed, first mbInPopupMode is set to false, 
and on the next event iteration then
+// mbPopupMode is set to false
+return mpFloatWin && mpFloatWin->IsInPopupMode() && 
mpFloatWin->ImplIsInPrivatePopupMode();
 }
 
 tools::Rectangle ListBox::GetBoundingRectangle( sal_Int32 nItem ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sd/source

[Miklos Vajna (via logerrit)]

 sd/source/ui/slideshow/slideshowimpl.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 62b309e5cf24570a242dbf41c53ece60b23292eb
Author: Miklos Vajna 
AuthorDate: Fri Apr 5 10:44:16 2019 +0200
Commit: Luboš Luňák 
CommitDate: Mon Apr 8 16:19:57 2019 +0200

tdf#112318 sd opengl: fix lack of initial animation

Commit 881043d1f01fad663c0a17f11cbe2dab79e31217 (#i98792# Allow frequent
calls to slide show update()., 2009-04-27) added a comment in
sd::SlideshowImpl::updateSlideShow() talking about an "above" case, when
the slideshow update suggests to not wait till the next update,
but later commit 12dcf5e6e770b1933252a1f919663ba45ded4cdf (slideshow:
cleanup main-loop usage, post-yield listeners, etc., 2015-11-13) removed
that handling.

That was fine till opengl rendering was introduced, which swaps its
backbuffer in an idle handler. Given that OpenGLFlushIdle's priority is
TaskPriority::POST_PAINT and SlideshowImpl::maUpdateTimer's priority is
TaskPriority::REPAINT, the GL backbuffer is not always painted while an
animation is ongoing.

This is more visible when tweaking the bugdoc to have an e.g. 5 sec
animation, then starting the slideshow results in waiting for 5 seconds
and only then the slide shows up, without an animation.

Fix the problem by re-introducing the handling of the fUpdate == 0, and
processing idle events there, which means the GL backbuffer will be
always painted, regardless if fUpdate is a small number or 0.

(cherry picked from commit 3e0092031b73bad107e3122d5d4be2f5bd487744)

Change-Id: I25b2dc0aa41af62d9bd89617178eb2e9997f5b17
Reviewed-on: https://gerrit.libreoffice.org/70295
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index b58f4b486247..f8b049c28b35 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -64,6 +64,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1670,7 +1671,12 @@ void SlideshowImpl::updateSlideShow()
 
 if (mxShow.is() && (fUpdate >= 0.0))
 {
-if (!::basegfx::fTools::equalZero(fUpdate))
+if (::basegfx::fTools::equalZero(fUpdate))
+{
+// Make sure idle tasks don't starve when we don't have to 
wait.
+Scheduler::ProcessEventsToIdle();
+}
+else
 {
 // Avoid busy loop when the previous call to update()
 // returns a small positive number but not 0 (which is
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sc/inc/global.hxx  |2 ++
 sc/source/core/data/global.cxx |5 -
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5bff92cfcb9cf97c742cc9fb4d85b79b082b941e
Author: Miklos Vajna 
AuthorDate: Mon Apr 8 10:50:00 2019 +0200
Commit: Luboš Luňák 
CommitDate: Mon Apr 8 16:18:29 2019 +0200

tdf#124327 sc opengl: fix lack of AA text in charts

Commit 708d1c5ab242b545ced598879233fc662d7e6cc0 (sc lok: emit
RowColumnHeader info in twips, 2015-11-02) and later commits improved
precision of the Pixel Per Twips (PPT) factor in Calc, but this caused
offset problems in PDF export. So the LOK case uses double precision and
otherwise we use limited precision since commit
616fd241838069e18c59064e33c4b24f5ae112c6 (tdf#115262 sc: fix cumulative
placement error of images, 2018-10-01).

It turns out this double precision was also useful in the opengl case:
if UI scaling is set to 125% on Windows, then this helps producing AA
text for charts. Given that unlimited precision is the direction we want
to go, enable double precision for the GL case as well, not just for
LOK.

Verified that tdf#115262 is not re-introduced in the GL case, also that
manual PDF export (with GL enabled) does not produce the mentioned
unexpected image position offsets.

(cherry picked from commit 7069ec6de9807d12ff9ad52ecbb66ea7dc373723)

Change-Id: I23a8d6dce1b48c178977bda9909feb59fe8f3ad8
Reviewed-on: https://gerrit.libreoffice.org/70410
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 176cfe124518..eb737f954790 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -573,7 +573,9 @@ public:
 SC_DLLPUBLIC static sal_uInt32 GetStandardFormat( SvNumberFormatter&, 
sal_uInt32 nFormat, SvNumFormatType nType );
 
 SC_DLLPUBLIC static sal_uInt16 GetStandardRowHeight();
+/// Horizontal pixel per twips factor.
 SC_DLLPUBLIC static double  nScreenPPTX;
+/// Vertical pixel per twips factor.
 SC_DLLPUBLIC static double  nScreenPPTY;
 
 static tools::SvRef   xDrawClipDocShellRef;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 2138f3e776b8..0999082d9589 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -47,6 +47,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -475,8 +476,10 @@ void ScGlobal::InitPPT()
 {
 OutputDevice* pDev = Application::GetDefaultDevice();
 
-if (comphelper::LibreOfficeKit::isActive())
+if (comphelper::LibreOfficeKit::isActive() || 
OpenGLWrapper::isVCLOpenGLEnabled())
 {
+// LOK: the below limited precision is not enough for RowColumnHeader.
+// OpenGL: limited precision breaks AA of text in charts.
 nScreenPPTX = double(pDev->GetDPIX()) / double(TWIPS_PER_INCH);
 nScreenPPTY = double(pDev->GetDPIY()) / double(TWIPS_PER_INCH);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tagging text as being in arbitrary complex-script languages

[Eike Rathke]

Hi Richard,

On Saturday, 2019-04-06 23:50:21 +0100, Richard Wordingham wrote:

> Is some additional information required in the .oxt file for the
> dictionary if the script is not "Western text"?

There are some means where a dictionary can specify the internally
associated script type, however, I forgot how's that supposed to work
(i.e. how exactly the ExtraLanguage Name and ScriptType properties are
to be specified in a dictionary) and the sample mentioned in the bug
doesn't download for me.. Please see
https://bugs.documentfoundation.org/show_bug.cgi?id=103855

My guess (didn't try) would be in dictionaries.xcu

 

...




Language UI name


3



 

ScriptType value 3 here means CTL. The values are explained in
officecfg/registry/schema/org/openoffice/VCL.xcs under


  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Stahl (via logerrit)]

 sw/inc/crsrsh.hxx|3 
 sw/source/core/crsr/crstrvl.cxx  |   18 -
 sw/source/core/doc/DocumentFieldsManager.cxx |   25 +
 sw/source/core/doc/docfld.cxx|  379 +--
 sw/source/core/edit/edfld.cxx|6 
 sw/source/core/fields/expfld.cxx |   16 +
 sw/source/core/inc/unofield.hxx  |2 
 sw/source/core/txtnode/atrfld.cxx|   37 ++
 sw/source/core/unocore/unofield.cxx  |   62 
 sw/source/ui/fldui/fldedt.cxx|   13 
 sw/source/uibase/docvw/edtwin.cxx|1 
 sw/source/uibase/shells/textfld.cxx  |5 
 12 files changed, 369 insertions(+), 198 deletions(-)

New commits:
commit 742baabbe4d077e1ba913a7989300908f4637ac7
Author: Michael Stahl 
AuthorDate: Tue Mar 19 12:29:09 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Apr 8 16:08:11 2019 +0200

tdf#123968 sw: use inline editing for input fields for variables

* set these to RES_TXTATR_INPUTFIELD so they get a SwTextInputField
* only for string fields, the numeric ones break when editing
* SwCursorShell::CursorInsideInputField() must check type of the hint,
  not type of the field
* DocumentFieldsManager::UpdateExpFieldsImpl() is called with one field
  when it is inserted, and must expand the field into the SwTextNode then,
  and it's called when the user edits inside the field, and must *not*
  expand the field into the SwTextNode then
* SwDocUpdateField::MakeFieldList_() must iterate RES_TXTATR_INPUTFIELD
* SwEditWin::MouseButtonDown() must still pop up the edit dialog on
  double-click
* SetFieldsDirty() should check RES_TXTATR_INPUTFIELD because SwGetExp
  may depend on them
* a very odd API design: SwSetExpField::PutValue() allows to change the
  "InputFlag", which is actually used by the ODF import!
  This needs some alchemy to convert between SwTextField and
  SwTextInputField hints, see SwXTextField::TransmuteLeadToInputField().
* etc.

Change-Id: I45c471703f102ebcb04b8567f9d76c17d5a063e7
Co-authored-by: Samuel Mehrbrodt 
Reviewed-on: https://gerrit.libreoffice.org/69414
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index cfe9ef023cd0..fb105b00e524 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -701,6 +701,9 @@ public:
 static SwTextField* GetTextFieldAtPos(
 const SwPosition* pPos,
 const bool bIncludeInputFieldAtStart );
+static SwTextField* GetTextFieldAtCursor(
+const SwPaM* pCursor,
+const bool bIncludeInputFieldAtStart );
 static SwField* GetFieldAtCursor(
 const SwPaM* pCursor,
 const bool bIncludeInputFieldAtStart );
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index bf45898fd82f..a2c13b838f4d 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -893,11 +893,11 @@ SwTextField * SwCursorShell::GetTextFieldAtPos(
 return pTextField;
 }
 
-SwField* SwCursorShell::GetFieldAtCursor(
+SwTextField* SwCursorShell::GetTextFieldAtCursor(
 const SwPaM* pCursor,
 const bool bIncludeInputFieldAtStart )
 {
-SwField* pFieldAtCursor = nullptr;
+SwTextField* pFieldAtCursor = nullptr;
 
 SwTextField* pTextField = GetTextFieldAtPos( pCursor->Start(), 
bIncludeInputFieldAtStart );
 if ( pTextField != nullptr
@@ -909,13 +909,23 @@ SwField* SwCursorShell::GetFieldAtCursor(
 : 1;
 if ( ( pCursor->End()->nContent.GetIndex() - 
pCursor->Start()->nContent.GetIndex() ) <= nTextFieldLength )
 {
-pFieldAtCursor = 
const_cast(pTextField->GetFormatField().GetField());
+pFieldAtCursor = pTextField;
 }
 }
 
 return pFieldAtCursor;
 }
 
+SwField* SwCursorShell::GetFieldAtCursor(
+const SwPaM *const pCursor,
+const bool bIncludeInputFieldAtStart)
+{
+SwTextField *const pField(GetTextFieldAtCursor(pCursor, 
bIncludeInputFieldAtStart));
+return pField
+? const_cast(pField->GetFormatField().GetField())
+: nullptr;
+}
+
 SwField* SwCursorShell::GetCurField( const bool bIncludeInputFieldAtStart ) 
const
 {
 SwPaM* pCursor = GetCursor();
@@ -941,7 +951,7 @@ bool SwCursorShell::CursorInsideInputField() const
 {
 for(SwPaM& rCursor : GetCursor()->GetRingContainer())
 {
-if(dynamic_cast(GetFieldAtCursor( &rCursor, false 
)))
+if (dynamic_cast(GetTextFieldAtCursor(&rCursor, false)))
 return true;
 }
 return false;
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx 
b/sw/source/core/doc/DocumentFieldsManager.cxx
index bbb8b0d03ba8..9f05f74f2785 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 us

[Libreoffice-commits] online.git: Makefile.am

[Libreoffice Gerrit user]

 Makefile.am |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef862cd054ad5fe85f1afd2b173629e7adffb80e
Author: Samuel Mehrbrodt 
AuthorDate: Mon Apr 8 15:49:55 2019 +0200
Commit: Michael Meeks 
CommitDate: Mon Apr 8 15:54:53 2019 +0200

Fix copy/paste error

Change-Id: I073feea761579ac9f196c430b8a6745811ee31fd
Reviewed-on: https://gerrit.libreoffice.org/70417
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/Makefile.am b/Makefile.am
index 4fd349d76..9df919489 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -314,7 +314,7 @@ run-valgrind: all @JAILS_PATH@
  --o:logging.file[@enable]=false 
--o:logging.level=trace
 
 run-gdb: all @JAILS_PATH@
-   @echo "Launching loolwsd under valgrind's callgrind"
+   @echo "Launching loolwsd under gdb"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt 
$(abs_top_srcdir)/test/data/hello-world.odt
@cp $(abs_top_srcdir)/test/data/hello.ods 
$(abs_top_srcdir)/test/data/hello-world.ods
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2export.cxx |   21 ++
 chart2/qa/extras/data/xlsx/add_series_secondary_axis.xlsx |binary
 oox/source/drawingml/chart/typegroupconverter.cxx |   19 +++-
 3 files changed, 38 insertions(+), 2 deletions(-)

New commits:
commit a3881a66b8ffda4a8a89ecfc4347555e34193665
Author: Balazs Varga 
AuthorDate: Tue Apr 2 16:10:00 2019 +0200
Commit: László Németh 
CommitDate: Mon Apr 8 15:30:03 2019 +0200

tdf#124466 XLSX: fix broken export by removing chart type data redundancy

XLSX import created a redundant series container for data series with the
same chart type, when they were attached to a different axis. Modifying
the loaded chart by the user, ie. attaching one of its data series to a
different axis resulted broken OOXML export later, because based on the
new axis, splitDataSeriesByAxis splitted the first or the redundant series
container further. Now the import creates only a single series container
for the series with the same chart type, preventing potential export 
problems.

Change-Id: If951feaca3cb3b5df7718e9d7bfd59620ef3c4d3
Reviewed-on: https://gerrit.libreoffice.org/70141
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 3d537cf2ab90..6c769f0bbe63 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -113,6 +113,7 @@ public:
 void testBarChartVaryColorsXLSX();
 void testMultipleAxisXLSX();
 void testSecondaryAxisXLSX();
+void testSetSeriesToSecondaryAxisXLSX();
 void testAxisTitleRotationXLSX();
 void testAxisCrossBetweenXSLX();
 void testPieChartDataPointExplosionXLSX();
@@ -206,6 +207,7 @@ public:
 CPPUNIT_TEST(testBarChartVaryColorsXLSX);
 CPPUNIT_TEST(testMultipleAxisXLSX);
 CPPUNIT_TEST(testSecondaryAxisXLSX);
+CPPUNIT_TEST(testSetSeriesToSecondaryAxisXLSX);
 CPPUNIT_TEST(testAxisTitleRotationXLSX);
 CPPUNIT_TEST(testAxisCrossBetweenXSLX);
 CPPUNIT_TEST(testPieChartDataPointExplosionXLSX);
@@ -1760,6 +1762,25 @@ void Chart2ExportTest::testSecondaryAxisXLSX()
 assertXPathContent(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart[2]/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v",
 "a");
 }
 
+void Chart2ExportTest::testSetSeriesToSecondaryAxisXLSX()
+{
+load("/chart2/qa/extras/data/xlsx/", "add_series_secondary_axis.xlsx");
+Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, 
mxComponent);
+// Second series
+Reference xSeries = getDataSeriesFromDoc(xChartDoc, 
1);
+CPPUNIT_ASSERT(xSeries.is());
+
+Reference xPropSet(xSeries, uno::UNO_QUERY_THROW);
+sal_Int32 AxisIndex = 1;
+// Attach the second series to the secondary axis. (The third series is 
already attached.)
+xPropSet->setPropertyValue("AttachedAxisIndex", uno::Any(AxisIndex));
+
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+// Check there are only two  tag in the XML, one for the 
primary and one for the secondary axis.
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart", 2);
+}
+
 void Chart2ExportTest::testAxisTitleRotationXLSX()
 {
 load("/chart2/qa/extras/data/xlsx/", "axis_title_rotation.xlsx");
diff --git a/chart2/qa/extras/data/xlsx/add_series_secondary_axis.xlsx 
b/chart2/qa/extras/data/xlsx/add_series_secondary_axis.xlsx
new file mode 100755
index ..03d7a47f6c3d
Binary files /dev/null and 
b/chart2/qa/extras/data/xlsx/add_series_secondary_axis.xlsx differ
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx 
b/oox/source/drawingml/chart/typegroupconverter.cxx
index 1f6c73e11d0b..bd592e6adbc5 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -312,6 +312,10 @@ void TypeGroupConverter::convertFromModel( const 
Reference< XDiagram >& rxDiagra
 OUString aService = OUString::createFromAscii( 
maTypeInfo.mpcServiceName );
 Reference< XChartType > xChartType( createInstance( aService ), 
UNO_QUERY_THROW );
 
+Reference< XChartTypeContainer > xChartTypeContOld( rxCoordSystem, 
UNO_QUERY_THROW );
+Sequence< Reference< XChartType > > xOldChartTypes( 
xChartTypeContOld->getChartTypes() );
+sal_Int32 nOldChartTypeIdx = -1;
+
 // additional properties
 PropertySet aDiaProp( rxDiagram );
 PropertySet aTypeProp( xChartType );
@@ -419,11 +423,19 @@ void TypeGroupConverter::convertFromModel( const 
Reference< XDiagram >& rxDiagra
 }
 else
 {
+for( sal_Int32 nCTIdx=0; nCTIdxgetChartType() == 
xOldChartTypes[nCTIdx]->getChartType() )
+{
+nOldChartTypeIdx = nCTIdx;
+}
+}
+
 for (auto const& elem : aSeries)
  

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - external/openssl

[Michael Stahl (via logerrit)]

 external/openssl/ExternalProject_openssl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b1a97d13913ecc3d2a755803e540d7641a7fd112
Author: Michael Stahl 
AuthorDate: Mon Apr 8 14:25:47 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon Apr 8 14:29:23 2019 +0200

openssl: try to fix build with 7.1A SDK

Change-Id: Ic4a9e53227e34fe41a69afd52a9e91ef9545f8f9

diff --git a/external/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
index 9ae7a1395cc6..7b7b960a4b18 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -61,7 +61,7 @@ OPENSSL_PLATFORM := \
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,openssl,build):
$(call gb_ExternalProject_run,build,\
-   export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter 
-%,$(CC))" \
+   export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter 
-%,$(CC)) $(if $(findstring 
140_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_)" \
&& export PERL="$(shell cygpath -w $(PERL))" \
&& export LIB="$(ILIB)" \
&& $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Patrick Jaap (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |  194 +++
 1 file changed, 81 insertions(+), 113 deletions(-)

New commits:
commit 90b7c88c154d85d1637cdd3c6d0d0150bb8158fd
Author: Patrick Jaap 
AuthorDate: Thu Feb 14 10:08:58 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Apr 8 13:47:11 2019 +0200

Converters for OOXML orients and relations

Change-Id: I8e3ade11881d88e937b1a55598813b2265cafd95
Reviewed-on: https://gerrit.libreoffice.org/69522
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit bbe8bc3c8610d5d218afaa779e86d822a7a76345)
Reviewed-on: https://gerrit.libreoffice.org/70307

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 78a41c64aa6e..dfb12d1cc25e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -491,6 +491,79 @@ void DocxAttributeOutput::StartParagraph( 
ww8::WW8TableNodeInfo::Pointer_t pText
 m_bIsFirstParagraph = false;
 }
 
+static OString convertToOOXMLVertOrient(sal_Int16 nOrient)
+{
+switch( nOrient )
+{
+case text::VertOrientation::NONE:
+return OString();
+case text::VertOrientation::CENTER:
+case text::VertOrientation::LINE_CENTER:
+return OString( "center" );
+case text::VertOrientation::BOTTOM:
+return OString( "bottom" );
+case text::VertOrientation::LINE_BOTTOM:
+return OString( "outside" );
+case text::VertOrientation::TOP:
+return OString( "top" );
+case text::VertOrientation::LINE_TOP:
+default:
+return OString( "inside" );
+}
+}
+
+static OString convertToOOXMLHoriOrient(sal_Int16 nOrient)
+{
+switch( nOrient )
+{
+case text::VertOrientation::NONE:
+return OString();
+case text::VertOrientation::CENTER:
+case text::VertOrientation::LINE_CENTER:
+return OString( "center" );
+case text::VertOrientation::BOTTOM:
+return OString( "bottom" );
+case text::VertOrientation::LINE_BOTTOM:
+return OString( "outside" );
+case text::VertOrientation::TOP:
+return OString( "top" );
+case text::VertOrientation::LINE_TOP:
+default:
+return OString( "inside" );
+}
+}
+
+static OString convertToOOXMLVertOrientRel(sal_Int16 nOrientRel)
+{
+switch (nOrientRel)
+{
+case text::RelOrientation::PAGE_PRINT_AREA:
+return OString("margin");
+case text::RelOrientation::PAGE_FRAME:
+return OString("page");
+case text::RelOrientation::FRAME:
+case text::RelOrientation::TEXT_LINE:
+default:
+return OString("text");
+}
+}
+
+static OString convertToOOXMLHoriOrientRel(sal_Int16 nOrientRel)
+{
+switch (nOrientRel)
+{
+case text::RelOrientation::PAGE_PRINT_AREA:
+return OString("margin");
+case text::RelOrientation::PAGE_FRAME:
+return OString("page");
+case text::RelOrientation::CHAR:
+case text::RelOrientation::PAGE_RIGHT:
+case text::RelOrientation::FRAME:
+default:
+return OString("text");
+}
+}
+
 static void lcl_deleteAndResetTheLists( 
rtl::Reference& pSdtPrTokenChildren, 
rtl::Reference& pSdtPrDataBindingAttrs, 
OUString& rSdtPrAlias)
 {
 if( pSdtPrTokenChildren.is() )
@@ -514,38 +587,8 @@ void DocxAttributeOutput::PopulateFrameProperties(const 
SwFrameFormat* pFrameFor
 attrList->add( FSNS( XML_w, XML_x), OString::number(aPos.X));
 attrList->add( FSNS( XML_w, XML_y), OString::number(aPos.Y));
 
-const char* relativeFromH;
-const char* relativeFromV;
-switch (pFrameFormat->GetVertOrient().GetRelationOrient())
-{
-case text::RelOrientation::PAGE_PRINT_AREA:
-relativeFromV = "margin";
-break;
-case text::RelOrientation::PAGE_FRAME:
-relativeFromV = "page";
-break;
-case text::RelOrientation::FRAME:
-case text::RelOrientation::TEXT_LINE:
-default:
-relativeFromV = "text";
-break;
-}
-
-switch (pFrameFormat->GetHoriOrient().GetRelationOrient())
-{
-case text::RelOrientation::PAGE_PRINT_AREA:
-relativeFromH = "margin";
-break;
-case text::RelOrientation::PAGE_FRAME:
-relativeFromH = "page";
-break;
-case text::RelOrientation::CHAR:
-case text::RelOrientation::PAGE_RIGHT:
-case text::RelOrientation::FRAME:
-default:
-relativeFromH = "text";
-break;
-}
+OString relativeFromH = convertToOOXMLHoriOrientRel( 
pFrameFormat->GetHoriOrient().GetRelationOrient() );
+OString relativeFromV = convertToOOXMLVertOrientRel( 
pFrameF

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

[Thorsten Behrens (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |   18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 69b5da392951fbd655912185434edab94f8ac0af
Author: Thorsten Behrens 
AuthorDate: Mon Apr 8 00:32:09 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Apr 8 13:46:05 2019 +0200

pdf: always write resource dict for content streams

Take out:
- revert i#42884 workaround for AR5: use implicit resources in
  transparency groups

Since verapdf complains with FAIL 6.2.2-2 in this case - missing
resource dict for content stream.

Change-Id: Ic186d2b4b393ac34f991a6747667332cf8f4658b
Reviewed-on: https://gerrit.libreoffice.org/70391
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index f4c620bd13da..57b156a14315 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -8126,16 +8126,14 @@ void PDFWriterImpl::writeTransparentObject( 
TransparencyEmit& rObject )
 {
 if( ! m_bIsPDF_A1 )
 {
+// 7.8.3 Resource dicts are required for content streams
+aLine.append( "/Resources " );
+aLine.append( getResourceDictObj() );
+aLine.append( " 0 R\n" );
+
 aLine.append( "/Group<>\n" );
 }
 }
-/* #i42884# the PDF reference recommends that each Form XObject
-*  should have a resource dict; alas if that is the same object
-*  as the one of the page it triggers an endless recursion in
-*  acroread 5 (6 and up have that fixed). Since we have only one
-*  resource dict anyway, let's use the one from the page by NOT
-*  emitting a Resources entry.
-*/
 
 aLine.append( "/Length " );
 aLine.append( static_cast(nSize) );
@@ -8207,7 +8205,11 @@ void PDFWriterImpl::writeTransparentObject( 
TransparencyEmit& rObject )
 appendFixedInt( rObject.m_aBoundRect.Bottom()+1, aMask );
 aMask.append( "]\n" );
 
-/* #i42884# see above */
+// 7.8.3 Resource dicts are required for content streams
+aMask.append( "/Resources " );
+aMask.append( getResourceDictObj() );
+aMask.append( " 0 R\n" );
+
 aMask.append( "/Group<>\n" );
 aMask.append( "/Length " );
 aMask.append( nMaskSize );
___
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

[Samuel Mehrbrodt (via logerrit)]

 sc/source/ui/unoobj/shapeuno.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit c45f22ce7c1560ec2deddc90a71da062d803f15d
Author: Samuel Mehrbrodt 
AuthorDate: Fri Mar 29 07:43:00 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Apr 8 13:44:55 2019 +0200

Related tdf#124329 Handle shapes resizing with the cell

The same as shapes just anchored to the cell.

Change-Id: I0ce03e4c650dd10bd89cee87aa26775c32703d06
Reviewed-on: https://gerrit.libreoffice.org/70065
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit e587645f551c6c684f9f36606f8fa5e1b06004a1)
Reviewed-on: https://gerrit.libreoffice.org/70402
Reviewed-by: Thorsten Behrens 

diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 04ef95a81e9f..aed1d55e389a 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -510,7 +510,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& 
aPropertyName, const
 xShape->setPosition(aPoint);
 pDocSh->SetModified();
 }
-else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL)
+else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL
+ || 
ScDrawLayer::GetAnchorType(*pObj)
+== SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
@@ -595,7 +597,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& 
aPropertyName, const
 xShape->setPosition(aPoint);
 pDocSh->SetModified();
 }
-else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL)
+else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL
+ || 
ScDrawLayer::GetAnchorType(*pObj)
+== SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
@@ -724,7 +728,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const 
OUString& aPropertyName )
 uno::Reference xShape( mxShapeAgg, 
uno::UNO_QUERY );
 if (xShape.is())
 {
-if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL
+|| ScDrawLayer::GetAnchorType(*pObj) == 
SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
@@ -784,7 +789,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const 
OUString& aPropertyName )
 uno::Reference xShape( mxShapeAgg, 
uno::UNO_QUERY );
 if (xShape.is())
 {
-if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL
+|| ScDrawLayer::GetAnchorType(*pObj) == 
SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 sc/source/ui/unoobj/shapeuno.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit acc33b803ebff910139c7a7cabba6aa2e242fad3
Author: Samuel Mehrbrodt 
AuthorDate: Fri Mar 29 07:43:00 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Apr 8 13:44:20 2019 +0200

Related tdf#124329 Handle shapes resizing with the cell

The same as shapes just anchored to the cell.

Change-Id: I0ce03e4c650dd10bd89cee87aa26775c32703d06
Reviewed-on: https://gerrit.libreoffice.org/70065
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit e587645f551c6c684f9f36606f8fa5e1b06004a1)
Reviewed-on: https://gerrit.libreoffice.org/70401
Reviewed-by: Thorsten Behrens 

diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 49ce7146ccd1..739fd4223fb1 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -507,7 +507,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& 
aPropertyName, const
 xShape->setPosition(aPoint);
 pDocSh->SetModified();
 }
-else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL)
+else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL
+ || 
ScDrawLayer::GetAnchorType(*pObj)
+== SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
@@ -591,7 +593,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& 
aPropertyName, const
 xShape->setPosition(aPoint);
 pDocSh->SetModified();
 }
-else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL)
+else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL
+ || 
ScDrawLayer::GetAnchorType(*pObj)
+== SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
@@ -719,7 +723,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const 
OUString& aPropertyName )
 uno::Reference xShape( mxShapeAgg, 
uno::UNO_QUERY );
 if (xShape.is())
 {
-if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL
+|| ScDrawLayer::GetAnchorType(*pObj) == 
SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
@@ -779,7 +784,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const 
OUString& aPropertyName )
 uno::Reference xShape( mxShapeAgg, 
uno::UNO_QUERY );
 if (xShape.is())
 {
-if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL
+|| ScDrawLayer::GetAnchorType(*pObj) == 
SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'update' - check.php

[Christian Lohmaier]

 check.php |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit f46a69e0c71b625f3fa1332ac09391461e0fe2b9
Author: Christian Lohmaier 
AuthorDate: Mon Apr 8 13:08:30 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 8 13:08:30 2019 +0200

enable update to 6.2.2

diff --git a/check.php b/check.php
index ee8ae35..09dfd00 100644
--- a/check.php
+++ b/check.php
@@ -587,6 +587,12 @@ $build_hash_to_version = array(
 '0412ee99e862f384c1106d0841a950c4cfaa9df1' => '6.2.0.1', # rc1
 '2ce5217b30a543f7666022df50f0562f82be0cff' => '6.2.0.2', # rc2
 '98c6a8a1c6c7b144ce3cc729e34964b47ce25d62' => '6.2.0.3', # Final
+# 6.2.1
+'757c58e8cb70b2982843211a54750fb3cd79acd5' => '6.2.1.1',
+'7bcb35dc3024a62dea0caee87020152d1ee96e71' => '6.2.1.2', # Final
+# 6.2.2
+'fcd633fb1bf21b0a99c9acb3ad6e526437947b01' => '6.2.2.1',
+'2b840030fec2aae0fd2658d8d4f9548af4e3518d' => '6.2.2.2', # Final
 );
 
 # Descriptions of the target versions
@@ -605,11 +611,11 @@ $update_map = array(
   'update_type' => 'text/html',
   'update_src'  => 
'https://www.libreoffice.org/download/download/?lang=&version=6.1.5',
   'substitute'  => true ),
-'latest' => array('gitid'   => 
'98c6a8a1c6c7b144ce3cc729e34964b47ce25d62',
-  'id'  => 'LibreOffice 6.2.0',
-  'version' => '6.2.0',
+'latest' => array('gitid'   => 
'2b840030fec2aae0fd2658d8d4f9548af4e3518d',
+  'id'  => 'LibreOffice 6.2.2',
+  'version' => '6.2.2',
   'update_type' => 'text/html',
-  'update_src'  => 
'https://www.libreoffice.org/download/download/?lang=&version=6.2.0',
+  'update_src'  => 
'https://www.libreoffice.org/download/download/?lang=&version=6.2.2',
   'substitute'  => true ),
 );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/app

[Libreoffice Gerrit user]

 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 |   16 ++-
 
android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java 
   |5 +
 android/app/src/main/res/layout/activity_document_browser.xml  
|   50 --
 android/app/src/main/res/values/strings.xml
|2 
 4 files changed, 61 insertions(+), 12 deletions(-)

New commits:
commit 789a1c1a7b7376612adcdf43c3d18a318faf7a1b
Author: kaishu-sahu 
AuthorDate: Mon Apr 1 00:27:35 2019 +0530
Commit: Jan Holesovsky 
CommitDate: Mon Apr 8 12:51:17 2019 +0200

android: add no_recent_items/no_items msg.

Change-Id: I398c65702d246772aeb46b68ba54d2800ce8200a
Reviewed-on: https://gerrit.libreoffice.org/70014
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index 3ad028620..7035fd473 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -145,6 +145,10 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements /*Settin
 private RecyclerView fileRecyclerView;
 private RecyclerView recentRecyclerView;
 
+//kept package-private to use these in recyclerView's adapter
+TextView noRecentItemsTextView;
+TextView noItemsTextView;
+
 private boolean canQuit = false;
 
 private Animation fabOpenAnimation;
@@ -222,6 +226,7 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements /*Settin
 drawLayout = findViewById(R.id.drawLayout);
 
 recentRecyclerView = findViewById(R.id.list_recent);
+noRecentItemsTextView = findViewById(R.id.no_recent_items_msg);
 
 Set recentFileStrings = 
prefs.getStringSet(RECENT_DOCUMENTS_KEY, new HashSet());
 
@@ -241,6 +246,7 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements /*Settin
 recentRecyclerView.setAdapter(new RecentFilesAdapter(this, 
recentFiles));
 
 fileRecyclerView = findViewById(R.id.file_recycler_view);
+noItemsTextView = findViewById(R.id.no_items_msg);
 //This should be tested because it possibly disables view recycling
 fileRecyclerView.setNestedScrollingEnabled(false);
 openDirectory(currentDirectory);
@@ -498,6 +504,7 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements /*Settin
 findViewById(R.id.text_directory_path).setVisibility(View.GONE);
 } else {
 recentRecyclerView.setVisibility(View.GONE);
+noRecentItemsTextView.setVisibility(View.GONE);
 findViewById(R.id.header_browser).setVisibility((View.GONE));
 findViewById(R.id.header_recents).setVisibility((View.GONE));
 actionBar.setTitle(dir.getName());
@@ -1154,12 +1161,12 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements /*Settin
 
 class ExplorerItemAdapter extends 
RecyclerView.Adapter {
 
-private Activity mActivity;
+private LibreOfficeUIActivity mActivity;
 private List filePaths;
 private final long KB = 1024;
 private final long MB = 1048576;
 
-ExplorerItemAdapter(Activity activity, List filePaths) {
+ExplorerItemAdapter(LibreOfficeUIActivity activity, List 
filePaths) {
 this.mActivity = activity;
 this.filePaths = filePaths;
 }
@@ -1238,6 +1245,11 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements /*Settin
 
 @Override
 public int getItemCount() {
+if (filePaths.size() == 0) {
+mActivity.noItemsTextView.setVisibility(View.VISIBLE);
+} else {
+mActivity.noItemsTextView.setVisibility(View.GONE);
+}
 return filePaths.size();
 }
 
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java
index 51468a627..6ad8aba48 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java
@@ -77,6 +77,11 @@ class RecentFilesAdapter extends 
RecyclerView.Adapter
 
 
-
+android:layout_height="wrap_content">
+
+
+
+
+
+
 
 
-
+android:layout_height="match_parent">
+
+
+
+
+
+
 
 
 
diff --git a/android/app/src/main/res/values/strings.xml 
b/android/

Re: Bug collaboraonline 124527 : no dot point with french keyboard

[Andras Timar]

Hi Vincent,

Thanks, we received the bug report.

Best regards,
Andras Timar

On Mon, Apr 8, 2019 at 12:24 PM Vincent Lucy <
vincent.l...@atd-quartmonde.org> wrote:

> Hi,
>
> I open this bug, it's reproduced with Firefox client on Ubuntu 18.04 and
> 18.10 :
>
> https://bugs.documentfoundation.org/show_bug.cgi?id=124527
>
> It works with Firefox 63.0b13 (64 bits) (from Ubuntu snap channel edge).
>
> As I'm not used to gerrit I don't know if I created the bug at the good
> place.
>
> Does anyone can confirm that it will be take in consideration/processed ?
>
> Regards,
> --
> [image: ATD Quart Monde] Vincent Lucy
> Service informatique du centre national en France
>
> ATD Quart Monde France
> 63 rue Beaumarchais - 93100 Montreuil
> T. 01 42 46 41 45
> www.atd-quartmonde.fr
>
> [image: AGIR TOUS POUR LA DIGNITÉ]
> ___
> 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: solenv/gbuild

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

 solenv/gbuild/PrecompiledHeaders.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 58a7e252320f630f871d6c93dca5a3a85a44d9a6
Author: Luboš Luňák 
AuthorDate: Sat Mar 9 14:00:55 2019 +0100
Commit: Luboš Luňák 
CommitDate: Mon Apr 8 12:24:16 2019 +0200

support for CCACHE_PCH_EXTSUM

Manpage for ccache says that hashing large PCH files may take a bit,
so if CCACHE_PCH_EXTSUM is set, ccache will instead try to hash just
a file named as the PCH file with .sum added. The build system is
responsible for handling the file.

Change-Id: I33fd04f54952d00c0f84ca364f939a86a4844fa6
Reviewed-on: https://gerrit.libreoffice.org/70380
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index a2c1f323baf3..37adf778f2e3 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -39,6 +39,7 @@ $(call gb_PrecompiledHeader_get_dep_target,%) :
 $(call gb_PrecompiledHeader_get_target,%) :
rm -f $@
$(call 
gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) 
$(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE))
+   $(SHA256SUM) $@ >$@.sum
 ifeq ($(gb_FULLDEPS),$(true))
$(call gb_Helper_abbreviate_dirs,\
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,$(call 
gb_PrecompiledHeader_get_dep_target_tmp,$*)) && \
@@ -54,6 +55,7 @@ $(call gb_PrecompiledHeader_get_clean_target,%) :
rm -f $(call gb_PrecompiledHeader_get_target,$*) \
$(call gb_PrecompiledHeader_get_target,$*).obj \
$(call gb_PrecompiledHeader_get_target,$*).pdb \
+   $(call gb_PrecompiledHeader_get_target,$*).sum \
$(call gb_PrecompiledHeader_get_timestamp,$*) \
$(call gb_PrecompiledHeader_get_dep_target,$*))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Bug collaboraonline 124527 : no dot point with french keyboard

[Vincent Lucy]

Hi,

I open this bug, it's reproduced with Firefox client on Ubuntu 18.04 and
18.10 :

https://bugs.documentfoundation.org/show_bug.cgi?id=124527

It works with Firefox 63.0b13 (64 bits) (from Ubuntu snap channel edge).

As I'm not used to gerrit I don't know if I created the bug at the good
place.

Does anyone can confirm that it will be take in consideration/processed ?

Regards,

-- 
ATD Quart Monde Vincent Lucy
Service informatique du centre national en France

ATD Quart Monde France
63 rue Beaumarchais - 93100 Montreuil
T. 01 42 46 41 45
www.atd-quartmonde.fr 

AGIR TOUS POUR LA DIGNITÉ

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

Re: questions about LibreOffice API version and jars available on https://mvnrepository.com

[Thorsten Behrens]

Hi Lorenzo,

LORENZO Vincent wrote:
>   Yes, of course, I could compile it myself, but I would prefer avoid 
> this step  :-).
>
Seems the maven repo got updated with the latest jars - e.g.
https://mvnrepository.com/artifact/org.libreoffice/jurt lists versions
up to and including 6.2

HTH,

-- Thorsten


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna (via logerrit)]

 sc/inc/global.hxx  |2 ++
 sc/source/core/data/global.cxx |5 -
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7069ec6de9807d12ff9ad52ecbb66ea7dc373723
Author: Miklos Vajna 
AuthorDate: Mon Apr 8 10:50:00 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 8 12:12:16 2019 +0200

tdf#124327 sc opengl: fix lack of AA text in charts

Commit 708d1c5ab242b545ced598879233fc662d7e6cc0 (sc lok: emit
RowColumnHeader info in twips, 2015-11-02) and later commits improved
precision of the Pixel Per Twips (PPT) factor in Calc, but this caused
offset problems in PDF export. So the LOK case uses double precision and
otherwise we use limited precision since commit
616fd241838069e18c59064e33c4b24f5ae112c6 (tdf#115262 sc: fix cumulative
placement error of images, 2018-10-01).

It turns out this double precision was also useful in the opengl case:
if UI scaling is set to 125% on Windows, then this helps producing AA
text for charts. Given that unlimited precision is the direction we want
to go, enable double precision for the GL case as well, not just for
LOK.

Verified that tdf#115262 is not re-introduced in the GL case, also that
manual PDF export (with GL enabled) does not produce the mentioned
unexpected image position offsets.

Change-Id: I23a8d6dce1b48c178977bda9909feb59fe8f3ad8
Reviewed-on: https://gerrit.libreoffice.org/70407
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 989671621484..0c1447f16721 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -574,7 +574,9 @@ public:
 SC_DLLPUBLIC static sal_uInt32 GetStandardFormat( SvNumberFormatter&, 
sal_uInt32 nFormat, SvNumFormatType nType );
 
 SC_DLLPUBLIC static sal_uInt16 GetStandardRowHeight();
+/// Horizontal pixel per twips factor.
 SC_DLLPUBLIC static double  nScreenPPTX;
+/// Vertical pixel per twips factor.
 SC_DLLPUBLIC static double  nScreenPPTY;
 
 static tools::SvRef   xDrawClipDocShellRef;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 68c9af64d8c3..f0a3715f36b0 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -49,6 +49,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -469,8 +470,10 @@ void ScGlobal::InitPPT()
 {
 OutputDevice* pDev = Application::GetDefaultDevice();
 
-if (comphelper::LibreOfficeKit::isActive())
+if (comphelper::LibreOfficeKit::isActive() || 
OpenGLWrapper::isVCLOpenGLEnabled())
 {
+// LOK: the below limited precision is not enough for RowColumnHeader.
+// OpenGL: limited precision breaks AA of text in charts.
 nScreenPPTX = double(pDev->GetDPIX()) / double(TWIPS_PER_INCH);
 nScreenPPTY = double(pDev->GetDPIY()) / double(TWIPS_PER_INCH);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/qa/unit/data/xls/pass/ofz14101-1.xls |binary
 sc/qa/unit/data/xls/pass/ofz14120-1.xls |binary
 sc/source/core/data/document.cxx|2 +-
 sc/source/core/data/table7.cxx  |4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3d57865fa367acf143232373f1096d067128bda6
Author: Caolán McNamara 
AuthorDate: Mon Apr 8 09:51:58 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 12:11:24 2019 +0200

ofz#14101 another batch of oss-fuzz failures

since...

commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100

tdf#50916 Makes numbers of columns dynamic

Change-Id: Ibee52867c83393fe1e3d548f6d00d29df78b07e4
Reviewed-on: https://gerrit.libreoffice.org/70408
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/qa/unit/data/xls/pass/ofz14101-1.xls 
b/sc/qa/unit/data/xls/pass/ofz14101-1.xls
new file mode 100644
index ..953f255fb19e
Binary files /dev/null and b/sc/qa/unit/data/xls/pass/ofz14101-1.xls differ
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index a3df4639e94b..f41e9e34c1d4 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6527,7 +6527,7 @@ void ScDocument::SetNote(const ScAddress& rPos, 
std::unique_ptr pNote)
 
 void ScDocument::SetNote(SCCOL nCol, SCROW nRow, SCTAB nTab, 
std::unique_ptr pNote)
 {
-return maTabs[nTab]->aCol[nCol].SetCellNote(nRow, std::move(pNote));
+return maTabs[nTab]->CreateColumnIfNotExists(nCol).SetCellNote(nRow, 
std::move(pNote));
 }
 
 bool ScDocument::HasNote(const ScAddress& rPos) const
commit 368448e7843bf4e58ed5637a731c67c76c3c11cb
Author: Caolán McNamara 
AuthorDate: Mon Apr 8 09:23:46 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 12:11:10 2019 +0200

ofz#14120 another batch of oss-fuzz failures

since...

commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100

tdf#50916 Makes numbers of columns dynamic

Change-Id: Ic494eb7e6ad13537caf0ac3dde0b6646fd2dcc10
Reviewed-on: https://gerrit.libreoffice.org/70406
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/qa/unit/data/xls/pass/ofz14120-1.xls 
b/sc/qa/unit/data/xls/pass/ofz14120-1.xls
new file mode 100644
index ..5d526b445c9d
Binary files /dev/null and b/sc/qa/unit/data/xls/pass/ofz14120-1.xls differ
diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index e0ed0c96bce6..ae67c319651e 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -421,10 +421,10 @@ bool ScTable::IsEditActionAllowed(
 
 std::unique_ptr ScTable::GetColumnIterator( SCCOL nCol, 
SCROW nRow1, SCROW nRow2 ) const
 {
-if (!ValidCol(nCol) || nCol >= aCol.size())
+if (!ValidCol(nCol))
 return std::unique_ptr();
 
-return aCol[nCol].GetColumnIterator(nRow1, nRow2);
+return CreateColumnIfNotExists(nCol).GetColumnIterator(nRow1, nRow2);
 }
 
 bool ScTable::EnsureFormulaCellResults( const SCCOL nCol1, SCROW nRow1, const 
SCCOL nCol2, SCROW nRow2, bool bSkipRunning )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_images.mk postprocess/CustomTarget_registry.mk solenv/gbuild

[Tomáš Chvátal (via logerrit)]

 postprocess/CustomTarget_images.mk   |4 ++--
 postprocess/CustomTarget_registry.mk |2 ++
 solenv/gbuild/GeneratedPackage.mk|2 +-
 solenv/gbuild/Module.mk  |2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 766425e2c58a00480feb3e30d9114df50a8e03a1
Author: Tomáš Chvátal 
AuthorDate: Thu Apr 4 13:33:26 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon Apr 8 12:01:16 2019 +0200

Use sort on finds to improve deterministic build

This should sort out all outputs prior processing them further resulting
in equal output among multiple builds.

Change-Id: Iaf24bbb94eb7b8960177bcf2c3e08d31d2fb7210
Reviewed-on: https://gerrit.libreoffice.org/70254
Reviewed-by: Tomáš Chvátal 
Tested-by: Tomáš Chvátal 
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/postprocess/CustomTarget_images.mk 
b/postprocess/CustomTarget_images.mk
index 5ad55799e1e1..f1e32f0b28ff 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -96,9 +96,9 @@ $(packimages_DIR)/commandimagelist.ilst :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \
$(FIND) $(SRCDIR)/icon-themes -name "*.png" -o -name "*.svg" | \
-   grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | 
$(SORT) | uniq | \
+   grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | \
sed "s#^#%MODULE%#" | \
-   LC_ALL=C $(SORT) > $@.tmp && \
+   LC_ALL=C $(SORT) -u > $@.tmp && \
$(call gb_Helper_replace_if_different_and_touch,$@.tmp,$@))
 
 $(packimages_DIR)/sorted.lst : \
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index e84c35eec7e5..a2560f2e2d74 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -597,6 +597,7 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Helper_abbreviate_dirs,\
$(FIND) $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) \
 -name *.xcu -size +0c \
+   | LC_ALL=C $(SORT) \
| $(gb_AWK) 'BEGIN{print ""} \
{print ""$$0""} \
   END  {print ""}' > $@ \
@@ -612,6 +613,7 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
 $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
 $(call gb_XcuResTarget_get_target,updchk/$*/))\
 -name *.xcu \
+   | LC_ALL=C $(SORT) \
| $(gb_AWK) 'BEGIN{print ""} \
{print ""$$0""} \
   END  {print ""}' > $@ \
diff --git a/solenv/gbuild/GeneratedPackage.mk 
b/solenv/gbuild/GeneratedPackage.mk
index 25af209b857e..05bbcf43a93e 100644
--- a/solenv/gbuild/GeneratedPackage.mk
+++ b/solenv/gbuild/GeneratedPackage.mk
@@ -42,7 +42,7 @@ $(call gb_GeneratedPackage_get_target,%) :
$(foreach pair,$(PACKAGE_DIRS),&& cp -R 
$(PACKAGE_SOURCEDIR)/$(call gb_GeneratedPackage__get_srcdir,$(pair)) $(call 
gb_GeneratedPackage__get_destdir,$(pair))) \
)
$(call gb_Helper_abbreviate_dirs,\
-   $(FIND) $(foreach pair,$(PACKAGE_DIRS),$(call 
gb_GeneratedPackage__get_destdir,$(pair))) \( -type f -o -type l \) -print > $@ 
\
+   $(FIND) $(foreach pair,$(PACKAGE_DIRS),$(call 
gb_GeneratedPackage__get_destdir,$(pair))) \( -type f -o -type l \) -print | 
LC_ALL=C $(SORT) > $@ \
)
 
 .PHONY : $(call gb_GeneratedPackage_get_clean_target,%)
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 8b74a425bb2e..52798fd40731 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -235,7 +235,7 @@ $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize 
propex ulfex xrmex tr
$(call gb_Output_announce,$(subst .pot,,$(subst 
$(WORKDIR)/,,$@)),$(true),POT,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) 
$(SRCDIR) $(dir $@)/pot \
-   && $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e 
"s/\.pot/.po/" > $(dir $@)/LIST \
+   && $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e 
"s/\.pot/.po/" | LC_ALL=C $(SORT) > $(dir $@)/LIST \
&& touch $@)
 
 # enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/appl/workwin.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 21418f446073131e253b32f4ac098c449330cc72
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 09:07:29 2019 +0100
Commit: Michael Stahl 
CommitDate: Mon Apr 8 11:59:47 2019 +0200

rhbz#1696037 null-deref

Change-Id: I1a9eb5b1b38e2ec651f2d0286337106ab565a9dc
Reviewed-on: https://gerrit.libreoffice.org/70244
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index b7f6eddd9777..b3c12fe6bf16 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1501,6 +1501,11 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, 
sal_uInt16 nId )
 {
 vcl::Window *pWin = pCW->GetWindow();
 SfxChild_Impl *pChild = FindChild_Impl(*pWin);
+if (!pChild)
+{
+SAL_WARN("sfx.appl", "missing SfxChild_Impl child!");
+continue;
+}
 if (bHide)
 {
 pChild->nVisible &= ~SfxChildVisibility::ACTIVE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 svx/source/svdraw/svdotext.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a3ee61550e4308782d53265c4b1685aeb8bf0ed7
Author: Johnny_M 
AuthorDate: Sun Apr 7 12:01:19 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon Apr 8 11:54:48 2019 +0200

Translate German variable names

Please feel free to suggest a better name, if desired

Change-Id: Ie7ea0dbeb13970fb1b1680740e6a2b40871421a9
Reviewed-on: https://gerrit.libreoffice.org/70371
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 10f42a96bb17..898d21bdbb68 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -826,7 +826,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& 
rOutliner, const Size& rTextS
 if(pMtf)
 pMtf->Pause(true);
 
-vcl::Font aFontMerk(pOut->GetFont());
+vcl::Font aOriginalFont(pOut->GetFont());
 vcl::Font aTmpFont( OutputDevice::GetDefaultFont( 
DefaultFontType::SERIF, LANGUAGE_SYSTEM, GetDefaultFontFlags::OnlyOne ) );
 
 aTmpFont.SetFontSize(Size(0,100));
@@ -835,7 +835,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& 
rOutliner, const Size& rTextS
 aTmpFont.SetFontSize(Size(800,100));
 pOut->SetFont(aTmpFont);
 Size aSize2(pOut->GetTextWidth(aTestString), pOut->GetTextHeight());
-pOut->SetFont(aFontMerk);
+pOut->SetFont(aOriginalFont);
 
 if(pMtf)
 pMtf->Pause(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/svdraw/svdundo.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 709fc73b2c538f0c15d8c94ffeb5d8234a00a01d
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 12:22:06 2019 +0100
Commit: Xisco Faulí 
CommitDate: Mon Apr 8 11:53:31 2019 +0200

Resolves: tdf#120754 on undoing an obj insert use its current ordinal

there may have been changes not caught by undo to the object's
ordinal, so on use of RemoveObject (or ReplaceObject) call GetOrdNum
on the object to get its current position within its parent.

We can keep nOrdNum for the desired dest position within the parent
for InsertObject

Change-Id: I3bdabf387dd630fc1fadaaa1f3d8c05e93865e4f
Reviewed-on: https://gerrit.libreoffice.org/70253
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 107bd1a0ad05..3cd1fa98d393 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -708,7 +708,7 @@ void SdrUndoRemoveObj::Redo()
 {
 ImplUnmarkObject( pObj );
 E3DModifySceneSnapRectUpdater aUpdater(pObj);
-pObjList->RemoveObject(nOrdNum);
+pObjList->RemoveObject(pObj->GetOrdNum());
 }
 
 // Trigger PageChangeCall
@@ -730,7 +730,7 @@ void SdrUndoInsertObj::Undo()
 {
 ImplUnmarkObject( pObj );
 
-SdrObject* pChkObj= pObjList->RemoveObject(nOrdNum);
+SdrObject* pChkObj= pObjList->RemoveObject(pObj->GetOrdNum());
 DBG_ASSERT(pChkObj==pObj,"UndoInsertObj: RemoveObjNum!=pObj");
 }
 }
@@ -886,7 +886,7 @@ void SdrUndoReplaceObj::Undo()
 SetNewOwner(true);
 
 ImplUnmarkObject( pNewObj );
-pObjList->ReplaceObject(pObj,nOrdNum);
+pObjList->ReplaceObject(pObj,pNewObj->GetOrdNum());
 }
 else
 {
@@ -904,7 +904,7 @@ void SdrUndoReplaceObj::Redo()
 SetNewOwner(false);
 
 ImplUnmarkObject( pObj );
-pObjList->ReplaceObject(pNewObj,nOrdNum);
+pObjList->ReplaceObject(pNewObj,pObj->GetOrdNum());
 
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 package/source/xstor/xstorage.cxx |  169 --
 package/source/xstor/xstorage.hxx |7 -
 sc/source/core/tool/rangelst.cxx  |   46 ++
 3 files changed, 107 insertions(+), 115 deletions(-)

New commits:
commit 306758ab3e06f7c730bb1625c2f3fcce7a912fa3
Author: Noel Grandin 
AuthorDate: Fri Apr 5 15:40:27 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Apr 8 11:46:03 2019 +0200

tdf#117066 Saving ODT document with ~1500 bookmarks is slow, part 5

Individually, these don't make much difference, but they add up
to a halving the time to save on my machine.

OStorageImpl is spending time iterating over its m_aChildrenVector to
find stuff by name, so just use a std::unordered_map.
Also return iterator from FindElement, so we can avoid searching the map
twice.
This was probably the biggest win.

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

diff --git a/package/source/xstor/xstorage.cxx 
b/package/source/xstor/xstorage.cxx
index fe127883c126..c963820def7f 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -322,8 +322,9 @@ OStorage_Impl::~OStorage_Impl()
 m_pParent = nullptr;
 }
 
-std::for_each(m_aChildrenVector.begin(), m_aChildrenVector.end(), 
std::default_delete());
-m_aChildrenVector.clear();
+for (auto & pair : m_aChildrenMap)
+delete pair.second;
+m_aChildrenMap.clear();
 
 std::for_each(m_aDeletedVector.begin(), m_aDeletedVector.end(), 
std::default_delete());
 m_aDeletedVector.clear();
@@ -485,12 +486,12 @@ void OStorage_Impl::OpenOwnPackage()
 throw embed::InvalidStorageException( THROW_WHERE );
 }
 
-SotElementVector_Impl& OStorage_Impl::GetChildrenVector()
+bool OStorage_Impl::HasChildren()
 {
 ::osl::MutexGuard aGuard( m_xMutex->GetMutex() );
 
 ReadContents();
-return m_aChildrenVector;
+return !m_aChildrenMap.empty();
 }
 
 void OStorage_Impl::GetStorageProperties()
@@ -612,7 +613,8 @@ void OStorage_Impl::ReadContents()
 xNewElement->m_bIsRemoved = true;
 }
 
-m_aChildrenVector.push_back(xNewElement.release());
+OUString name = xNewElement->m_aName; // because we're calling 
release in the next line
+m_aChildrenMap.emplace(name, xNewElement.release());
 }
 }
 catch( const container::NoSuchElementException& 
rNoSuchElementException )
@@ -652,8 +654,9 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< 
embed::XStorage >& xDes
 if ( !m_xPackageFolder.is() )
 throw embed::InvalidStorageException( THROW_WHERE );
 
-for ( auto& pElement : m_aChildrenVector )
+for ( auto& pair : m_aChildrenMap )
 {
+auto & pElement = pair.second;
 if ( !pElement->m_bIsRemoved )
 CopyStorageElement( pElement, xDest, pElement->m_aName, bDirect );
 }
@@ -1021,34 +1024,34 @@ void OStorage_Impl::Commit()
 m_aDeletedVector.clear();
 
 // remove removed elements
-SotElementVector_Impl::iterator pElementIter = m_aChildrenVector.begin();
-while (  pElementIter != m_aChildrenVector.end() )
+auto mapIter = m_aChildrenMap.begin();
+while (  mapIter != m_aChildrenMap.end() )
 {
 // renamed and inserted elements must be really inserted to package 
later
 // since thay can conflict with removed elements
-
-if ( (*pElementIter)->m_bIsRemoved )
+auto & pElement = mapIter->second;
+if ( pElement->m_bIsRemoved )
 {
-if ( m_nStorageType == embed::StorageFormats::OFOPXML && 
!(*pElementIter)->m_bIsStorage )
-RemoveStreamRelInfo( (*pElementIter)->m_aOriginalName );
+if ( m_nStorageType == embed::StorageFormats::OFOPXML && 
!pElement->m_bIsStorage )
+RemoveStreamRelInfo( pElement->m_aOriginalName );
 
 // the removed elements are not in new temporary storage
 if ( m_bCommited || m_bIsRoot )
-xNewPackageFolder->removeByName( 
(*pElementIter)->m_aOriginalName );
+xNewPackageFolder->removeByName( pElement->m_aOriginalName );
 
-delete *pElementIter;
-pElementIter = m_aChildrenVector.erase(pElementIter);
+delete pElement;
+mapIter = m_aChildrenMap.erase(mapIter);
 }
 else
-++pElementIter;
+++mapIter;
 }
 
 // there should be no more deleted elements
-for ( auto& pElement : m_aChildrenVector )
+for ( auto& pair : m_aChildrenMap )
 {
 // if it is a 'duplicate commit' inserted elements must be really 
inserted to package later
 // since thay can conflict with renamed elements
-
+auto & pElement = pair.second;
 if ( !pElement->m_bIsInserted )

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

[andreas kainz (via logerrit)]

 dev/null|binary
 icon-themes/sifr/cmd/lc_calloutshapes.png   |binary
 icon-themes/sifr/cmd/sc_calloutshapes.png   |binary
 icon-themes/sifr/links.txt  |  143 
+-
 icon-themes/sifr_dark/cmd/lc_calloutshapes.png  |binary
 icon-themes/sifr_dark/cmd/sc_calloutshapes.png  |binary
 icon-themes/sifr_svg/cmd/lc_arrowshapes.left-right-arrow.svg|   10 
 icon-themes/sifr_svg/cmd/lc_autofilter.svg  |6 
 icon-themes/sifr_svg/cmd/lc_basicshapes.circle.svg  |   10 
 icon-themes/sifr_svg/cmd/lc_calloutshapes.round-rectangular-callout.svg |   10 
 icon-themes/sifr_svg/cmd/lc_calloutshapes.svg   |8 
 icon-themes/sifr_svg/cmd/lc_flowchartshapes.flowchart-connector.svg |   10 
 icon-themes/sifr_svg/cmd/lc_importfromfile.svg  |6 
 icon-themes/sifr_svg/cmd/lc_leaveallgroups.svg  |6 
 icon-themes/sifr_svg/cmd/lc_openfromcalc.svg|6 
 icon-themes/sifr_svg/cmd/lc_openfromwriter.svg  |6 
 icon-themes/sifr_svg/cmd/lc_removefilter.svg|6 
 icon-themes/sifr_svg/cmd/lc_symbolshapes.smiley.svg |   10 
 icon-themes/sifr_svg/cmd/sc_arrowshapes.left-right-arrow.svg|6 
 icon-themes/sifr_svg/cmd/sc_autofilter.svg  |6 
 icon-themes/sifr_svg/cmd/sc_basicshapes.circle.svg  |   10 
 icon-themes/sifr_svg/cmd/sc_bulletliststyle.svg |6 
 icon-themes/sifr_svg/cmd/sc_calloutshapes.round-rectangular-callout.svg |   10 
 icon-themes/sifr_svg/cmd/sc_calloutshapes.svg   |4 
 icon-themes/sifr_svg/cmd/sc_defaultparastyle.svg|6 
 icon-themes/sifr_svg/cmd/sc_flowchartshapes.flowchart-connector.svg |   12 
 icon-themes/sifr_svg/cmd/sc_fontworkshapetype.fontwork-circle-pour.svg  |   10 
 icon-themes/sifr_svg/cmd/sc_grafinvert.svg  |6 
 icon-themes/sifr_svg/cmd/sc_grafmode.svg|6 
 icon-themes/sifr_svg/cmd/sc_groupmenu.svg   |6 
 icon-themes/sifr_svg/cmd/sc_importfromfile.svg  |6 
 icon-themes/sifr_svg/cmd/sc_insertdoc.svg   |6 
 icon-themes/sifr_svg/cmd/sc_leaveallgroups.svg  |6 
 icon-themes/sifr_svg/cmd/sc_measureattributes.svg   |6 
 icon-themes/sifr_svg/cmd/sc_objecttitledescription.svg  |6 
 icon-themes/sifr_svg/cmd/sc_openfromcalc.svg|6 
 icon-themes/sifr_svg/cmd/sc_openfromwriter.svg  |6 
 icon-themes/sifr_svg/cmd/sc_removefilter.svg|6 
 icon-themes/sifr_svg/cmd/sc_symbolshapes.smiley.svg |   10 
 39 files changed, 143 insertions(+), 240 deletions(-)

New commits:
commit b2fded58585300c52d64b00622c7a1c38d573521
Author: andreas kainz 
AuthorDate: Mon Apr 8 00:22:30 2019 +0200
Commit: andreas_kainz 
CommitDate: Mon Apr 8 11:32:06 2019 +0200

Sifr icon theme update links.txt file

Change-Id: I9fd7da8a748dd7f013dfa9e77c370d0218452dfb
Reviewed-on: https://gerrit.libreoffice.org/70390
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png 
b/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png
deleted file mode 100644
index 4e89eb80f64a..
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png and 
/dev/null differ
diff --git a/icon-themes/sifr/cmd/lc_autofilter.png 
b/icon-themes/sifr/cmd/lc_autofilter.png
deleted file mode 100644
index b068e1fc20c6..
Binary files a/icon-themes/sifr/cmd/lc_autofilter.png and /dev/null differ
diff --git a/icon-themes/sifr/cmd/lc_basicshapes.circle.png 
b/icon-themes/sifr/cmd/lc_basicshapes.circle.png
deleted file mode 100644
index e05ce68d2da7..
Binary files a/icon-themes/sifr/cmd/lc_basicshapes.circle.png and /dev/null 
differ
diff --git a/icon-themes/sifr/cmd/lc_calloutshapes.png 
b/icon-themes/sifr/cmd/lc_calloutshapes.png
index f43eb0de86bc..1b11bcc865b0 100644
Binary files a/icon-themes/sifr/cmd/lc_calloutshapes.png and 
b/icon-themes/sifr/cmd/lc_calloutshapes.png differ
diff --git 
a/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png 
b/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png
deleted file mode 100644
index 1b11bcc865b0..
Binary files 
a/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png and 
/dev/null differ
diff --git a/icon-themes/sif

Re: doxygen: Illegal command n as part of a title section

[vl01]

Hello,

On 4/5/19 2:50 AM, himajin10 wrote:


http://www.doxygen.nl/manual/commands.html#cmdpar

says title follows @par command. Probably that par title does not accept 
@n is the cause of the warning.


Does anyone know the the correct syntax? I still haven't search for it.


The syntax is correct, but since version 1.8.14 doxygen has that 
problem. See the filed bug report 
https://github.com/doxygen/doxygen/issues/6304


Cheers,

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

[Libreoffice-commits] dev-tools.git: 2 commits - qa/bugzillaDataAnalyzer.py qa/common.py qa/createBlogReport.py

[Libreoffice Gerrit user]

 qa/bugzillaDataAnalyzer.py |   28 
 qa/common.py   |   25 +
 qa/createBlogReport.py |   36 
 3 files changed, 45 insertions(+), 44 deletions(-)

New commits:
commit 08c53f97294c2fa00d89b61b94b02b8d0aa5998b
Author: Xisco Fauli 
AuthorDate: Mon Apr 8 11:04:39 2019 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 8 11:04:39 2019 +0200

QA: ignore uitests commits

diff --git a/qa/bugzillaDataAnalyzer.py b/qa/bugzillaDataAnalyzer.py
index 5fa73f1..f971d56 100755
--- a/qa/bugzillaDataAnalyzer.py
+++ b/qa/bugzillaDataAnalyzer.py
@@ -272,7 +272,7 @@ def analyze_bugzilla_data(statList, bugzillaData, cfg):
 if commentMail == 
"libreoffice-comm...@lists.freedesktop.org":
 commentText = comment['text']
 author =  commentText.split(' committed a patch 
related')[0]
-if author not in bugFixers:
+if author not in bugFixers and 'uitest' not in 
commentText.lower():
 bugFixers.append(author)
 difftimeFixed = (commentDate - creationDate).days
 weekFixed = str(commentDate.year) + '-' + 
str(commentDate.strftime("%V"))
commit b3cc75a72cb984e49019327c2d03b1fd84f035eb
Author: Xisco Fauli 
AuthorDate: Fri Apr 5 13:20:13 2019 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 8 10:53:01 2019 +0200

QA: Use date arguments in the data analyzer

diff --git a/qa/bugzillaDataAnalyzer.py b/qa/bugzillaDataAnalyzer.py
index 63ce9dd..5fa73f1 100755
--- a/qa/bugzillaDataAnalyzer.py
+++ b/qa/bugzillaDataAnalyzer.py
@@ -10,8 +10,6 @@
 import common
 import datetime
 
-reportPeriodDays = 365
-
 # Use enhancements, bugs, all
 kindOfData = ['enhancements', 'bugs', 'all']
 
@@ -143,7 +141,7 @@ def analyze_bugzilla_data(statList, bugzillaData, cfg):
 rowProduct = row['product']
 
 #get information about created bugs in reportPeriod
-if creationDate >= cfg['reportPeriod']:
+if common.util_check_range_time(creationDate, cfg):
 week = str(creationDate.year) + '-' + 
str(creationDate.strftime("%V"))
 month = str(creationDate.year) + '-' + 
str(creationDate.strftime("%m"))
 util_increase_action(statList[kindOfTicket]['created'], rowId, 
creatorMail, rowStatus, rowProduct,
@@ -168,6 +166,8 @@ def analyze_bugzilla_data(statList, bugzillaData, cfg):
 for action in row['history']:
 actionMail = action['who']
 actionDate = datetime.datetime.strptime(action['when'], 
"%Y-%m-%dT%H:%M:%SZ")
+if not common.util_check_range_time(actionDate, args):
+continue
 common.util_check_bugzilla_mail(
 statList, actionMail, '', actionDate, rowId)
 
@@ -178,7 +178,7 @@ def analyze_bugzilla_data(statList, bugzillaData, cfg):
 addedStatus = change['added']
 removedStatus = change['removed']
 
-if actionDate >= cfg['reportPeriod']:
+if common.util_check_range_time(actionDate, cfg):
 if common.isClosed(addedStatus) and 
common.isClosed(row['status']):
 if isClosed:
 
util_decrease_action(statList[kindOfTicket]['closed'], rowId, creatorMail, 
rowStatus, rowProduct,
@@ -232,7 +232,8 @@ def analyze_bugzilla_data(statList, bugzillaData, cfg):
 
 newStatus = None
 
-if actionDate >= cfg['reportPeriod'] and 
row['resolution'] == 'FIXED':
+if common.util_check_range_time(actionDate, cfg) and \
+row['resolution'] == 'FIXED':
 if addedResolution == 'FIXED':
 fixedBugs[rowId] = actionDate
 isFixed = True
@@ -245,7 +246,8 @@ def analyze_bugzilla_data(statList, bugzillaData, cfg):
 keywordsAdded = change['added'].split(", ")
 for keyword in keywordsAdded:
 if keyword in lKeywords:
-if actionDate >= cfg['reportPeriod'] and 
keyword in rowKeywords:
+if common.util_check_range_time(actionDate, 
cfg) and \
+keyword in rowKeywords:
 weekKeyword = str(actionDate.year) + '-' + 
str(actionDate.strftime("%V"))
 monthKeyword = str(actionDate.year) + '-' 
+ str(actionDate.strftime("%m"))
 difftimeKeyword = (actionDate - 
creationDate).days
@@ -266,7 +268,7 @@ def analyze_bugzilla_data(statList, bugzillaD

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

[Jens Carl (via logerrit)]

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

New commits:
commit 7f37bfa25a16bc66af4c236850503de1d0fb8336
Author: Jens Carl 
AuthorDate: Sun Apr 7 22:43:01 2019 -0700
Commit: Noel Grandin 
CommitDate: Mon Apr 8 10:29:59 2019 +0200

Fix out-of-bounds error when adding a comment

The error is related to tdf#50916 and since commit
7282014e362a1529a36c88eb308df8ed359c2cfa it's necessary to retrieve the
EndCol via ScTable::ClampToAllocatedColumns() otherwise this error
occurs:


/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/8.2.1/../../../../include/c++/8.2.1/debug/vector:417:
Error: attempt to subscript container with out-of-bounds index 64, but
container only holds 64 elements.

Objects involved in the operation:
sequence "this" @ 0x0x56b28340 {
  type = std::__debug::vector >, std::allocator > > >;
  }

The backtrace shows where the error occurs

0  0x77b0ed7f in raise () at /usr/lib/libc.so.6
1  0x77af9672 in abort () at /usr/lib/libc.so.6
2  0x779a16c6 in __gnu_debug::_Error_formatter::_M_error() const
   (this=0x7fffdf156928 <__gnu_debug::_Error_formatter::_M_at(char const*, 
unsigned int)::__formatter>)
   at /build/gcc/src/gcc/libstdc++-v3/src/c++11/debug.cc:1069
3  0x7fffdcd43fb3 in std::__debug::vector >, std::allocator > > >::operator[](unsigned long) 
(this=0x56b28340, __n=64)
   at 
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/8.2.1/../../../../include/c++/8.2.1/debug/vector:417
4  0x7fffdce75f5d in ScColContainer::operator[](unsigned long) 
(this=0x56b28340, nIndex=64) at sc/inc/colcontainer.hxx:44
5  0x7fffdcfb45f1 in ScDocument::HasColNotes(short, short) const 
(this=0x56b1f9a0, nCol=64, nTab=0) at sc/source/core/data/document.cxx:6563
6  0x7fffdd2b5473 in ScTable::GetAllNoteCaptionsState(ScRange const&, 
std::__debug::vector >&)
   (this=0x56b28340, rRange=..., 
rNotes=std::__debug::vector of length 2, capacity 2 = {...}) at 
sc/source/core/data/table2.cxx:1668
7  0x7fffdcfb4d85 in ScDocument::GetAllNoteCaptionsState(ScRangeList 
const&) (this=0x56b1f9a0, rRanges=...) at 
sc/source/core/data/document.cxx:6662
8  0x7fffde20449e in ScCellShell::GetState(SfxItemSet&) 
(this=0x56c99fc0, rSet=...) at sc/source/ui/view/cellsh.cxx:1121
9  0x7fffde200fb8 in SfxStubScCellShellGetState(SfxShell*, SfxItemSet&) 
(pShell=0x56c99fc0, rSet=...) at workdir/SdiTarget/sc/sdi/scslots.hxx:7286

Change-Id: I568546cd7a3de510625c6c5d189d84f5f0a7bdb2
Reviewed-on: https://gerrit.libreoffice.org/70399
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 9839763e8a14..2a288c46423f 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1656,7 +1656,9 @@ CommentCaptionState 
ScTable::GetAllNoteCaptionsState(const ScRange& rRange, std:
 bool bIsFirstNoteShownState = true; // because of error: 
-Werror=maybe-uninitialized
 bool bFirstControl = true;
 
-for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
+ScTable* pTab = pDocument->FetchTable(nTab);
+const SCCOL nEndCol = pTab->ClampToAllocatedColumns(rRange.aEnd.Col());
+for (SCCOL nCol = rRange.aStart.Col(); nCol <= nEndCol; ++nCol)
 {
 if (bFirstControl && pDocument->HasColNotes(nCol, nTab)) // detect 
status of first note caption
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/source/ui/misc/glossary.cxx|  138 +++---
 sw/source/uibase/inc/glossary.hxx |   26 +++
 2 files changed, 82 insertions(+), 82 deletions(-)

New commits:
commit 5219a2822261350509ac83ed1c35db16732e15bf
Author: Miklos Vajna 
AuthorDate: Mon Apr 8 09:12:43 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 8 10:10:44 2019 +0200

sw: prefix members of SwGlossaryDlg

Change-Id: Ia76c1108ea1db64a178c920be1d73400a364b22d
Reviewed-on: https://gerrit.libreoffice.org/70403
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index ce5dee06b6ff..935242ed977c 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -185,14 +185,14 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame const * 
pViewFrame,
 SwGlossaryHdl * pGlosHdl, SwWrtShell *pWrtShell)
 : SvxStandardDialog(&pViewFrame->GetWindow(), "AutoTextDialog",
 "modules/swriter/ui/autotext.ui")
-, sReadonlyPath(SwResId(STR_READONLY_PATH))
-, pGlossaryHdl(pGlosHdl)
-, bResume(false)
-, bSelection(pWrtShell->IsSelection())
-, bReadOnly(false)
-, bIsOld(false)
-, bIsDocReadOnly(false)
-, pSh(pWrtShell)
+, m_sReadonlyPath(SwResId(STR_READONLY_PATH))
+, m_pGlossaryHdl(pGlosHdl)
+, m_bResume(false)
+, m_bSelection(pWrtShell->IsSelection())
+, m_bReadOnly(false)
+, m_bIsOld(false)
+, m_bIsDocReadOnly(false)
+, m_pShell(pWrtShell)
 {
 get(m_pInsertTipCB, "inserttip");
 get(m_pNameED, "name");
@@ -229,9 +229,9 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame const * 
pViewFrame,
 
 ShowPreview();
 
-bIsDocReadOnly = pSh->GetView().GetDocShell()->IsReadOnly() ||
-  pSh->HasReadonlySel();
-if( bIsDocReadOnly )
+m_bIsDocReadOnly = m_pShell->GetView().GetDocShell()->IsReadOnly() ||
+  m_pShell->HasReadonlySel();
+if( m_bIsDocReadOnly )
 m_pInsertBtn->Enable(false);
 m_pNameED->GrabFocus();
 
m_pCategoryBox->SetStyle(m_pCategoryBox->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT);
@@ -250,7 +250,7 @@ SwGlossaryDlg::~SwGlossaryDlg()
 void SwGlossaryDlg::dispose()
 {
 m_pCategoryBox->Clear();
-pExampleFrame.reset();
+m_pExampleFrame.reset();
 m_pInsertTipCB.clear();
 m_pNameED.clear();
 m_pShortNameLbl.clear();
@@ -293,18 +293,18 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, 
pBox, void )
 ::SetCurrGlosGroup(pGroupData->sGroupName
 + OUStringLiteral1(GLOS_DELIM)
 + OUString::number(pGroupData->nPathIdx));
-pGlossaryHdl->SetCurGroup(::GetCurrGlosGroup());
+m_pGlossaryHdl->SetCurGroup(::GetCurrGlosGroup());
 // set current text block
-bReadOnly = pGlossaryHdl->IsReadOnly();
-EnableShortName( !bReadOnly );
-m_pEditBtn->Enable(!bReadOnly);
-bIsOld = pGlossaryHdl->IsOld();
+m_bReadOnly = m_pGlossaryHdl->IsReadOnly();
+EnableShortName( !m_bReadOnly );
+m_pEditBtn->Enable(!m_bReadOnly);
+m_bIsOld = m_pGlossaryHdl->IsOld();
 if( pParent != pEntry)
 {
 OUString aName(pBox->GetEntryText(pEntry));
 m_pNameED->SetText(aName);
 
m_pShortNameEdit->SetText(*static_cast(pEntry->GetUserData()));
-m_pInsertBtn->Enable( !bIsDocReadOnly);
+m_pInsertBtn->Enable( !m_bIsDocReadOnly);
 ShowAutoText(::GetCurrGlosGroup(), m_pShortNameEdit->GetText());
 }
 else
@@ -316,9 +316,9 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox, 
void )
 }
 // update controls
 NameModify(*m_pShortNameEdit);
-if( SfxRequest::HasMacroRecorder( pSh->GetView().GetViewFrame() ) )
+if( SfxRequest::HasMacroRecorder( m_pShell->GetView().GetViewFrame() ) )
 {
-SfxRequest aReq( pSh->GetView().GetViewFrame(), FN_SET_ACT_GLOSSARY );
+SfxRequest aReq( m_pShell->GetView().GetViewFrame(), 
FN_SET_ACT_GLOSSARY );
 aReq.AppendItem(SfxStringItem(FN_SET_ACT_GLOSSARY, 
getCurrentGlossary()));
 aReq.Done();
 }
@@ -330,11 +330,11 @@ void SwGlossaryDlg::Apply()
 const OUString aGlosName(m_pShortNameEdit->GetText());
 if (!aGlosName.isEmpty())
 {
-pGlossaryHdl->InsertGlossary(aGlosName);
+m_pGlossaryHdl->InsertGlossary(aGlosName);
 }
-if( SfxRequest::HasMacroRecorder( pSh->GetView().GetViewFrame() ) )
+if( SfxRequest::HasMacroRecorder( m_pShell->GetView().GetViewFrame() ) )
 {
-SfxRequest aReq( pSh->GetView().GetViewFrame(), FN_INSERT_GLOSSARY );
+SfxRequest aReq( m_pShell->GetView().GetViewFrame(), 
FN_INSERT_GLOSSARY );
 aReq.AppendItem(SfxStringItem(FN_INSERT_GLOSSARY, 
getCurrentGlossary()));
 aReq.AppendItem(SfxStringItem(FN_PARAM_1, aGlosName));
 aReq.Done();
@@ -395,17 +395,17 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit&, rEdit, void )

[Libreoffice-commits] core.git: include/oox oox/source sd/qa sd/source sw/source

[Grzegorz Araminowicz (via logerrit)]

 include/oox/export/drawingml.hxx |5 
 oox/source/export/drawingml.cxx  |  320 +++
 oox/source/token/tokens.txt  |1 
 sd/qa/unit/data/pptx/group.pptx  |binary
 sd/qa/unit/data/pptx/smartart-preserve.pptx  |binary
 sd/qa/unit/export-tests-ooxml2.cxx   |   62 -
 sd/source/filter/eppt/epptooxml.hxx  |6 
 sd/source/filter/eppt/pptx-epptooxml.cxx |   14 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   34 --
 sw/source/filter/ww8/docxattributeoutput.hxx |3 
 sw/source/filter/ww8/docxsdrexport.cxx   |  275 ---
 sw/source/filter/ww8/docxsdrexport.hxx   |5 
 12 files changed, 410 insertions(+), 315 deletions(-)

New commits:
commit aafaf1f55fa413ad49d4556cf7c0a713dd206ae4
Author: Grzegorz Araminowicz 
AuthorDate: Wed Mar 13 10:49:30 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Apr 8 10:07:35 2019 +0200

PPTX export: save SmartArt as diagram instead of group of shapes

preserving SmartArt allows editing it in PowerPoint after saving as pptx 
file

* moved common parts for docx and pptx export to oox/drawingml
* fixed export tests that expected shapes on output

Change-Id: I3e70a9f4177bebf5e1671232f4cd0ef0e7212626
Reviewed-on: https://gerrit.libreoffice.org/69598
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index fbcc25fb3db1..b3cdbb3600ba 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -258,7 +258,12 @@ public:
 void WriteShape3DEffects( const css::uno::Reference< 
css::beans::XPropertySet >& rXPropSet );
 void WriteArtisticEffect( const css::uno::Reference< 
css::beans::XPropertySet >& rXPropSet );
 OString WriteWdpPicture( const OUString& rFileId, const 
css::uno::Sequence< sal_Int8 >& rPictureData );
+void WriteDiagram(const css::uno::Reference& 
rXShape, int nDiagramId);
+void writeDiagramRels(const 
css::uno::Sequence>& xRelSeq,
+  const css::uno::Reference& 
xOutStream,
+  const OUString& sGrabBagProperyName, int nDiagramId);
 static bool IsGroupShape( const css::uno::Reference< css::drawing::XShape 
>& rXShape );
+static bool IsDiagram(const css::uno::Reference& 
rXShape);
 sal_Int32 getBulletMarginIndentation (const css::uno::Reference< 
css::beans::XPropertySet >& rXPropSet,sal_Int16 nLevel, const OUString& 
propName);
 
 static void ResetCounters();
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index b5047b80eb15..1cebeaa84ec1 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -25,10 +25,12 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -80,7 +82,13 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -99,6 +107,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2268,6 +2277,31 @@ bool DrawingML::IsGroupShape( const Reference< XShape >& 
rXShape )
 return bRet;
 }
 
+bool DrawingML::IsDiagram(const Reference& rXShape)
+{
+uno::Reference xPropSet(rXShape, uno::UNO_QUERY);
+if (!xPropSet.is())
+return false;
+
+// if the shape doesn't have the InteropGrabBag property, it's not a 
diagram
+uno::Reference xPropSetInfo = 
xPropSet->getPropertySetInfo();
+OUString aName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
+if (!xPropSetInfo->hasPropertyByName(aName))
+return false;
+
+uno::Sequence propList;
+xPropSet->getPropertyValue(aName) >>= propList;
+for (sal_Int32 nProp = 0; nProp < propList.getLength(); ++nProp)
+{
+// if we find any of the diagram components, it's a diagram
+OUString propName = propList[nProp].Name;
+if (propName == "OOXData" || propName == "OOXLayout" || propName == 
"OOXStyle"
+|| propName == "OOXColor" || propName == "OOXDrawing")
+return true;
+}
+return false;
+}
+
 sal_Int32 DrawingML::getBulletMarginIndentation (const Reference< XPropertySet 
>& rXPropSet,sal_Int16 nLevel, const OUString& propName)
 {
 if (nLevel < 0 || !GetProperty(rXPropSet, "NumberingRules"))
@@ -3984,6 +4018,292 @@ OString DrawingML::WriteWdpPicture( const OUString& 
rFileId, const Sequence< sal
 return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
 }
 
+void DrawingML::WriteDiagram(const css::uno::Reference& 
rXShape, int nDiagramId)
+{
+uno::Reference xPropSet(rXShape, uno::UNO_QUERY);
+
+uno::Reference dataDom;
+uno::Reference layoutDom;
+uno::Reference styleDom;
+uno::Reference colorDom;
+uno::Reference drawingDom;
+uno::Sequence> xDataRelSeq;
+uno::Sequence diagramDrawing;
+
+//

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

[Caolán McNamara (via logerrit)]

 sc/qa/unit/data/wks/pass/ofz14086-1.wks |binary
 sc/source/core/data/table2.cxx  |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 541ad37f2153ba0671e46c7bdf4159cee604dd5f
Author: Caolán McNamara 
AuthorDate: Sun Apr 7 21:21:37 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 09:53:45 2019 +0200

ofz#14086 another batch of oss-fuzz failures

since...

commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100

tdf#50916 Makes numbers of columns dynamic.

Change-Id: Ib4f39c03aadc41fb2a226f47e452fd66b9b34821
Reviewed-on: https://gerrit.libreoffice.org/70387
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/qa/unit/data/wks/pass/ofz14086-1.wks 
b/sc/qa/unit/data/wks/pass/ofz14086-1.wks
new file mode 100644
index ..74c229abd7bd
Binary files /dev/null and b/sc/qa/unit/data/wks/pass/ofz14086-1.wks differ
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index b049ff193b66..e737b11cab3b 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1493,7 +1493,7 @@ ScFormulaCell* ScTable::SetFormulaCell( SCCOL nCol, SCROW 
nRow, ScFormulaCell* p
 return nullptr;
 }
 
-return aCol[nCol].SetFormulaCell(nRow, pCell, sc::ConvertToGroupListening);
+return CreateColumnIfNotExists(nCol).SetFormulaCell(nRow, pCell, 
sc::ConvertToGroupListening);
 }
 
 bool ScTable::SetFormulaCells( SCCOL nCol, SCROW nRow, 
std::vector& rCells )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/qa/unit/data/qpro/pass/ofz14090-1.wb2 |binary
 sc/qa/unit/data/slk/pass/ofz14088-1.slk  |1 +
 sc/source/core/data/table2.cxx   |2 +-
 sc/source/core/data/table5.cxx   |2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 31ac398cfa30694b18240d31df17a58d699b5bf6
Author: Caolán McNamara 
AuthorDate: Sat Apr 6 14:03:11 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 09:54:03 2019 +0200

ofz#14088 ofz#14090 another batch of oss-fuzz failures

since...

commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100

tdf#50916 Makes numbers of columns dynamic.

Change-Id: I447a91468428b463480d835e1983ec11218613a0
Reviewed-on: https://gerrit.libreoffice.org/70388
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/qa/unit/data/qpro/pass/ofz14090-1.wb2 
b/sc/qa/unit/data/qpro/pass/ofz14090-1.wb2
new file mode 100644
index ..57fa24d40855
Binary files /dev/null and b/sc/qa/unit/data/qpro/pass/ofz14090-1.wb2 differ
diff --git a/sc/qa/unit/data/slk/pass/ofz14088-1.slk 
b/sc/qa/unit/data/slk/pass/ofz14088-1.slk
new file mode 100644
index ..abeaa781088e
--- /dev/null
+++ b/sc/qa/unit/data/slk/pass/ofz14088-1.slk
@@ -0,0 +1 @@
+C;Y2;ERX26;Y1;ERX25;K
ID  SCALC3
\ No newline at end of file
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index e737b11cab3b..9839763e8a14 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2555,7 +2555,7 @@ void ScTable::ApplyBlockFrame(const SvxBoxItem& 
rLineOuter, const SvxBoxInfoItem
 void ScTable::ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr 
)
 {
 if (ValidColRow(nCol,nRow))
-aCol[nCol].ApplyPattern( nRow, rAttr );
+CreateColumnIfNotExists(nCol).ApplyPattern( nRow, rAttr );
 }
 
 void ScTable::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL 
nEndCol, SCROW nEndRow,
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 5a50a7cfcdcc..a32c27ae10bd 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -1099,7 +1099,7 @@ void ScTable::StartListening( sc::StartListeningContext& 
rCxt, const ScAddress&
 if (!ValidCol(rAddress.Col()))
 return;
 
-aCol[rAddress.Col()].StartListening(rCxt, rAddress, rListener);
+CreateColumnIfNotExists(rAddress.Col()).StartListening(rCxt, rAddress, 
rListener);
 }
 
 void ScTable::EndListening( sc::EndListeningContext& rCxt, const ScAddress& 
rAddress, SvtListener& rListener )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig extras/source solenv/sanitizers

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/control/tabletree.cxx   |   54 +++--
 dbaccess/source/ui/dlg/adtabdlg.cxx|  212 ++---
 dbaccess/source/ui/dlg/tablespage.cxx  |   15 -
 dbaccess/source/ui/dlg/tablespage.hxx  |2 
 dbaccess/source/ui/inc/JoinController.hxx  |7 
 dbaccess/source/ui/inc/adtabdlg.hxx|   39 +--
 dbaccess/source/ui/inc/tabletree.hxx   |5 
 dbaccess/source/ui/querydesign/JoinController.cxx  |   53 ++---
 dbaccess/source/ui/querydesign/QueryViewSwitch.cxx |8 
 dbaccess/uiconfig/ui/tablesfilterdialog.ui |8 
 dbaccess/uiconfig/ui/tablesjoindialog.ui   |  109 +-
 extras/source/glade/libreoffice-catalog.xml.in |4 
 solenv/sanitizers/ui/dbaccess.suppr|3 
 13 files changed, 306 insertions(+), 213 deletions(-)

New commits:
commit c5edb541337054412fb1d5037de6c50397ab053f
Author: Caolán McNamara 
AuthorDate: Sat Apr 6 19:47:52 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 09:53:27 2019 +0200

weld OAddTableDlg

Change-Id: Id0c94d3ab1a19a1bb47ba1d47caa95110dab3836
Reviewed-on: https://gerrit.libreoffice.org/70353
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/dbaccess/source/ui/control/tabletree.cxx 
b/dbaccess/source/ui/control/tabletree.cxx
index b89fa02bbe60..9a4add20afaa 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -78,13 +78,12 @@ 
TableTreeListBox::TableTreeListBox(std::unique_ptr xTreeView)
 : m_xImageProvider(new ImageProvider)
 , m_bVirtualRoot(false)
 , m_bNoEmptyFolders(false)
+, m_bShowToggles(true)
+, m_nTextColumn(1)
 , m_xTreeView(std::move(xTreeView))
 {
-m_xTreeView->make_sorted();
 }
 
-VCL_BUILDER_FACTORY_CONSTRUCTOR(OTableTreeListBox, 0)
-
 void OTableTreeListBox::implSetDefaultImages()
 {
 SetDefaultExpandedEntryBmp(  ImageProvider::getFolderImage( 
DatabaseObject::TABLE ) );
@@ -383,12 +382,19 @@ void OTableTreeListBox::UpdateTableList( const Reference< 
XConnection >& _rxConn
 }
 }
 
+void TableTreeListBox::DisableCheckButtons()
+{
+m_bShowToggles = false;
+m_nTextColumn = 0;
+}
+
 void TableTreeListBox::UpdateTableList( const Reference< XConnection >& 
_rxConnection, const TNames& _rTables )
 {
 implOnNewConnection( _rxConnection );
 
 // throw away all the old stuff
 m_xTreeView->clear();
+m_xTreeView->make_unsorted();
 
 try
 {
@@ -408,8 +414,9 @@ void TableTreeListBox::UpdateTableList( const Reference< 
XConnection >& _rxConne
 std::unique_ptr xRet(m_xTreeView->make_iterator());
 m_xTreeView->insert(nullptr, -1, nullptr, &sId, nullptr, nullptr, 
nullptr, false, xRet.get());
 m_xTreeView->set_image(*xRet, sImageId, -1);
-m_xTreeView->set_toggle(*xRet, TRISTATE_FALSE, 0);
-m_xTreeView->set_text(*xRet, sRootEntryText, 1);
+if (m_bShowToggles)
+m_xTreeView->set_toggle(*xRet, TRISTATE_FALSE, 0);
+m_xTreeView->set_text(*xRet, sRootEntryText, m_nTextColumn);
 }
 
 if ( _rTables.empty() )
@@ -456,8 +463,9 @@ void TableTreeListBox::UpdateTableList( const Reference< 
XConnection >& _rxConne
 OUString sId(OUString::number(nFolderType));
 m_xTreeView->insert(xRootEntry.get(), -1, nullptr, 
&sId, nullptr, nullptr, nullptr, false, xRet.get());
 m_xTreeView->set_image(*xRet, sImageId, -1);
-m_xTreeView->set_toggle(*xRet, TRISTATE_FALSE, 0);
-m_xTreeView->set_text(*xRet, folderName, 1);
+if (m_bShowToggles)
+m_xTreeView->set_toggle(*xRet, TRISTATE_FALSE, 0);
+m_xTreeView->set_text(*xRet, folderName, 
m_nTextColumn);
 }
 }
 }
@@ -467,6 +475,8 @@ void TableTreeListBox::UpdateTableList( const Reference< 
XConnection >& _rxConne
 {
 DBG_UNHANDLED_EXCEPTION("dbaccess");
 }
+
+m_xTreeView->make_sorted();
 }
 
 bool OTableTreeListBox::isWildcardChecked(SvTreeListEntry* _pEntry)
@@ -482,8 +492,7 @@ bool OTableTreeListBox::isWildcardChecked(SvTreeListEntry* 
_pEntry)
 
 bool TableTreeListBox::isWildcardChecked(weld::TreeIter& rEntry)
 {
-//return m_xTreeView->get_text_emphasis(rEntry, 2);
-return m_xTreeView->get_text_emphasis(rEntry, 1);
+return m_xTreeView->get_text_emphasis(rEntry, m_nTextColumn);
 }
 
 void OTableTreeListBox::checkWildcard(SvTreeListEntry* _pEntry)
@@ -494,6 +503,8 @@ void OTableTreeListBox::checkWildcard(SvTreeListEntry* 
_pEntry)
 
 void TableTreeListBox::checkWildcard(weld::TreeIter& rEntry)
 {
+if (!m_bShowToggles)
+return;
 m_xTreeView->set_toggle(rEntry, TRISTATE_TRUE, 0);
 checkedButton_noBroadcast(rEnt

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

[Rasmus Jonsson (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 93cc8d83cd1f814e8b1df03de2e3c25efa4a9d16
Author: Rasmus Jonsson 
AuthorDate: Fri Apr 5 15:24:18 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon Apr 8 09:41:13 2019 +0200

tdf#124567 Print dialog: distance & margin mixed up

Change places of distance and margin input boxes (note: ids were set
correctly, they were merely labelled incorrectly).
Also moved the object in the .ui file to make it easier to read.

Change-Id: I180d7afdf9dfb483f5dbfcf7ba68c73900499807
Reviewed-on: https://gerrit.libreoffice.org/70303
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 063d961e8bca..043a27771a38 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -964,6 +964,15 @@
   
 
 
+  
+True
+  
+  
+1
+4
+  
+
+
   
 False
 start
@@ -982,15 +991,6 @@
   
   
 1
-4
-  
-
-
-  
-True
-  
-  
-1
 5
   
 
___
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' - download.lst

[Eike Rathke (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f753f044a2c3f38d8e4d4c05faf395560893e3d8
Author: Eike Rathke 
AuthorDate: Sat Apr 6 22:18:41 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Apr 8 09:34:45 2019 +0200

Upgrade to language-subtag-registry-2019-04-03

Change-Id: I4713b15061e831e1dfeccf8d59e46c0aa2ac4a18
Reviewed-on: https://gerrit.libreoffice.org/70351
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 86015855a98795d00a28f1bb65c41df947563d66)
Reviewed-on: https://gerrit.libreoffice.org/70355
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/download.lst b/download.lst
index 4149c8fea800..24059c694d3c 100644
--- a/download.lst
+++ b/download.lst
@@ -130,8 +130,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export LIBJPEG_TURBO_SHA256SUM := 
b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523
 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz
-export LANGTAGREG_SHA256SUM := 
14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878
-export LANGTAGREG_TARBALL := language-subtag-registry-2018-04-23.tar.bz2
+export LANGTAGREG_SHA256SUM := 
a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d
+export LANGTAGREG_TARBALL := language-subtag-registry-2019-04-03.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - download.lst

[Eike Rathke (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6079b5abbd9117e9b01046f2370666e74acab23
Author: Eike Rathke 
AuthorDate: Sat Apr 6 22:18:41 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Apr 8 09:34:16 2019 +0200

Upgrade to language-subtag-registry-2019-04-03

Change-Id: I4713b15061e831e1dfeccf8d59e46c0aa2ac4a18
Reviewed-on: https://gerrit.libreoffice.org/70351
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 86015855a98795d00a28f1bb65c41df947563d66)
Reviewed-on: https://gerrit.libreoffice.org/70354
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/download.lst b/download.lst
index 877497006626..321284d996ed 100644
--- a/download.lst
+++ b/download.lst
@@ -132,8 +132,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export LIBJPEG_TURBO_SHA256SUM := 
b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523
 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz
-export LANGTAGREG_SHA256SUM := 
14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878
-export LANGTAGREG_TARBALL := language-subtag-registry-2018-04-23.tar.bz2
+export LANGTAGREG_SHA256SUM := 
a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d
+export LANGTAGREG_TARBALL := language-subtag-registry-2019-04-03.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: questions about LibreOffice API version and jars available on https://mvnrepository.com

[LORENZO Vincent]

Hello Miklos, 
Thank you for your answer. 
Yes, of course, I could compile it myself, but I would prefer avoid 
this step  :-).
I think I understood, but please, could you explicit what means TDF ?

Regards, 
--
Vincent Lorenzo

-Message d'origine-
De : Miklos Vajna [mailto:vmik...@collabora.com] 
Envoyé : mercredi 3 avril 2019 09:13
À : LORENZO Vincent 
Cc : libreoffice@lists.freedesktop.org
Objet : Re: questions about LibreOffice API version and jars available on 
https://mvnrepository.com

Hi Vincent,

On Tue, Apr 02, 2019 at 10:46:36AM +, LORENZO Vincent 
 wrote:
> 1.   Do you think I will get trouble in this configuration ? Should I use 
> LibreOffice 5.4.2 instead of 6.0.x ?

Most probably you won't get into trouble, changes to the UNO API are kept to a 
minimum. So if you build against older UNO API and use a newer LibreOffice, it 
should be mostly fine.

> 2.   Do you know how I can find these jars in a newer version ? I can't 
> found more recent ones.

Either build the code yourself (this is the dev list after all) or just extract 
them from a TDF-provided binary.

Regards,

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

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

[Jason Burns (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx |   11 
+++---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 642bd339576537d6561735273bda64dd44858960
Author: Jason Burns 
AuthorDate: Sun Apr 7 21:23:58 2019 -0400
Commit: Noel Grandin 
CommitDate: Mon Apr 8 09:21:23 2019 +0200

tdf#112689: replace OUStringBuffer with OUString in one file

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

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
old mode 100644
new mode 100755
index ba8c36da83ce..49873f8e5841
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
@@ -197,13 +197,10 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 
columnIndex)
 auto nColCount = m_fields.size();
 if (columnIndex < 1 || columnIndex > static_cast(nColCount))
 {
-OUStringBuffer buf;
-buf.append("Column index out of range (expected 1 to ");
-buf.append(sal_Int32(nColCount));
-buf.append(", got ");
-buf.append(columnIndex);
-buf.append('.');
-throw SQLException(buf.makeStringAndClear(), *this, OUString(), 1, 
Any());
+OUString str = "Column index out of range (expected 1 to "
+   + OUString::number(sal_Int32(nColCount)) + ", got "
+   + OUString::number(columnIndex) + ".";
+throw SQLException(str, *this, OUString(), 1, Any());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits