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

[Noel Grandin]

 include/svx/gridctrl.hxx   |2 +-
 svx/source/fmcomp/gridctrl.cxx |   10 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 65b7024b982c10b7998e7cb0fb2b8165b7a8ffb6
Author: Noel Grandin 
Date:   Fri May 4 16:45:37 2018 +0200

loplugin:useuniqueptr in DbGridControl

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

diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 80c2b6aad5ff..32bbd965b579 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -255,7 +255,7 @@ private:
 void*   m_pFieldListeners;
 // property listeners for field values
 
-DisposeListenerGridBridge*  m_pCursorDisposeListener;
+std::unique_ptr  m_pCursorDisposeListener;
 // need to know about the diposing of the seek cursor
 // construct analogous to the data source proplistener/multiplexer 
above :
 // DisposeListenerGridBridge is a bridge from FmXDisposeListener which 
I don't want to be derived from
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 8093bddd31b9..97d156337440 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1013,11 +1013,7 @@ void DbGridControl::dispose()
 osl::MutexGuard aGuard(m_aDestructionSafety);
 if (m_pFieldListeners)
 DisconnectFromFields();
-if (m_pCursorDisposeListener)
-{
-delete m_pCursorDisposeListener;
-m_pCursorDisposeListener = nullptr;
-}
+m_pCursorDisposeListener.reset();
 }
 
 if (m_nDeleteEvent)
@@ -1442,7 +1438,7 @@ void DbGridControl::setDataSource(const Reference< 
XRowSet >& _xCursor, DbGridCo
 RemoveRows();
 DisconnectFromFields();
 
-DELETEZ(m_pCursorDisposeListener);
+m_pCursorDisposeListener.reset();
 
 {
 ::osl::MutexGuard aGuard(m_aAdjustSafety);
@@ -1640,7 +1636,7 @@ void DbGridControl::setDataSource(const Reference< 
XRowSet >& _xCursor, DbGridCo
 
 // start listening on the seek cursor
 if (m_pSeekCursor)
-m_pCursorDisposeListener = new DisposeListenerGridBridge(*this, 
Reference< XComponent > (Reference< XInterface >(*m_pSeekCursor), UNO_QUERY));
+m_pCursorDisposeListener.reset(new DisposeListenerGridBridge(*this, 
Reference< XComponent > (Reference< XInterface >(*m_pSeekCursor), UNO_QUERY)));
 }
 
 void DbGridControl::RemoveColumns()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 sw/inc/ndtxt.hxx |1 
 sw/inc/node.hxx  |   15 +--
 sw/source/core/docnode/node.cxx  |  191 ++-
 sw/source/core/txtnode/ndtxt.cxx |  134 ++-
 4 files changed, 168 insertions(+), 173 deletions(-)

New commits:
commit 83243003b46dfb258c2b41049b0e1cb82a2d7ddb
Author: Bjoern Michaelsen 
Date:   Fri May 4 08:44:47 2018 +0200

use WriterMultiListener instead of SwDepend in SwContentNode

- also move SwContentNode and SwTextNode from
  Modify to SwClientNotify
- this removes the last public use of SwDepend, which should now become
  an implementation detail of WriterMultiListener

Change-Id: I5ae3a7a091fb2b6bb3bce44a0adc4f41f07a0c30
Reviewed-on: https://gerrit.libreoffice.org/53835
Tested-by: Jenkins 
Reviewed-by: Björn Michaelsen 

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 269e66ed7516..56fbc4189371 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -198,7 +198,6 @@ public:
 
 protected:
 /// for hanging TextFormatCollections somewhere else (Outline-Numbering!)
-virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
 virtual void SwClientNotify( const SwModify&, const SfxHint& ) override;
 
 public:
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 27078a918be4..1862bdf64d64 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -349,9 +349,8 @@ private:
 class SW_DLLPUBLIC SwContentNode: public SwModify, public SwNode, public 
SwIndexReg
 {
 
-//FEATURE::CONDCOLL
-std::unique_ptr m_pCondColl;
-//FEATURE::CONDCOLL
+sw::WriterMultiListener m_aCondCollListener;
+SwFormatColl* m_pCondColl;
 mutable bool mbSetModifyAtAttr;
 
 protected:
@@ -372,7 +371,7 @@ protected:
SwAttrSet (handle): */
 sal_uInt16 ClearItemsFromAttrSet( const std::vector& rWhichIds 
);
 
-virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) 
override;
+virtual void SwClientNotify( const SwModify&, const SfxHint& rHint) 
override;
 
 public:
 
@@ -708,14 +707,14 @@ inline const SwDoc* SwNode::GetDoc() const
 
 inline SwFormatColl* SwContentNode::GetCondFormatColl() const
 {
-return m_pCondColl ? 
static_cast(m_pCondColl->GetRegisteredIn()) : nullptr;
+return m_pCondColl;
 }
 
 inline SwFormatColl& SwContentNode::GetAnyFormatColl() const
 {
-return m_pCondColl && m_pCondColl->GetRegisteredIn()
-? *static_cast(m_pCondColl->GetRegisteredIn())
-: *const_cast(static_cast(GetRegisteredIn()));
+return m_pCondColl
+? *m_pCondColl
+: *const_cast(static_cast(GetRegisteredIn()));
 }
 
 inline const SwAttrSet& SwContentNode::GetSwAttrSet() const
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 4253cd7ec1f4..337483f81de1 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1002,6 +1002,7 @@ SwContentNode::SwContentNode( const SwNodeIndex &rWhere, 
const SwNodeType nNdTyp
 SwFormatColl *pColl )
 : SwModify( pColl ), // CursorsShell, FrameFormat,
 SwNode( rWhere, nNdType ),
+m_aCondCollListener( *this ),
 m_pCondColl( nullptr ),
 mbSetModifyAtAttr( false )
 {
@@ -1013,91 +1014,94 @@ SwContentNode::~SwContentNode()
 // Thus, we need to delete all Frames in the dependency list.
 DelFrames(false);
 
-m_pCondColl.reset();
+m_aCondCollListener.EndListeningAll();
+m_pCondColl = nullptr;
 
 if ( mpAttrSet.get() && mbSetModifyAtAttr )
 const_cast(static_cast(mpAttrSet.get()))->SetModifyAtAttr( nullptr );
 }
 
-void SwContentNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* 
pNewValue )
+void SwContentNode::SwClientNotify( const SwModify&, const SfxHint& rHint)
 {
-sal_uInt16 nWhich = pOldValue ? pOldValue->Which() :
-pNewValue ? pNewValue->Which() : 0 ;
-
-switch( nWhich )
+if (auto pLegacyHint = dynamic_cast(&rHint))
 {
-case RES_OBJECTDYING :
-if (pNewValue)
-{
-SwFormat * pFormat = static_cast( static_cast(pNewValue)->pObject );
+const sal_uInt16 nWhich = pLegacyHint->m_pOld
+? pLegacyHint->m_pOld->Which()
+: pLegacyHint->m_pNew
+? pLegacyHint->m_pNew->Which()
+: 0 ;
 
-// Do not mangle pointers if it is the upper-most format!
-if( GetRegisteredIn() == pFormat )
-{
-if( pFormat->GetRegisteredIn() )
+bool bSetParent = false;
+bool bCalcHidden = false;
+SwFormatColl* pFormatColl = nullptr;
+switch(nWhich)
+{
+case RES_OBJECTDYING:
 {
-// If Parent, register anew in the new Parent
-pFormat->GetRegisteredIn()->Add( this );
-if ( GetpSwAttrSet() )
-AttrSetHandl

[Libreoffice-commits] core.git: instsetoo_native/inc_common

[andreas kainz]

 instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico |binary
 1 file changed

New commits:
commit 0b56585cfc047decf25c648d3cccfc3c7b594a86
Author: andreas kainz 
Date:   Fri May 4 23:06:20 2018 +0200

Windows installer icon update newfolder.ico

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

diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico
index 1b5128f8f296..e161bed339bb 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/java

[Damjan Jovanovic]

 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java 
  |2 
 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java   
  |4 
 
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
  |4 
 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java 
  |2 
 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLArray.java   
  |4 
 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLBlob.java
  |4 
 
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLCallableStatement.java
 |1 
 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLClob.java
  |4 
 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLConnection.java  
  |   78 +-
 
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLDatabaseMetaData.java
  |7 
 
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLPreparedStatement.java
 |1 
 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLRef.java 
  |2 
 
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLResultSetMetaData.java
 |4 
 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLStatement.java   
  |3 
 
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLStatementBase.java
 |1 
 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ReaderInputStream.java  
  |2 
 connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/Tools.java  
  |   52 ++
 17 files changed, 93 insertions(+), 82 deletions(-)

New commits:
commit 87e19c1cab7e6dd9ddd7cefdc670afd5ecb69df5
Author: Damjan Jovanovic 
Date:   Sat May 5 03:59:10 2018 +

Move the PropertyValue helper methods to the tools class for now.

Some "@Override" and "final" cleanups as per NetBeans.

Patch by: me

diff --git 
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java
 
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java
index 07e8b6762d66..5336ba0e7312 100644
--- 
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java
+++ 
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 public class BoundedInputStream extends InputStream {
-private InputStream is;
+private final InputStream is;
 private long remaining;
 
 public BoundedInputStream(InputStream is, long max) {
diff --git 
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java 
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java
index fda4063ecdae..6bdd506af263 100644
--- a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java
+++ b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java
@@ -59,8 +59,8 @@ import com.sun.star.util.XMacroExpander;
  */
 public class ClassMap {
 public static class ClassLoaderAndClass {
-private ClassLoader classLoader;
-private Class classObject;
+private final ClassLoader classLoader;
+private final Class classObject;
 
 public ClassLoaderAndClass(ClassLoader classLoader, Class 
classObject) {
 this.classLoader = classLoader;
diff --git 
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
 
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
index 4feef8dac6ba..43bf01a7599a 100644
--- 
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
+++ 
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
@@ -21,8 +21,8 @@
 package com.sun.star.comp.sdbc;
 
 public class ContextClassLoaderScope implements AutoCloseable {
-private Thread currentThread;
-private ClassLoader oldClassLoader;
+private final Thread currentThread;
+private final ClassLoader oldClassLoader;
 
 public ContextClassLoaderScope(ClassLoader classLoader) {
 currentThread = Thread.currentThread();
diff --git 
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java 
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java
index 350c2a00c52d..6749bf874b32 100644
--- a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java
+++ b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java
@@ -44,7 +44,7 @@ public class JDBCDriver extends ComponentBase implements 
XServiceInfo, XDriver {
 "com.sun.star.sdbc.Driver"
 };
 private XComponentContext context;
-private ResourceBasedEventLogger logger;
+private final ResourceBasedEventLogger logger;
 
 public static XSingleComponentFactory __getComponentFactory(String 
implName) {
 XSingleComponentFactory xSingleCo

Re: How to make a locale available for CTL text

[Khaled Hosny]

On Fri, May 04, 2018 at 11:33:49AM +0200, Eike Rathke wrote:
> Hi Khaled,
> 
> On Sunday, 2018-04-29 11:00:19 +0200, Khaled Hosny wrote:
> 
> > > Does it have to be [ms] and [ms-Arab] or could it be {[ms] or [zsm] or
> > > [zlm]} and {[zsm-Arab] or [zlm-Arab] (or maybe [ms-Arab])}?
> > 
> > I don’t really know. HarfBuzz expects a BCP 47 language tag, and I use
> > LanguageTag::getBcp47() to get that, so as long as it gives me “ms” all
> > good (the script part is redundant for me, because that is detected from
> > the text string and passed independently to HarfBuzz).
> 
> That should do then:
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=10a047ae8a6e5c47edc1ca11ed573f340b249f61

Works like a charm, thanks!

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

Re: Crash test update

[Caolán McNamara]

On Fri, 2018-05-04 at 17:42 +, Crashtest VM wrote:
> New crashtest update available at http://dev-builds.libreoffice.org/c
> rashtest/30a5e1f9b9d7cbfdb8f689372d4ce635e287f760/

This was a special run with 4696d3728f0aba1087001bc543fc0867dd0ebdda
reverted, I'll do a normal run with master now
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 cui/uiconfig/ui/colorpage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6bbaed858821bc32bd1fec6915f72bfc093b0a16
Author: Caolán McNamara 
Date:   Fri May 4 16:25:22 2018 +0100

Resolves: tdf#117406 cannot tab into colorsets, cause can_focus was False

which is a problem since

commit 3014e5f362c77c546452d45fcde96fcbae27235e
Author: Caolán McNamara 
Date:   Sun Apr 29 21:15:22 2018 +0100

hook up can-focus to ability to tab into the widget

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

diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index ba1b1b836150..915092fe3c89 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -111,7 +111,7 @@
 
   
 True
-False
+True
 True
 True
   
@@ -231,7 +231,7 @@
 
   
 True
-False
+True
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 include/vcl sfx2/source starmath/source sw/inc sw/source sw/uiconfig vcl/source vcl/unx

[Caolán McNamara]

 include/sfx2/tabdlg.hxx|4 
 include/vcl/weld.hxx   |6 
 sfx2/source/dialog/tabdlg.cxx  |5 
 starmath/source/dialog.cxx |4 
 sw/inc/swabstdlg.hxx   |2 
 sw/source/ui/dialog/swdlgfact.cxx  |5 
 sw/source/ui/dialog/swdlgfact.hxx  |2 
 sw/source/ui/misc/num.cxx  |8 
 sw/source/ui/misc/outline.cxx  |   94 +++-
 sw/source/uibase/inc/num.hxx   |4 
 sw/source/uibase/inc/outline.hxx   |   20 -
 sw/source/uibase/uiview/view0.cxx  |2 
 sw/uiconfig/swriter/ui/outlinenumbering.ui |  268 +++--
 sw/uiconfig/swriter/ui/outlinenumberingpage.ui |5 
 sw/uiconfig/swriter/ui/outlinepositionpage.ui  |   20 +
 vcl/source/app/salvtables.cxx  |   20 +
 vcl/source/window/builder.cxx  |2 
 vcl/unx/gtk3/gtk3gtkinst.cxx   |  174 +---
 18 files changed, 379 insertions(+), 266 deletions(-)

New commits:
commit 0920b04bca3d58d89b026bcf999ea43d0e855715
Author: Caolán McNamara 
Date:   Fri May 4 14:53:11 2018 +0100

weld SwOutlineTabDialog

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

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 2d9b449112d5..cf7ecc4022bb 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -279,6 +279,8 @@ public:
 voidRemoveTabPage( const OString& rName ); // Name of the 
label for the page in the notebook .ui
 
 voidSetCurPageId(const OString& rName);
+OString GetCurPageId() const;
+SfxTabPage* GetCurTabPage() const { return 
GetTabPage(GetCurPageId()); }
 
 // may provide local slots converted by Map
 const sal_uInt16*   GetInputRanges( const SfxItemPool& );
@@ -287,6 +289,8 @@ public:
 
 const weld::Button& GetOKButton() const { return *m_xOKBtn; }
 weld::Button&   GetOKButton() { return *m_xOKBtn; }
+const weld::Button& GetCancelButton() const { return *m_xCancelBtn; }
+weld::Button&   GetCancelButton() { return *m_xCancelBtn; }
 
 const weld::Button* GetUserButton() const { return m_xUserBtn.get(); }
 weld::Button*   GetUserButton() { return m_xUserBtn.get(); }
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 6c1078a04457..448a592fb15c 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -365,8 +365,10 @@ protected:
 
 public:
 void connect_selected(const Link& rLink) { 
m_aSelectHdl = rLink; }
-
-virtual void set_active(const OString& rIdent, bool bActive) = 0;
+virtual void set_item_active(const OString& rIdent, bool bActive) = 0;
+virtual void set_item_label(const OString& rIdent, const OUString& rLabel) 
= 0;
+virtual void set_item_help_id(const OString& rIdent, const OString& 
rHelpId) = 0;
+virtual OString get_item_help_id(const OString& rIdent) const = 0;
 };
 
 class VCL_DLLPUBLIC ToggleButton : virtual public Button
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 8c4e04983358..160af8d6af54 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -2015,6 +2015,11 @@ void SfxTabDialogController::SetCurPageId(const OString& 
rIdent)
 m_xTabCtrl->set_current_page(rIdent);
 }
 
+OString SfxTabDialogController::GetCurPageId() const
+{
+return m_xTabCtrl->get_current_page_ident();
+}
+
 short SfxTabDialogController::execute()
 {
 Start_Impl();
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 7713cd475b05..6843cebfaea8 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -725,7 +725,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
 if (nActiveCategory == 5)
 bScaleAllBrackets = m_xCheckBox1->get_active();
 
-m_xMenuButton->set_active("menuitem" + OString::number(nActiveCategory 
+ 1), false);
+m_xMenuButton->set_item_active("menuitem" + 
OString::number(nActiveCategory + 1), false);
 }
 
 // activation/deactivation of the associated controls depending on the 
chosen category
@@ -784,7 +784,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
 m_xMetricField4->set_sensitive( bChecked );
 }
 
-m_xMenuButton->set_active("menuitem" + OString::number(nCategory + 1), 
true);
+m_xMenuButton->set_item_active("menuitem" + OString::number(nCategory + 
1), true);
 m_xFrame->set_label(Categories[nCategory]->GetName());
 
 nActiveCategory = nCategory;
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 3ed9b295a0b3..67aecd817661 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -463,7 +463,7 @@ public:
 virtual VclP

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

[Caolán McNamara]

 include/vcl/weld.hxx  |5 
 sw/source/ui/misc/num.cxx |  453 ++
 sw/source/uibase/inc/num.hxx  |   92 ++---
 sw/uiconfig/swriter/ui/outlinepositionpage.ui |  128 +++
 vcl/source/app/salvtables.cxx |   12 
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   17 
 6 files changed, 336 insertions(+), 371 deletions(-)

New commits:
commit 2cab4acbe2aaaee6e5b9afeb68f3e555ecff2ec7
Author: Caolán McNamara 
Date:   Fri May 4 12:24:24 2018 +0100

weld SwNumPositionTabPage

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 9e58e585a533..6c1078a04457 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -309,6 +309,7 @@ public:
 //by index
 virtual int get_selected_index() const = 0;
 virtual void select(int pos) = 0;
+virtual void unselect(int pos) = 0;
 virtual void remove(int pos) = 0;
 virtual void set_top_entry(int pos) = 0;
 virtual std::vector get_selected_rows() const = 0;
@@ -334,6 +335,10 @@ public:
 virtual int find_id(const OUString& rId) const = 0;
 OUString get_selected_id() const { return get_id(get_selected_index()); }
 void select_id(const OUString& rId) { select(find_id(rId)); }
+
+//all of them
+void select_all() { unselect(-1); }
+void unselect_all() { select(-1); }
 };
 
 class VCL_DLLPUBLIC Button : virtual public Container
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 2f7bb7c41fcf..28b4ba9ca185 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -54,10 +54,8 @@ static bool bLastRelative = false;
 //dialog to this one, except with a different preview window impl.
 //TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be
 //merged
-SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent,
-   const SfxItemSet& rSet)
-: SfxTabPage(pParent, "OutlinePositionPage",
-"modules/swriter/ui/outlinepositionpage.ui", &rSet)
+SwNumPositionTabPage::SwNumPositionTabPage(TabPageParent pParent, const 
SfxItemSet& rSet)
+: SfxTabPage(pParent, "modules/swriter/ui/outlinepositionpage.ui", 
"OutlinePositionPage", &rSet)
 , pActNum(nullptr)
 , pSaveNum(nullptr)
 , pWrtSh(nullptr)
@@ -67,94 +65,73 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* 
pParent,
 , bPreset(false)
 , bInInintControl(false)
 , bLabelAlignmentPosAndSpaceModeActive(false)
+, m_xLevelLB(m_xBuilder->weld_tree_view("levellb"))
+, m_xPositionFrame(m_xBuilder->weld_widget("numberingframe"))
+, m_xDistBorderFT(m_xBuilder->weld_label("indent"))
+, m_xDistBorderMF(m_xBuilder->weld_metric_spin_button("indentmf", 
FUNIT_CM))
+, m_xRelativeCB(m_xBuilder->weld_check_button("relative"))
+, m_xIndentFT(m_xBuilder->weld_label("numberingwidth"))
+, m_xIndentMF(m_xBuilder->weld_metric_spin_button("numberingwidthmf", 
FUNIT_CM))
+, m_xDistNumFT(m_xBuilder->weld_label("numdist"))
+, m_xDistNumMF(m_xBuilder->weld_metric_spin_button("numdistmf", FUNIT_CM))
+, m_xAlignFT(m_xBuilder->weld_label("numalign"))
+, m_xAlignLB(m_xBuilder->weld_combo_box_text("numalignlb"))
+, m_xLabelFollowedByFT(m_xBuilder->weld_label("numfollowedby"))
+, m_xLabelFollowedByLB(m_xBuilder->weld_combo_box_text("numfollowedbylb"))
+, m_xListtabFT(m_xBuilder->weld_label("at"))
+, m_xListtabMF(m_xBuilder->weld_metric_spin_button("atmf", FUNIT_CM))
+, m_xAlign2FT(m_xBuilder->weld_label("num2align"))
+, m_xAlign2LB(m_xBuilder->weld_combo_box_text("num2alignlb"))
+, m_xAlignedAtFT(m_xBuilder->weld_label("alignedat"))
+, m_xAlignedAtMF(m_xBuilder->weld_metric_spin_button("alignedatmf", 
FUNIT_CM))
+, m_xIndentAtFT(m_xBuilder->weld_label("indentat"))
+, m_xIndentAtMF(m_xBuilder->weld_metric_spin_button("indentatmf", 
FUNIT_CM))
+, m_xStandardPB(m_xBuilder->weld_button("standard"))
+, m_xPreviewWIN(new 
SwNumberingPreview(m_xBuilder->weld_drawing_area("preview")))
 {
-get(m_pLevelLB, "levellb");
-m_pLevelLB->EnableMultiSelection(true);
-get(m_pPositionFrame, "numberingframe");
-get(m_pDistBorderFT, "indent");
-get(m_pDistBorderMF, "indentmf");
-get(m_pRelativeCB, "relative");
-get(m_pIndentFT, "numberingwidth");
-get(m_pIndentMF, "numberingwidthmf");
-get(m_pDistNumFT, "numdist");
-get(m_pDistNumMF, "numdistmf");
-get(m_pAlignFT, "numalign");
-get(m_pAlignLB, "numalignlb");
-
-get(m_pLabelFollowedByFT, "numfollowedby");
-get(m_pLabelFollowedByLB, "numfollowedbylb");
-get(m_pListtabFT, "at");
-get(m_pListtabMF, "atmf");
-get(m_pAlign2FT, "num2align");
-get(m_pAlign2LB, "num2alignlb");
-get(m_pAlignedAtFT,

[Libreoffice-commits] core.git: include/tools tools/inc tools/Library_tl.mk tools/source

[Takeshi Abe]

 include/tools/datetime.hxx   |2 
 tools/Library_tl.mk  |1 
 tools/inc/systemdatetime.hxx |   26 +++
 tools/source/datetime/datetime.cxx   |   17 
 tools/source/datetime/systemdatetime.cxx |  109 +++
 tools/source/datetime/tdate.cxx  |   35 -
 tools/source/datetime/ttime.cxx  |   85 +---
 7 files changed, 175 insertions(+), 100 deletions(-)

New commits:
commit 5103c6a405e93bb05018ab7c89e7e9446c740aaa
Author: Takeshi Abe 
Date:   Sun Apr 29 05:20:47 2018 +0900

tools: Avoid looking up system clock twice to get DateTime

DateTime::DateTime(DateTimeInitSystem) had initialized Date and
Time separately, which causes a slight possibility that it could
get a wrong datetime with almost 24 hours delay when it went beyond
midnight. E.g., the date part was of the previous day while the
time part was 00:00:00.xxx of the next day.

This also reduces duplicate code by sharing GetSystemDateTime().

Change-Id: I352d90f468f5cbc70e7936a337bed97365baa06c
Reviewed-on: https://gerrit.libreoffice.org/53612
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/include/tools/datetime.hxx b/include/tools/datetime.hxx
index 02729e6a0e1a..7b78b29bdfc5 100644
--- a/include/tools/datetime.hxx
+++ b/include/tools/datetime.hxx
@@ -40,7 +40,7 @@ public:
 };
 
 explicit DateTime( DateTimeInitEmpty ) : Date( Date::EMPTY 
), Time( Time::EMPTY ) {}
-explicit DateTime( DateTimeInitSystem ) : Date( 
Date::SYSTEM ), Time( Time::SYSTEM ) {}
+explicit DateTime( DateTimeInitSystem );
 DateTime( const DateTime& rDateTime ) :
 Date( rDateTime ), Time( rDateTime ) {}
 DateTime( const Date& rDate ) : Date( rDate ), Time(0) {}
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 2aee438fb2e9..c524a38084aa 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,tl,\
 $(eval $(call gb_Library_add_exception_objects,tl,\
 tools/source/datetime/datetime \
 tools/source/datetime/datetimeutils \
+tools/source/datetime/systemdatetime \
 tools/source/datetime/tdate \
 tools/source/datetime/ttime \
 tools/source/debug/debug \
diff --git a/tools/inc/systemdatetime.hxx b/tools/inc/systemdatetime.hxx
new file mode 100644
index ..cc74eae61340
--- /dev/null
+++ b/tools/inc/systemdatetime.hxx
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#ifndef INCLUDED_TOOLS_INC_SYSTEMDATETIME_H
+#define INCLUDED_TOOLS_INC_SYSTEMDATETIME_H
+
+#include 
+
+constexpr sal_Int64 SEC_MASK = SAL_CONST_INT64(10);
+constexpr sal_Int64 MIN_MASK = SAL_CONST_INT64(1000);
+constexpr sal_Int64 HOUR_MASK = SAL_CONST_INT64(10);
+
+/** Get current local timestamp.
+Both pDate and pTime can be null.
+Returns true if succeeded, false otherwse.
+ */
+bool GetSystemDateTime(sal_Int32* pDate, sal_Int64* pTime);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/tools/source/datetime/datetime.cxx 
b/tools/source/datetime/datetime.cxx
index e3faf45fa495..1dc2b79cb990 100644
--- a/tools/source/datetime/datetime.cxx
+++ b/tools/source/datetime/datetime.cxx
@@ -19,6 +19,23 @@
 #include 
 #include 
 
+#include 
+
+DateTime::DateTime(DateTimeInitSystem)
+: Date( Date::EMPTY )
+, Time( Time::EMPTY )
+{
+sal_Int32 nD = 0;
+sal_Int64 nT = 0;
+if ( GetSystemDateTime( &nD, &nT ) )
+{
+Date::operator=( Date( nD ) );
+SetTime( nT );
+}
+else
+Date::operator=( Date( 1, 1, 1900 ) ); // Time::nTime is already 0
+}
+
 DateTime::DateTime( const css::util::DateTime& rDateTime )
   : Date( rDateTime.Day, rDateTime.Month, rDateTime.Year ),
 Time( rDateTime.Hours, rDateTime.Minutes, rDateTime.Seconds, 
rDateTime.NanoSeconds )
diff --git a/tools/source/datetime/systemdatetime.cxx 
b/tools/source/datetime/systemdatetime.cxx
new file mode 100644
index ..40e4edfd05c3
--- /dev/null
+++ b/tools/source/datetime/systemdatetime.cxx
@@ -0,0 +1,109 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/30a5e1f9b9d7cbfdb8f689372d4ce635e287f760/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Gabor Kelemen]

 source/text/shared/01/0620.xhp |   60 +
 1 file changed, 29 insertions(+), 31 deletions(-)

New commits:
commit a536178daab521449620a80459371fa2bb76b295
Author: Gabor Kelemen 
Date:   Fri May 4 19:13:27 2018 +0200

Fix ahelps and bookmarks on Hangul/Hanja conversion page

Also drop a useless paragraph about the Close button

Change-Id: I86cec352443ac5761965974a306973139c7aa4da
Reviewed-on: https://gerrit.libreoffice.org/53861
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/shared/01/0620.xhp 
b/source/text/shared/01/0620.xhp
index d8a5538ad..7dbbb04c4 100644
--- a/source/text/shared/01/0620.xhp
+++ b/source/text/shared/01/0620.xhp
@@ -34,78 +34,76 @@
 converting;Hangul/Hanja
 Hangul/Hanja
 
+
 
 Hangul/Hanja 
Conversion
-Converts the selected Korean text from Hangul 
to Hanja or from Hanja to Hangul. The menu command can only be called 
if you enable Asian language support under %PRODUCTNAME - 
PreferencesTools - 
Options - Language Settings - 
Languages, and if a text formatted in Korean language is 
selected.
+Converts the selected Korean text from Hangul to Hanja or from Hanja to 
Hangul. The menu command can only be called if you enable Asian 
language support under %PRODUCTNAME - 
PreferencesTools - 
Options - Language Settings - 
Languages, and if a text formatted in Korean language is 
selected.
 
 
   
 
-
+
 Original
-Displays the current selection.
-
+Displays the current selection.
+
 Word
-Displays the first replacement suggestion from 
the dictionary. You can edit the suggested word or enter another word. 
Click the Find button to replace your original word with the 
corresponding replacement word.
+Displays the first replacement suggestion from the dictionary. 
You can edit the suggested word or enter another word. Click the 
Find button to replace your original word with the corresponding 
replacement word.
 
 Find
-Finds your Hangul input 
in the dictionary and replaces it with the corresponding Hanja. Click 
Ignore to cancel the find function.
+Finds your Hangul input in the dictionary and replaces it with the 
corresponding Hanja. Click Ignore to cancel the find 
function.
 
 
 
 Suggestions
-Displays all 
available replacements in the dictionary. If the Replace by 
character box is enabled, you see a grid of characters. If the 
Replace by character box is not checked, you see a list of 
words.
+Displays all available replacements in the dictionary. If the 
Replace by character box is enabled, you see a grid of characters. 
If the Replace by character box is not checked, you see a list of 
words.
 Format
 Click the 
format to display the replacements.
 
 Hangul/Hanja
-The 
original characters are replaced by the suggested 
characters.
+The original characters are replaced by the suggested 
characters.
 
 Hanja 
(Hangul)
-The 
Hangul part will be displayed in brackets after the Hanja 
part.
+The Hangul part will be displayed in brackets after the Hanja 
part.
 
 Hangul 
(Hanja)
-The 
Hanja part will be displayed in brackets after the Hangul 
part.
+The Hanja part will be displayed in brackets after the Hangul 
part.
 
 Hanja 
as ruby text aboveTo translators: this describes the visible graphical 
control - it is not part of the sources
-The Hanja 
part will be displayed as ruby text above the Hangul part.
-
+The Hanja part will be displayed as ruby text above the Hangul 
part.
+
 Hanja 
as ruby text belowTo translators: this describes the visible graphical 
control - it is not part of the sources
-The Hanja 
part will be displayed as ruby text below the Hangul part.
+The Hanja part will be displayed as ruby text below the Hangul 
part.
 
 Hangul 
as ruby text aboveTo translators: this describes the visible graphical 
control - it is not part of the sources
-The Hangul 
part will be displayed as ruby text above the Hanja part.
+The Hangul part will be displayed as ruby text above the Hanja 
part.
 
 Hangul 
as ruby text belowTo translators: this describes the visible graphical 
control - it is not part of the sources
-The Hangul 
part will be displayed as ruby text below the Hanja part.
+The Hangul part will be displayed as ruby text below the Hanja 
part.
 Conversion
 Normally in a 
mixed text selection made of Hangul and Hanja characters, all Hangul characters 
will be converted to Hanja and all Hanja characters will be converted to 
Hangul. If you want to convert a mixed text selection only in one direction, 
use the following conversion options.
 
 Hangul 
only
-Check to convert 
only Hangul. Do not convert Hanja.
+Check to convert only Hangul. Do not convert Hanja.
 
 Hanja 
only
-Check to convert only 
Hanja. Do not convert Hangul.
-
+Check to convert only Hanja. Do not convert Hangul.
+
 Ignore
-No changes will be made to the current 
selection. The next word or character will be selected for 
conversion.
-
+No changes will be made to the cu

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 7b0ff01d1bf718c5b439b5cddfcdfe051271b28c
Author: Gabor Kelemen 
Date:   Fri May 4 19:13:27 2018 +0200

Updated core
Project: help  a536178daab521449620a80459371fa2bb76b295

Fix ahelps and bookmarks on Hangul/Hanja conversion page

Also drop a useless paragraph about the Close button

Change-Id: I86cec352443ac5761965974a306973139c7aa4da
Reviewed-on: https://gerrit.libreoffice.org/53861
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 2c8cfc7de084..a536178daab5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2c8cfc7de084dc055f69fcd39f09dbb815e01764
+Subproject commit a536178daab521449620a80459371fa2bb76b295
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Thanks to Developers, Free Meditation Book

[Jivan Amara]

I'm wrapping up  the 2nd edition of my book using libreoffice writer &
would like to offer a free eBook copy or at-cost paperback to any of the
developers as a thank you.  The book is "Meditation, Mind and Body" and
you can see details at http://meditate.jivanamara.net or on Amazon.

Anyone interested please send a message to libreoffice-d...@jivanamara.net.

A big thanks to all  of you.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 editeng/source/items/paraitem.cxx |   17 +
 include/editeng/tstpitem.hxx  |2 ++
 2 files changed, 19 insertions(+)

New commits:
commit dff25d295f265f361e2e97cdf28f0e70a923adb5
Author: Miklos Vajna 
Date:   Fri May 4 17:47:50 2018 +0200

Related: tdf#117245 editeng: cover tab stop items for sw doc model xml ...

... dump purposes

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

diff --git a/editeng/source/items/paraitem.cxx 
b/editeng/source/items/paraitem.cxx
index 625db860123d..338c9b51e161 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -692,6 +693,15 @@ void SvxTabStop::fillDecimal() const
 m_cDecimal = SvtSysLocale().GetLocaleData().getNumDecimalSep()[0];
 }
 
+void SvxTabStop::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("SvxTabStop"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nTabPos"),
+BAD_CAST(OString::number(nTabPos).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eAdjustment"),
+
BAD_CAST(OString::number(static_cast(eAdjustment)).getStr()));
+xmlTextWriterEndElement(pWriter);
+}
 
 // class SvxTabStopItem --
 
@@ -958,6 +968,13 @@ void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs )
 }
 }
 
+void SvxTabStopItem::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("SvxTabStopItem"));
+for (const auto& rTabStop : maTabStops)
+rTabStop.dumpAsXml(pWriter);
+xmlTextWriterEndElement(pWriter);
+}
 
 // class SvxFormatSplitItem -
 SvxFormatSplitItem::~SvxFormatSplitItem()
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 291e1c72e9fc..35032596883e 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -85,6 +85,7 @@ public:
 cFill = rTS.cFill;
 return *this;
 }
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 // class SvxTabStopItem --
@@ -149,6 +150,7 @@ public:
 
 virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const 
override;
 
+void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide' - 50 commits - include/o3tl sw/source

[Michael Stahl]

Rebased ref, commits from common ancestor:
commit e280e0f16f33bc4552c556ef2cde409b037333e5
Author: Michael Stahl 
Date:   Fri May 4 18:47:38 2018 +0200

sw_redlinehide: trivial conversions in pormulti.cxx

Change-Id: I9f9e2aa60381f913419d06be04235486a40f0cc9

diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index a8a64f49de01..2e4cbf836ccd 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -199,7 +199,7 @@ SwBidiPortion::SwBidiPortion(TextFrameIndex const nEnd, 
sal_uInt8 nLv)
 
 long SwBidiPortion::CalcSpacing( long nSpaceAdd, const SwTextSizeInfo& rInf ) 
const
 {
-return HasTabulator() ? 0 : GetSpaceCnt(rInf) * nSpaceAdd / 
SPACING_PRECISION_FACTOR;
+return HasTabulator() ? 0 : sal_Int32(GetSpaceCnt(rInf)) * nSpaceAdd / 
SPACING_PRECISION_FACTOR;
 }
 
 bool SwBidiPortion::ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const
@@ -217,12 +217,11 @@ bool SwBidiPortion::ChgSpaceAdd( SwLineLayout* pCurr, 
long nSpaceAdd ) const
 TextFrameIndex SwBidiPortion::GetSpaceCnt(const SwTextSizeInfo &rInf) const
 {
 // Calculate number of blanks for justified alignment
-SwLinePortion* pPor = GetRoot().GetFirstPortion();
-sal_Int32 nTmpStart = rInf.GetIdx();
-sal_Int32 nNull = 0;
-sal_Int32 nBlanks;
+TextFrameIndex nTmpStart = rInf.GetIdx();
+TextFrameIndex nNull(0);
+TextFrameIndex nBlanks(0);
 
-for( nBlanks = 0; pPor; pPor = pPor->GetPortion() )
+for (SwLinePortion* pPor = GetRoot().GetFirstPortion(); pPor; pPor = 
pPor->GetPortion())
 {
 if( pPor->InTextGrp() )
 nBlanks = nBlanks + 
static_cast(pPor)->GetSpaceCnt( rInf, nNull );
@@ -283,7 +282,7 @@ SwDoubleLinePortion::SwDoubleLinePortion(
 SetDouble();
 const SvxTwoLinesItem* pTwo = static_cast(rCreate.pItem);
 if( pTwo )
-pBracket->nStart = 0;
+pBracket->nStart = TextFrameIndex(0);
 else
 {
 const SwTextAttr& rAttr = *rCreate.pAttr;
@@ -456,11 +455,11 @@ void SwDoubleLinePortion::FormatBrackets( 
SwTextFormatInfo &rInf, SwTwips& nMaxW
 void SwDoubleLinePortion::CalcBlanks( SwTextFormatInfo &rInf )
 {
 SwLinePortion* pPor = GetRoot().GetFirstPortion();
-sal_Int32 nNull = 0;
-sal_Int32 nStart = rInf.GetIdx();
+TextFrameIndex nNull(0);
+TextFrameIndex nStart = rInf.GetIdx();
 SetTab1( false );
 SetTab2( false );
-for( nBlank1 = 0; pPor; pPor = pPor->GetPortion() )
+for (nBlank1 = TextFrameIndex(0); pPor; pPor = pPor->GetPortion())
 {
 if( pPor->InTextGrp() )
 nBlank1 = nBlank1 + 
static_cast(pPor)->GetSpaceCnt( rInf, nNull );
@@ -474,7 +473,7 @@ void SwDoubleLinePortion::CalcBlanks( SwTextFormatInfo 
&rInf )
 pPor = GetRoot().GetNext()->GetFirstPortion();
 nLineDiff -= GetRoot().GetNext()->Width();
 }
-for( nBlank2 = 0; pPor; pPor = pPor->GetPortion() )
+for (nBlank2 = TextFrameIndex(0); pPor; pPor = pPor->GetPortion())
 {
 if( pPor->InTextGrp() )
 nBlank2 = nBlank2 + 
static_cast(pPor)->GetSpaceCnt( rInf, nNull );
@@ -487,7 +486,7 @@ void SwDoubleLinePortion::CalcBlanks( SwTextFormatInfo 
&rInf )
 
 long SwDoubleLinePortion::CalcSpacing( long nSpaceAdd, const SwTextSizeInfo & 
) const
 {
-return HasTabulator() ? 0 : GetSpaceCnt() * nSpaceAdd / 
SPACING_PRECISION_FACTOR;
+return HasTabulator() ? 0 : sal_Int32(GetSpaceCnt()) * nSpaceAdd / 
SPACING_PRECISION_FACTOR;
 }
 
 // Merges the spaces for text adjustment from the inner and outer part.
@@ -511,12 +510,12 @@ bool SwDoubleLinePortion::ChgSpaceAdd( SwLineLayout* 
pCurr,
 }
 else
 {
-sal_Int32 nMyBlank = GetSmallerSpaceCnt();
-sal_Int32 nOther = GetSpaceCnt();
+sal_Int32 const nMyBlank = sal_Int32(GetSmallerSpaceCnt());
+sal_Int32 const nOther = sal_Int32(GetSpaceCnt());
 SwTwips nMultiSpace = pCurr->GetLLSpaceAdd( 0 ) * nMyBlank + 
nOther * nSpaceAdd;
 
 if( nMyBlank )
-nMultiSpace /= nMyBlank;
+nMultiSpace /= sal_Int32(nMyBlank);
 
 //pCurr->SetLLSpaceAdd( nMultiSpace, 0 );
 // #i65711# SetLLSpaceAdd replaces the first value,
@@ -599,7 +598,7 @@ SwRubyPortion::SwRubyPortion( const SwMultiCreator& 
rCreate, const SwFont& rFnt,
 else
 pRubyFont = nullptr;
 
-OUString aStr = rRuby.GetText().copy( nOffs );
+OUString aStr = rRuby.GetText().copy( sal_Int32(nOffs) );
 SwFieldPortion *pField = new SwFieldPortion( aStr, pRubyFont );
 pField->SetNextOffset( nOffs );
 pField->SetFollow( true );
@@ -639,7 +638,7 @@ SwRubyPortion::SwRubyPortion( const SwMultiCreator& 
rCreate, const SwFont& rFnt,
 void SwRubyPortion::Adjust_( SwTextFormatInfo &rInf )
 {
 SwTwips nLineDiff = GetRoot().Width() - GetRoot().GetNext()->Width();
-sal_Int32 nOldIdx = rInf.GetIdx();
+TextFrameIndex const nOldIdx = rInf.GetIdx();
 if( !nLin

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 5e34e3741de8aae10bf30889c227581818276186
Author: Caolán McNamara 
Date:   Fri May 4 16:44:43 2018 +0100

memory from getenv is not ours to free

regrssion from...

commit c3074cb5784329eaf558c2f58d96a64085b42d48
Author: Chris Sherlock 
Date:   Sun Jan 7 00:39:33 2018 +1100

vcl: remove dead code

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

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 8a18974d2635..3595e0bf20c7 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -385,8 +385,7 @@ bool GtkSalFrame::doKeyCallback( guint state,
 vcl::DeletionListener aDel( this );
 
 #if OSL_DEBUG_LEVEL > 0
-char* pKeyDebug = nullptr;
-pKeyDebug = getenv("VCL_GTK3_PAINTDEBUG");
+const char* pKeyDebug = getenv("VCL_GTK3_PAINTDEBUG");
 
 if (pKeyDebug && *pKeyDebug == '1')
 {
@@ -413,8 +412,6 @@ bool GtkSalFrame::doKeyCallback( guint state,
 }
 }
 }
-
-free(pKeyDebug);
 #endif
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 3cebb7365270ce79835a8f8a0ef44179a051159b
Author: Gabor Kelemen 
Date:   Fri May 4 17:28:09 2018 +0200

Updated core
Project: help  2c8cfc7de084dc055f69fcd39f09dbb815e01764

Remove duplicate HIDs added by script - from sbasic

To improve readability of xhps

Change-Id: I8f6463b59c91a15cf27a8bc17b01210874fb9b2f
Reviewed-on: https://gerrit.libreoffice.org/53857
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 8cf310a9fec2..2c8cfc7de084 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8cf310a9fec2c08562bb3858cf4928bb6599737b
+Subproject commit 2c8cfc7de084dc055f69fcd39f09dbb815e01764
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/sbasic/shared/02/1101.xhp |4 ++--
 source/text/sbasic/shared/02/1102.xhp |4 ++--
 source/text/sbasic/shared/02/1103.xhp |1 -
 source/text/sbasic/shared/02/1110.xhp |4 ++--
 source/text/sbasic/shared/02/.xhp |4 ++--
 source/text/sbasic/shared/02/1112.xhp |4 ++--
 source/text/sbasic/shared/02/1116.xhp |4 ++--
 7 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 2c8cfc7de084dc055f69fcd39f09dbb815e01764
Author: Gabor Kelemen 
Date:   Fri May 4 17:28:09 2018 +0200

Remove duplicate HIDs added by script - from sbasic

To improve readability of xhps

Change-Id: I8f6463b59c91a15cf27a8bc17b01210874fb9b2f
Reviewed-on: https://gerrit.libreoffice.org/53857
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/sbasic/shared/02/1101.xhp 
b/source/text/sbasic/shared/02/1101.xhp
index 3df2e72c5..ad5f0a5c1 100644
--- a/source/text/sbasic/shared/02/1101.xhp
+++ b/source/text/sbasic/shared/02/1101.xhp
@@ -33,8 +33,8 @@
   
   
   
-  
-Library
+
+Library
   Select the library that you want to 
edit. The first module of the library that you select is displayed in 
the Basic IDE.
   
   
diff --git a/source/text/sbasic/shared/02/1102.xhp 
b/source/text/sbasic/shared/02/1102.xhp
index c38b6e939..2680c6f8f 100644
--- a/source/text/sbasic/shared/02/1102.xhp
+++ b/source/text/sbasic/shared/02/1102.xhp
@@ -33,8 +33,8 @@
   
   
   
-  
-Compile
+
+Compile
   Compiles the Basic macro. 
You need to compile a macro after you make changes to it, or if the macro uses 
single or procedure steps.
   
   
diff --git a/source/text/sbasic/shared/02/1103.xhp 
b/source/text/sbasic/shared/02/1103.xhp
index 430c41e46..6bafb5cde 100644
--- a/source/text/sbasic/shared/02/1103.xhp
+++ b/source/text/sbasic/shared/02/1103.xhp
@@ -31,7 +31,6 @@
 
 
 
-
 
 Run
 Runs the first macro of the current 
module.
diff --git a/source/text/sbasic/shared/02/1110.xhp 
b/source/text/sbasic/shared/02/1110.xhp
index ba17e84f8..c5abc3cc5 100644
--- a/source/text/sbasic/shared/02/1110.xhp
+++ b/source/text/sbasic/shared/02/1110.xhp
@@ -33,8 +33,8 @@
   
   
   
-  
-Macros
+
+Macros
   Opens the Macro 
dialog.
   
   
diff --git a/source/text/sbasic/shared/02/.xhp 
b/source/text/sbasic/shared/02/.xhp
index da0beafa6..f16aa00ae 100644
--- a/source/text/sbasic/shared/02/.xhp
+++ b/source/text/sbasic/shared/02/.xhp
@@ -33,8 +33,8 @@
   
   
   
-  
-Modules
+
+Modules
   Click here to open the Macro 
Organizer dialog.
   
   
diff --git a/source/text/sbasic/shared/02/1112.xhp 
b/source/text/sbasic/shared/02/1112.xhp
index d76c37eaf..3022fb8d5 100644
--- a/source/text/sbasic/shared/02/1112.xhp
+++ b/source/text/sbasic/shared/02/1112.xhp
@@ -33,8 +33,8 @@
   
   
   
-  
-Find Parentheses
+
+Find 
Parentheses
   Highlights the text that is enclosed 
by two corresponding brackets. Place the text cursor in front of an opening or 
closing bracket, and then click this icon.
   
   
diff --git a/source/text/sbasic/shared/02/1116.xhp 
b/source/text/sbasic/shared/02/1116.xhp
index 039c5fe03..e06615a43 100644
--- a/source/text/sbasic/shared/02/1116.xhp
+++ b/source/text/sbasic/shared/02/1116.xhp
@@ -33,8 +33,8 @@
   
   
   
-  
-Step Out
+
+Step 
Out
   Jumps back to the previous routine 
in the current macro.
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2

[Gabor Kelemen]

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

New commits:
commit dbd8bfda246c7fc7e1d2080aa090181e6b6d9bde
Author: Gabor Kelemen 
Date:   Fri May 4 17:25:23 2018 +0200

Updated core
Project: help  8cf310a9fec2c08562bb3858cf4928bb6599737b

Remove duplicate HIDs added by script - from simpress

To improve readability of xhps

Change-Id: Ic90baace82f16f2f802131ae25e14f1726f56c86
Reviewed-on: https://gerrit.libreoffice.org/53856
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 575d72e10f91..8cf310a9fec2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 575d72e10f919a19a8793d16636f5cca8dcd4564
+Subproject commit 8cf310a9fec2c08562bb3858cf4928bb6599737b
commit e00cd59c95cc4841c881cc99aae26722860852e2
Author: Gabor Kelemen 
Date:   Fri May 4 16:56:24 2018 +0200

Updated core
Project: help  575d72e10f919a19a8793d16636f5cca8dcd4564

Remove duplicate HIDs added by script - from scalc

To improve readability of xhps
Also fix some ahelps with multiple bookmarks

Change-Id: Ia3394344ac8b0bdca78ce4c1aebef8d827d8313c
Reviewed-on: https://gerrit.libreoffice.org/53854
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index adc9acd36eda..575d72e10f91 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit adc9acd36edabe6e169f4acf8e83fde8562fce70
+Subproject commit 575d72e10f919a19a8793d16636f5cca8dcd4564
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/scalc/01/02140100.xhp|4 ++--
 source/text/scalc/01/02140200.xhp|4 ++--
 source/text/scalc/01/02140300.xhp|4 ++--
 source/text/scalc/01/02140400.xhp|4 ++--
 source/text/scalc/01/0217.xhp|1 -
 source/text/scalc/01/0221.xhp|9 +
 source/text/scalc/01/04010100.xhp|1 -
 source/text/scalc/01/04010200.xhp|1 -
 source/text/scalc/01/05030300.xhp|5 +
 source/text/scalc/01/05030400.xhp|4 +---
 source/text/scalc/01/05050300.xhp|9 +
 source/text/scalc/01/05080100.xhp|1 -
 source/text/scalc/01/05080200.xhp|1 -
 source/text/scalc/01/05080400.xhp|1 -
 source/text/scalc/01/06030100.xhp|1 -
 source/text/scalc/01/06030300.xhp|5 +++--
 source/text/scalc/01/06030400.xhp|5 +++--
 source/text/scalc/01/06030500.xhp|5 +++--
 source/text/scalc/01/06030600.xhp|5 +++--
 source/text/scalc/01/06030700.xhp|1 -
 source/text/scalc/01/06030800.xhp|5 +++--
 source/text/scalc/01/06031000.xhp|5 +++--
 source/text/scalc/01/1203.xhp|1 -
 source/text/scalc/01/12040500.xhp|5 +++--
 source/text/scalc/01/1205.xhp|4 ++--
 source/text/scalc/01/12080100.xhp|5 +++--
 source/text/scalc/01/12080400.xhp|4 ++--
 source/text/scalc/01/12080600.xhp|4 ++--
 source/text/scalc/01/12090200.xhp|1 -
 source/text/scalc/01/12090300.xhp|4 ++--
 source/text/scalc/01/1210.xhp|9 +
 source/text/scalc/01/1212.xhp|1 -
 source/text/scalc/02/0213.xhp|4 ++--
 source/text/scalc/02/0214.xhp|1 -
 source/text/scalc/02/0215.xhp|4 ++--
 source/text/scalc/02/0608.xhp|1 -
 source/text/scalc/02/1802.xhp|1 -
 source/text/simpress/01/0118.xhp |4 ++--
 source/text/simpress/01/0412.xhp |4 ++--
 source/text/simpress/01/0414.xhp |5 +++--
 source/text/simpress/01/04990100.xhp |1 -
 source/text/simpress/01/04990200.xhp |1 -
 source/text/simpress/01/04990300.xhp |1 -
 source/text/simpress/01/04990400.xhp |1 -
 source/text/simpress/01/04990600.xhp |1 -
 source/text/simpress/01/04990700.xhp |1 -
 source/text/simpress/01/0514.xhp |2 --
 source/text/simpress/01/0517.xhp |4 ++--
 source/text/simpress/01/05250500.xhp |1 -
 source/text/simpress/01/0603.xhp |4 ++--
 source/text/simpress/01/13050100.xhp |1 -
 source/text/simpress/01/13050300.xhp |1 -
 source/text/simpress/01/13050400.xhp |1 -
 source/text/simpress/01/13050500.xhp |1 -
 source/text/simpress/01/13050600.xhp |1 -
 source/text/simpress/01/13050700.xhp |1 -
 source/text/simpress/01/1314.xhp |1 -
 source/text/simpress/01/1315.xhp |1 -
 source/text/simpress/01/1316.xhp |4 ++--
 source/text/simpress/01/1317.xhp |1 -
 source/text/simpress/01/13180100.xhp |4 ++--
 source/text/simpress/01/13180200.xhp |4 ++--
 source/text/simpress/01/13180300.xhp |4 ++--
 source/text/simpress/02/0402.xhp |1 -
 source/text/simpress/02/0802.xhp |1 -
 source/text/simpress/02/0806.xhp |4 ++--
 source/text/simpress/02/1008.xhp |5 -
 source/text/simpress/02/1009.xhp |9 -
 source/text/simpress/02/1106.xhp |5 +++--
 source/text/simpress/02/1107.xhp |5 +++--
 source/text/simpress/02/1108.xhp |5 +++--
 source/text/simpress/02/1109.xhp |5 +++--
 source/text/simpress/02/1110.xhp |1 -
 source/text/simpress/02/.xhp |1 -
 source/text/simpress/02/1301.xhp |4 ++--
 source/text/simpress/02/1302.xhp |1 -
 source/text/simpress/02/1304.xhp |1 -
 source/text/simpress/02/1305.xhp |1 -
 source/text/simpress/02/1310.xhp |4 ++--
 79 files changed, 98 insertions(+), 140 deletions(-)

New commits:
commit 8cf310a9fec2c08562bb3858cf4928bb6599737b
Author: Gabor Kelemen 
Date:   Fri May 4 17:25:23 2018 +0200

Remove duplicate HIDs added by script - from simpress

To improve readability of xhps

Change-Id: Ic90baace82f16f2f802131ae25e14f1726f56c86
Reviewed-on: https://gerrit.libreoffice.org/53856
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/simpress/01/0118.xhp 
b/source/text/simpress/01/0118.xhp
index f2b2a2376..b72ac9c86 100644
--- a/source/text/simpress/01/0118.xhp
+++ b/source/text/simpress/01/0118.xhp
@@ -31,8 +31,8 @@
 
   
   
-  
-Page
+
+Page
   Sets page 
orientation, page margins, background and other layout 
options.
   
   
diff --git a/source/text/simpress/01/0412.xhp 
b/source/text/simpress/01/0412.xhp
index e7ccb0f3f..2e86d03d0 100644
--- a/source/text/simpress/01/0412.xhp
+++ b/source/text/simpress/01/0412.xhp
@@ -33,8 +33,8 @@
   
   
   
-  
-Duplicate Slide
+
+Duplicate 
Slide
   Inserts a copy of the

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

[Gabor Kelemen]

 source/text/shared/01/01010300.xhp   |1 
 source/text/shared/01/0106.xhp   |1 
 source/text/shared/01/0204.xhp   |1 
 source/text/shared/01/0205.xhp   |1 
 source/text/shared/01/0224.xhp   |1 
 source/text/shared/01/0406.xhp   |1 
 source/text/shared/01/04060100.xhp   |4 -
 source/text/shared/01/04060200.xhp   |4 -
 source/text/shared/01/0505.xhp   |9 +---
 source/text/shared/01/05080100.xhp   |4 -
 source/text/shared/01/05080200.xhp   |4 -
 source/text/shared/01/05080300.xhp   |4 -
 source/text/shared/01/05110100.xhp   |1 
 source/text/shared/01/05110300.xhp   |   10 ++--
 source/text/shared/01/05110400.xhp   |5 +-
 source/text/shared/01/05120100.xhp   |4 -
 source/text/shared/01/0520.xhp   |1 
 source/text/shared/01/05250100.xhp   |4 -
 source/text/shared/01/05250400.xhp   |4 -
 source/text/shared/01/05250500.xhp   |1 
 source/text/shared/01/05250600.xhp   |1 
 source/text/shared/01/05260200.xhp   |4 -
 source/text/shared/01/05260400.xhp   |4 -
 source/text/shared/01/05260500.xhp   |4 -
 source/text/shared/01/0527.xhp   |1 
 source/text/shared/01/05290100.xhp   |1 
 source/text/shared/01/05290200.xhp   |1 
 source/text/shared/01/05290300.xhp   |5 +-
 source/text/shared/01/05290400.xhp   |4 -
 source/text/shared/01/06010600.xhp   |2 
 source/text/shared/01/06130200.xhp   |1 
 source/text/shared/01/0620.xhp   |1 
 source/text/shared/01/0699.xhp   |1 
 source/text/shared/01/0701.xhp   |1 
 source/text/shared/02/0111.xhp   |1 
 source/text/shared/02/01170001.xhp   |   68 +++
 source/text/shared/02/01170200.xhp   |5 +-
 source/text/shared/02/01170500.xhp   |4 -
 source/text/shared/02/01171000.xhp   |1 
 source/text/shared/02/01171100.xhp   |1 
 source/text/shared/02/0123.xhp   |1 
 source/text/shared/02/0216.xhp   |1 
 source/text/shared/02/0502.xhp   |1 
 source/text/shared/02/0509.xhp   |1 
 source/text/shared/02/0511.xhp   |1 
 source/text/shared/02/0610.xhp   |4 -
 source/text/shared/02/0611.xhp   |4 -
 source/text/shared/02/0706.xhp   |5 +-
 source/text/shared/02/0709.xhp   |4 -
 source/text/shared/02/0801.xhp   |4 -
 source/text/shared/02/1001.xhp   |8 +--
 source/text/shared/02/1002.xhp   |8 +--
 source/text/shared/02/1003.xhp   |8 +--
 source/text/shared/02/1004.xhp   |8 +--
 source/text/shared/02/1204.xhp   |4 -
 source/text/shared/02/1205.xhp   |1 
 source/text/shared/02/1211.xhp   |1 
 source/text/shared/02/1212.xhp   |4 -
 source/text/shared/02/1401.xhp   |2 
 source/text/shared/02/1403.xhp   |1 
 source/text/shared/02/2009.xhp   |4 -
 source/text/shared/02/2010.xhp   |4 -
 source/text/shared/02/2406.xhp   |4 -
 source/text/shared/02/2407.xhp   |4 -
 source/text/shared/autopi/0100.xhp   |1 
 source/text/shared/optionen/0104.xhp |1 
 source/text/shared/optionen/0109.xhp |1 
 source/text/swriter/01/01160100.xhp  |3 -
 source/text/swriter/01/01160200.xhp  |1 
 source/text/swriter/01/01160400.xhp  |3 -
 source/text/swriter/01/04120200.xhp  |4 -
 source/text/swriter/01/0504.xhp  |1 
 source/text/swriter/01/0506.xhp  |1 
 source/text/swriter/01/05110200.xhp  |4 -
 source/text/swriter/01/05110300.xhp  |4 -
 source/text/swriter/01/0517.xhp  |4 -
 source/text/swriter/01/0520.xhp  |4 -
 source/text/swriter/01/0611.xhp  |4 -
 source/text/swriter/01/0612.xhp  |4 -
 source/text/swriter/01/0616.xhp  |   14 +++---
 source/text/swriter/01/0617.xhp  |4 -
 source/text/swriter/01/0619.xhp  |4 -
 source/text/swriter/01/0620.xhp  |4 -
 source/text/swriter/01/0621.xhp  |4 -
 source/text/swriter/01/0622.xhp  |4 -
 source/text/swriter/02/0321.xhp  |4 -
 source/text/swriter/02/0422.xhp  |4 -
 source/text/swriter/02/0423.xhp  |4 -
 source/text/swriter/02/0424.xhp  |4 -
 source/text/swriter/02/0604.xhp  |4 -
 source/text/swriter/02/0612.xhp  |4 -
 source/text/swriter/02/0613.xhp  |5 +-
 source/text/swriter/02/0614.xhp  |4 -
 source/text/swriter/02/0808.xhp  |4 -
 source/text/swriter/02/1001.xhp  |4 -
 source/text/swriter/02/1005.xhp  |4 -
 source/text/swriter/02/1803.xhp  |2 
 source/text/swriter/02/18030100.xh

[Libreoffice-commits] core.git: 2 commits - helpcontent2

[Gabor Kelemen]

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

New commits:
commit 74c13cf4ad31a8a5535440d492900454703c5483
Author: Gabor Kelemen 
Date:   Fri May 4 16:13:38 2018 +0200

Updated core
Project: help  adc9acd36edabe6e169f4acf8e83fde8562fce70

Remove duplicate HIDs added by script - from swriter

To improve readability of xhps
Also fix some typos in ahelps

Change-Id: I9f28f5b2869961f523cfadc6fa2c43ac599e9e2b
Reviewed-on: https://gerrit.libreoffice.org/53853
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 4302807c75de..adc9acd36eda 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4302807c75de25fbb50d230d10c3d4ecee0441af
+Subproject commit adc9acd36edabe6e169f4acf8e83fde8562fce70
commit 1f104769707452d5b45a0515d9c4169ca7870966
Author: Gabor Kelemen 
Date:   Fri May 4 15:37:52 2018 +0200

Updated core
Project: help  4302807c75de25fbb50d230d10c3d4ecee0441af

Remove duplicate HIDs added by script - from shared/

To improve readability of xhps.
Also fix a few ahelps with multiple bookmarks

Change-Id: I71870295295e4a2d9b6b91053d38d4615912f794
Reviewed-on: https://gerrit.libreoffice.org/53846
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index f624ccb2b85d..4302807c75de 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f624ccb2b85d920da466a11b10134ae8bbddb05b
+Subproject commit 4302807c75de25fbb50d230d10c3d4ecee0441af
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/tdf116801.docx|binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx  |   12 
 writerfilter/source/dmapper/StyleSheetTable.cxx |4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 2019109e20dc522dd3bd6a730bf639efc2c00309
Author: Miklos Vajna 
Date:   Wed May 2 22:04:08 2018 +0200

tdf#116801 DOCX import: char styles have no IsAutoUpdate property

See sw/source/core/unocore/unomapproperties.hxx:447,
UNO_NAME_IS_AUTO_UPDATE is part of the COMMON_PARA_STYLE_PROPERTIES
define. So it's not "list styles don't have this", but "only paragraph
styles have this".

(cherry picked from commit ebcf27d419e41a497242c98fcfec08a2088c0720)

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf116801.docx 
b/sw/qa/extras/ooxmlexport/data/tdf116801.docx
new file mode 100644
index ..f904546cf38b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf116801.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index bc7c15524778..7af6f0dc39e2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -218,6 +218,18 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116985, "tdf116985.docx")
 CPPUNIT_ASSERT(nWidth > 4000);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf116801, "tdf116801.docx")
+{
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(),
+uno::UNO_QUERY);
+// This raised a lang::IndexOutOfBoundsException, table was missing from
+// the import result.
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("D1"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("D1"), xCell->getString());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 55996991a84a..d192eaa5ab53 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1197,8 +1197,8 @@ void StyleSheetTable::ApplyStyleSheets( const 
FontTablePtr& rFontTable )
 xPropertySet->setPropertyValue("StyleInteropGrabBag", 
uno::makeAny(aGrabBag));
 }
 
-// List styles don't support automatic update.
-if (pEntry->bAutoRedefine && !bListStyle)
+// Only paragraph styles support automatic updates.
+if (pEntry->bAutoRedefine && bParaStyle)
 xPropertySet->setPropertyValue("IsAutoUpdate", 
uno::makeAny(true));
 }
 else if(pEntry->nStyleTypeCode == STYLE_TYPE_TABLE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 sc/source/ui/app/inputhdl.cxx |6 ++
 sc/source/ui/app/inputwin.cxx |5 +
 sc/source/ui/view/editsh.cxx  |   12 ++--
 3 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 599ab0f82ebcb29a5205d77daed72b842e839800
Author: Maxim Monastirsky 
Date:   Sun Apr 15 22:28:32 2018 +0300

tdf#117017 Make modifier keys not trigger the InputChanged handler

(cherry picked from commit a860c94f0da22065074cc36e8ddda73261641533)

sc: Fix menubar auto-accelerator behavior under gtk2

... when the focus is in the input field of the formula bar.
Regression of commit d90dcf3554a84b5600800ee6deb3cde879c62b8d
("tdf#113894 release ctrl of ctrl+v in input line should strip
formatting").

(cherry picked from commit baddcc38dee7b286cc73c1eaeb6f78d10b911a8e)

tdf#117017 Pasting into the formula bar shouldn't retain formatting

This is (kind of) regression from the previous commit
a860c94f0da22065074cc36e8ddda73261641533 ("tdf#117017 Make modifier
keys not trigger the InputChanged handler").

Reset of formatting when pasting into the formula bar via a keyboard
shortcut, was actually a side effect of the gtk auto-accelerator
work. In particual, bibisect (of the 5.2 cycle) points to commit
8d53d01f38b856f177aca3ed4d3cba3db10f24a5 ("tdf#96739: Send Ctrl-Left/
RightShift events to correct window"). The behavior was later changed
back with commit 0321dbb9be72f92c02919457cdc3c4e76cfbd11d
("Resolves: tdf#99324 let sidebar toggle auto-mnemonics on/off with
alt"), but introduced again upon request of tdf#113894, with commit
d90dcf3554a84b5600800ee6deb3cde879c62b8d ("tdf#113894 release ctrl of
ctrl+v in input line should strip formatting"). Now it's broken again
with the previous commit of this bug.

However, even if not retaining formatting is the desired behavior,
triggering it on a modifier key release isn't a good idea. So keep
the previous commit, and implement tdf#113894 differently. In
addition, make sure to get identical behavior regardless of the
pasting method, be it via a keyboard shortcut, a toolbar button or a
menu/context menu command. And users can still override this behavior
with the usual paste special dialog, or the toolbar dropdown.

(cherry picked from commit 632bc11ce8fab1c4046ab24810b90a7ce9ac5914)

Change-Id: Ib05883688ef4143c0b53871c4336920dde6f91cc
Reviewed-on: https://gerrit.libreoffice.org/53144
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 94f3464c783f..da4be2812150 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3397,9 +3397,15 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, 
bool bStartEdit /* = false
 {
 if (pTableView)
 {
+EVControlBits nControl = pTableView->GetControlWord();
+if (pTopView)
+pTableView->SetControlWord(nControl | 
EVControlBits::SINGLELINEPASTE);
+
 vcl::Window* pFrameWin = pActiveViewSh ? 
pActiveViewSh->GetFrameWin() : nullptr;
 if ( pTableView->PostKeyEvent( rKEvt, pFrameWin ) )
 bUsed = true;
+
+pTableView->SetControlWord(nControl);
 }
 if (pTopView)
 if ( pTopView->PostKeyEvent( rKEvt ) )
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 6572e0b01d95..4a8ea6ea7ff6 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1425,6 +1425,11 @@ void ScTextWnd::Command( const CommandEvent& rCEvt )
 {
 //don't call InputChanged for CommandEventId::Swipe
 }
+else if ( nCommand == CommandEventId::ModKeyChange )
+{
+//pass alt press/release to parent impl
+Window::Command(rCEvt);
+}
 else
 SC_MOD()->InputChanged( mpEditView.get() );
 }
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 9cbac20a0fc8..235e9773660c 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -229,10 +229,18 @@ void ScEditShell::Execute( SfxRequest& rReq )
 break;
 
 case SID_PASTE:
-pTableView->PasteSpecial();
+{
+EVControlBits nControl = pTableView->GetControlWord();
 if (pTopView)
+{
 pTopView->Paste();
-break;
+pTableView->SetControlWord(nControl | 
EVControlBits::SINGLELINEPASTE);
+}
+
+pTableView->PasteSpecial();
+pTableView->SetControlWord(nControl);
+}
+

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

[Mike Kaganski]

 sw/qa/extras/rtfexport/data/tdf117268.rtf   |   35 ++
 sw/qa/extras/rtfexport/rtfexport3.cxx   |   38 
 writerfilter/source/rtftok/rtfdispatchvalue.cxx |7 
 3 files changed, 80 insertions(+)

New commits:
commit fe3ddff71af9298cc389ce05f6c1474bc0aeb715
Author: Mike Kaganski 
Date:   Thu May 3 15:09:40 2018 +0300

tdf#117268: treat erroneous \itap0 the same way as Word does

... so that if we are inside a table, it would not convert table
paragraphs into top-level paragraphs. (The in-the-wild documents
with this invalid input are, e.g., generated by Consultant+ legal
reference database).

Reviewed-on: https://gerrit.libreoffice.org/53790
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
(cherry picked from commit 247dabcb0b92a62b233ec0237deac84e6675325c)

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

diff --git a/sw/qa/extras/rtfexport/data/tdf117268.rtf 
b/sw/qa/extras/rtfexport/data/tdf117268.rtf
new file mode 100644
index ..608ea65637cc
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf117268.rtf
@@ -0,0 +1,35 @@
+{\rtf1
+{\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000
+\pard
+Text 1
+\itap0
+\cell
+\row}
+\pard
+\par
+\itap0
+{\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000
+\pard
+Text 2
+\itap0
+\cell
+\row}
+\itap0
+{\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000
+\pard
+\itap2
+Text 3
+\nestcell
+\itap2
+{\nesttableprops\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx1000
+\nestrow}
+\itap0
+\cell
+\row}
+\itap0
+\par
+}
\ No newline at end of file
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx 
b/sw/qa/extras/rtfexport/rtfexport3.cxx
index beaf63faf020..9f59e19a470a 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class Test : public SwModelTestBase
 {
@@ -76,6 +77,43 @@ DECLARE_RTFEXPORT_TEST(testTdf116841, "tdf116841.rtf")
  getProperty(getParagraph(1), 
"ParaLeftMargin"));
 }
 
+DECLARE_RTFEXPORT_TEST(testTdf117268, "tdf117268.rtf")
+{
+// Here we check that we correctly mimic Word's treatment of erroneous 
\itap0 inside tables.
+// Previously, the first table was import as text, and second top-level 
one only imported
+// last row with nested table (first row was also imported as text).
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY_THROW);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(),
+uno::UNO_QUERY_THROW);
+
+// First (simple) table
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("Text 1"), xCell->getString());
+
+// Nested table
+xTable.set(xTables->getByIndex(1), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
+xCell.set(xTable->getCellByName("A1"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("Text 3"), xCell->getString());
+uno::Reference xNestedAnchor(xTable->getAnchor(), 
uno::UNO_QUERY_THROW);
+uno::Reference 
xAnchorCell(xNestedAnchor->getPropertyValue("Cell"),
+ uno::UNO_QUERY_THROW);
+
+// Outer table
+xTable.set(xTables->getByIndex(2), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
+xCell.set(xTable->getCellByName("A1"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("Text 2"), xCell->getString());
+xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY_THROW);
+uno::Reference xTextRangeCompare(xCell, 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), 
xTextRangeCompare->compareRegionStarts(xAnchorCell, xCell));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx 
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 489875e3e78c..6ae43f60248d 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -228,6 +228,13 @@ RTFError RTFDocumentI

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

[Miklos Vajna]

 include/vcl/pdfextoutdevdata.hxx|4 ++
 vcl/qa/cppunit/pdfexport/data/tdf109143.odt |binary
 vcl/qa/cppunit/pdfexport/pdfexport.cxx  |   42 
 vcl/source/gdi/pdfextoutdevdata.cxx |   12 ++--
 4 files changed, 54 insertions(+), 4 deletions(-)

New commits:
commit e0ae55f7cefe74039f8ade1696d1861e90d73c04
Author: Miklos Vajna 
Date:   Wed May 2 17:22:30 2018 +0200

tdf#109143 PDF export: don't reuse compressed bitmaps for cropped images

PDF wants to loose the pixels masked out by cropping, so the "reuse
original compressed image" optimization should not be used in that case.

(cherry picked from commit be3ef7b0e5e51c1d97309ce3b6d5cac1fbd025d0)

Conflicts:
vcl/source/gdi/pdfextoutdevdata.cxx

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

diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index 6dc5165d99a5..22079323580c 100644
--- a/include/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
@@ -180,7 +180,9 @@ public:
   const tools::Rectangle&  rVisibleOutputRect );
 
 /// Detect if stream is compressed enough to avoid de-compress / scale & 
re-compress
-boolHasAdequateCompression( const Graphic &rGraphic ) const;
+boolHasAdequateCompression( const Graphic &rGraphic,
+const tools::Rectangle &rOutputRect,
+const tools::Rectangle 
&rVisibleOutputRect ) const;
 
 //--->i56629
 /** Create a new named destination to be used in a link to this document 
from another PDF document
diff --git a/vcl/qa/cppunit/pdfexport/data/tdf109143.odt 
b/vcl/qa/cppunit/pdfexport/data/tdf109143.odt
new file mode 100644
index ..7d9afa3789e5
Binary files /dev/null and b/vcl/qa/cppunit/pdfexport/data/tdf109143.odt differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index ba8df2f1a616..c6de4b344503 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -80,6 +80,7 @@ public:
 void testTdf115117_2a();
 #endif
 #endif
+void testTdf109143();
 
 CPPUNIT_TEST_SUITE(PdfExportTest);
 #if HAVE_FEATURE_PDFIUM
@@ -104,6 +105,7 @@ public:
 CPPUNIT_TEST(testTdf115117_2a);
 #endif
 #endif
+CPPUNIT_TEST(testTdf109143);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -427,6 +429,46 @@ void PdfExportTest::testTdf106206()
 CPPUNIT_ASSERT(bool(it == pEnd));
 }
 
+void PdfExportTest::testTdf109143()
+{
+// Import the bugdoc and export as PDF.
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"tdf109143.odt";
+mxComponent = loadFromDesktop(aURL);
+CPPUNIT_ASSERT(mxComponent.is());
+
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
+xStorable->storeToURL(aTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
+
+// Parse the export result.
+vcl::filter::PDFDocument aDocument;
+SvFileStream aStream(aTempFile.GetURL(), StreamMode::READ);
+CPPUNIT_ASSERT(aDocument.Read(aStream));
+
+// The document has one page.
+std::vector aPages = aDocument.GetPages();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), aPages.size());
+
+// Get access to the only image on the only page.
+vcl::filter::PDFObjectElement* pResources = 
aPages[0]->LookupObject("Resources");
+CPPUNIT_ASSERT(pResources);
+auto pXObjects = 
dynamic_cast(pResources->Lookup("XObject"));
+CPPUNIT_ASSERT(pXObjects);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pXObjects->GetItems().size());
+vcl::filter::PDFObjectElement* pXObject = 
pXObjects->LookupObject(pXObjects->GetItems().begin()->first);
+CPPUNIT_ASSERT(pXObject);
+
+// Make sure it's re-compressed.
+auto pLength = 
dynamic_cast(pXObject->Lookup("Length"));
+int nLength = pLength->GetValue();
+// This failed: cropped TIFF-in-JPEG wasn't re-compressed, so crop was
+// lost. Size was 59416, now is 11827.
+CPPUNIT_ASSERT(nLength < 5);
+}
+
 void PdfExportTest::testTdf106972()
 {
 // Import the bugdoc and export as PDF.
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx 
b/vcl/source/gdi/pdfextoutdevdata.cxx
index 8974c6f5a645..71ef583cda58 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -404,13 +404,13 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, 
sal_uInt32& rCurGDIMtfAc
 GfxLinkType eType = rGraphic.GetLink().GetType();
 if ( eType == GfxLinkType::NativeJpg )
   

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

[Miklos Vajna]

 xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx  |   15 
++
 xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx  |   13 
++--
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |   10 
+++---
 3 files changed, 24 insertions(+), 14 deletions(-)

New commits:
commit 53a0298667172bfdab22fd969f2bb319a59938e4
Author: Miklos Vajna 
Date:   Thu May 3 22:18:25 2018 +0200

xmlsecurity windows: stop using the "xmlSec" prefix for own code

xmlSec is the prefix for symbols from libxmlsec, it's confusing if our own 
code
uses that as well.

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

diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
index b6c8a00dec98..778cb93e3f38 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
@@ -28,14 +28,17 @@
 #include 
 #include 
 
+namespace xmlsecurity
+{
+
 /**
- * xmlSecMSCryptoAppliedKeysMngrCreate:
+ * MSCryptoAppliedKeysMngrCreate:
  *
  * Create and load key store and certificate database into keys manager
  *
  * Returns keys manager pointer on success or NULL otherwise.
  */
-xmlSecKeysMngrPtr xmlSecMSCryptoAppliedKeysMngrCreate()
+xmlSecKeysMngrPtr MSCryptoAppliedKeysMngrCreate()
 {
 xmlSecKeysMngrPtrkeyMngr = nullptr ;
 xmlSecKeyStorePtrkeyStore = nullptr ;
@@ -120,7 +123,7 @@ xmlSecKeysMngrPtr xmlSecMSCryptoAppliedKeysMngrCreate()
 }
 
 int
-xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore(
+MSCryptoAppliedKeysMngrAdoptKeyStore(
 xmlSecKeysMngrPtrmngr,
 HCERTSTORE keyStore
 )
@@ -155,7 +158,7 @@ xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore(
 }
 
 int
-xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore(
+MSCryptoAppliedKeysMngrAdoptTrustedStore(
 xmlSecKeysMngrPtrmngr,
 HCERTSTORE trustedStore
 )
@@ -190,7 +193,7 @@ xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore(
 }
 
 int
-xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore(
+MSCryptoAppliedKeysMngrAdoptUntrustedStore(
 xmlSecKeysMngrPtrmngr,
 HCERTSTORE untrustedStore
 )
@@ -224,4 +227,6 @@ xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore(
 return 0 ;
 }
 
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx 
b/xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx
index 670c80928f0a..04b94244bb01 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx
@@ -29,26 +29,31 @@
 #include 
 #include 
 
-xmlSecKeysMngrPtr xmlSecMSCryptoAppliedKeysMngrCreate();
+namespace xmlsecurity
+{
+
+xmlSecKeysMngrPtr MSCryptoAppliedKeysMngrCreate();
 
 int
-xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore(
+MSCryptoAppliedKeysMngrAdoptKeyStore(
 xmlSecKeysMngrPtrmngr,
 HCERTSTORE keyStore
 ) ;
 
 int
-xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore(
+MSCryptoAppliedKeysMngrAdoptTrustedStore(
 xmlSecKeysMngrPtrmngr,
 HCERTSTORE trustedStore
 ) ;
 
 int
-xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore(
+MSCryptoAppliedKeysMngrAdoptUntrustedStore(
 xmlSecKeysMngrPtrmngr,
 HCERTSTORE untrustedStore
 ) ;
 
+}
+
 #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_AKMNGR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git 
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 9f164d62e803..ecfdd15d1895 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -1021,7 +1021,7 @@ xmlSecKeysMngrPtr 
SecurityEnvironment_MSCryptImpl::createKeysManager() {
 /*-
  * The following lines is based on the of xmlsec-mscrypto crypto engine
  */
-pKeysMngr = xmlSecMSCryptoAppliedKeysMngrCreate() ;
+pKeysMngr = xmlsecurity::MSCryptoAppliedKeysMngrCreate() ;
 if( pKeysMngr == nullptr )
 throw uno::RuntimeException() ;
 
@@ -1032,7 +1032,7 @@ xmlSecKeysMngrPtr 
SecurityEnvironment_MSCryptImpl::createKeysManager() {
 //Add system key store into the keys manager.
 m_hMySystemStore = CertOpenSystemStoreW( 0, L"MY" ) ;
 if( m_hMySystemStore != nullptr ) {
-if( xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore( pKeysMngr, 
m_hMySystemStore ) < 0 ) {
+if( xmlsecurity::MSCryptoAppliedKeysMngrAdoptKeyStore( pKeysMngr, 
m_hMySystemStore ) < 0 ) {
 CertCloseStore( m_hMySystemStore, CERT_CLOSE_STORE_CHECK_FLAG 
) ;
 m_hMySystemStore = nullptr;
 throw uno::RuntimeException() ;
@@ -1042,7 +1042,7 @@ xmlSecKeysMngrPtr 
SecurityEnvironment_MSCryptImpl::createKeysManager

[Libreoffice-commits] online.git: debian/control

[Andras Timar]

 debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17ac15c838f8b75c8cc8befd4cdc23a2d1f4afdc
Author: Andras Timar 
Date:   Fri May 4 16:56:03 2018 +0200

add more deb build dependencies

Change-Id: I10396ae0034752f1821edd1953556df6f0465f5c

diff --git a/debian/control b/debian/control
index 30bdfe046..e533e704d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Andras Timar 
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, node-jake, 
npm, python-polib, python-lxml, fontconfig, libpam-dev, libcppunit-dev, 
pkg-config, devscripts
 Standards-Version: 3.9.7
 
 Package: loolwsd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/CppunitTest_sw_odfexport.mk

[Stephan Bergmann]

 sw/CppunitTest_sw_odfexport.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit e51e0279e88dbb542518df93d86f8bb0d0a43e89
Author: Stephan Bergmann 
Date:   Fri May 4 16:33:00 2018 +0200

Missing test dependencies

Change-Id: I3a7afc2c877d8c130d7a0a4d2b883dc0641d18e9

diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 8fb2228d84a3..75687878d3ab 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -55,6 +55,11 @@ $(eval $(call 
gb_CppunitTest_use_custom_headers,sw_odfexport,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_odfexport))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_odfexport, \
+modules/swriter \
+svx \
+))
+
 ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
 $(call gb_CppunitTest_get_target,sw_odfexport): \
 $(call gb_ExternalPackage_get_target,fonts_liberation)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/misc/outline.cxx  |  440 ++---
 sw/source/uibase/inc/numberingtypelistbox.hxx  |3 
 sw/source/uibase/inc/numprevw.hxx  |   50 ++
 sw/source/uibase/inc/outline.hxx   |   50 +-
 sw/uiconfig/swriter/ui/outlinenumberingpage.ui |   72 ++--
 5 files changed, 446 insertions(+), 169 deletions(-)

New commits:
commit ee9ab9c13731399047c78de8d7f57302e33fb95d
Author: Caolán McNamara 
Date:   Fri May 4 10:17:18 2018 +0100

weld SwOutlineSettingsTabPage

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

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index c76b640226dd..6baa4cc17535 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -399,46 +399,45 @@ short SwOutlineTabDialog::Ok()
 return RET_OK;
 }
 
-SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(vcl::Window* pParent,
+SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(TabPageParent pPage,
 const SfxItemSet& rSet)
-: SfxTabPage(pParent, "OutlineNumberingPage",
-"modules/swriter/ui/outlinenumberingpage.ui", &rSet)
+: SfxTabPage(pPage, "modules/swriter/ui/outlinenumberingpage.ui", 
"OutlineNumberingPage", &rSet)
 , aNoFormatName(SwResId(SW_STR_NONE))
 , pSh(nullptr)
 , pNumRule(nullptr)
 , pCollNames(nullptr)
 , nActLevel(1)
+, m_xLevelLB(m_xBuilder->weld_tree_view("level"))
+, m_xCollBox(m_xBuilder->weld_combo_box_text("style"))
+, m_xNumberBox(new 
NumberingTypeListBox(m_xBuilder->weld_combo_box_text("numbering")))
+, m_xCharFormatLB(m_xBuilder->weld_combo_box_text("charstyle"))
+, m_xAllLevelFT(m_xBuilder->weld_label("sublevelsft"))
+, m_xAllLevelNF(m_xBuilder->weld_spin_button("sublevelsnf"))
+, m_xPrefixED(m_xBuilder->weld_entry("prefix"))
+, m_xSuffixED(m_xBuilder->weld_entry("suffix"))
+, m_xStartEdit(m_xBuilder->weld_spin_button("startat"))
+, m_xPreviewWIN(new 
SwNumberingPreview(m_xBuilder->weld_drawing_area("preview")))
 {
-get(m_pLevelLB, "level");
-get(m_pCollBox, "style");
-m_pCollBox->SetStyle(m_pCollBox->GetStyle()|WB_SORT);
-get(m_pNumberBox, "numbering");
-get(m_pCharFormatLB, "charstyle");
-get(m_pAllLevelFT, "sublevelsft");
-get(m_pAllLevelNF, "sublevelsnf");
-get(m_pPrefixED, "prefix");
-get(m_pSuffixED, "suffix");
-get(m_pStartEdit, "startat");
-get(m_pPreviewWIN, "preview");
-
 SetExchangeSupport();
 
-m_pCollBox->InsertEntry(aNoFormatName);
-m_pLevelLB->SetSelectHdl(LINK(this,SwOutlineSettingsTabPage, 
LevelHdl));
-m_pAllLevelNF->SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, 
ToggleComplete));
-m_pCollBox->SetSelectHdl(LINK(this,SwOutlineSettingsTabPage, 
CollSelect));
-m_pCollBox->SetGetFocusHdl(LINK(this,  SwOutlineSettingsTabPage, 
CollSelectGetFocus));
-m_pNumberBox->SetSelectHdl(LINK(this,  SwOutlineSettingsTabPage, 
NumberSelect));
-m_pPrefixED->SetModifyHdl(LINK(this,   SwOutlineSettingsTabPage, 
DelimModify));
-m_pSuffixED->SetModifyHdl(LINK(this,   SwOutlineSettingsTabPage, 
DelimModify));
-m_pStartEdit->SetModifyHdl(LINK(this,  SwOutlineSettingsTabPage, 
StartModified));
-m_pCharFormatLB->SetSelectHdl(LINK(this,  SwOutlineSettingsTabPage, 
CharFormatHdl));
+m_xNumberBox->Reload(SwInsertNumTypes::NoNumbering | 
SwInsertNumTypes::Extended);
+m_xCollBox->make_sorted();
+m_xCollBox->append_text(aNoFormatName);
+m_xLevelLB->connect_changed(LINK(this,SwOutlineSettingsTabPage, 
LevelHdl));
+m_xAllLevelNF->connect_value_changed(LINK(this, SwOutlineSettingsTabPage, 
ToggleComplete));
+m_xCollBox->connect_changed(LINK(this,SwOutlineSettingsTabPage, 
CollSelect));
+m_xCollBox->connect_focus_in(LINK(this,  SwOutlineSettingsTabPage, 
CollSelectGetFocus));
+m_xNumberBox->connect_changed(LINK(this,  SwOutlineSettingsTabPage, 
NumberSelect));
+m_xPrefixED->connect_changed(LINK(this,   SwOutlineSettingsTabPage, 
DelimModify));
+m_xSuffixED->connect_changed(LINK(this,   SwOutlineSettingsTabPage, 
DelimModify));
+m_xStartEdit->connect_value_changed(LINK(this,  SwOutlineSettingsTabPage, 
StartModified));
+m_xCharFormatLB->connect_changed(LINK(this,  SwOutlineSettingsTabPage, 
CharFormatHdl));
 }
 
 voidSwOutlineSettingsTabPage::Update()
 {
 // if a template was already selected for this level, select it in the 
ListBox
-m_pCollBox->Enable(USHRT_MAX != nActLevel);
+m_xCollBox->set_sensitive(USHRT_MAX != nActLevel);
 if(USHRT_MAX == nActLevel)
 {
 bool bSamePrefix = true;
@@ -470,43 +469,43 @@ voidSwOutlineSettingsTabPage::Update()
 }
 }
 CheckForStartValue_Impl(aNumFormatArr[0]->GetNumberingType());
-if(bSameType)
-m_pNumberBox->SelectNumb

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

[Christian Lohmaier]

Tag 'libreoffice-6.0.4.2' created by Christian Lohmaier 
 at 2018-05-04 13:30 +

Tag libreoffice-6.0.4.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJa7GBuAAoJEPQ0oe+v7q6jBoQP/i+edp+WATxzuCm2MqRUcEUY
cTPPxVjXiKWxCDK4/EP21P4XY4CNKSeTuVaHi1HNlzdEuF/VB1gnb3tK4zNsFLel
IOyibDRIZgfPBZ5l/VoCL6A2mPFBS4U1bE6fQ6HbpQoSdCvuBsPwi6xeGdZSsMO2
7dQTZW5RagWhL2R3kAys/NXxAyBVtBNrfdMjvlghvl/v8GOxSzlXyIx6mFLFrOEl
kzQW4+VI4G87FYaP/oP2GyBgVXqpB1gNJIKulvv3HrPlETtUvaeqMV9pfAR+f90J
AaPW/Rmcx8FZaLLAvFuldKiBBwHwv+zpmx5fxIsINONtOU9d1x7TGFsj7C1jEe0Y
JzHtfH6AO9fZZ9R10L8Ejdi/WhdV9VCzUWfSfCzEQLTHWpTcLXmmUHghxB6XeZ/S
wN8xvTjEOViSJc9LlideIQm+Y2RMTWcpmlP9SV9iaxsawk869wiSyA58bQCwjtHJ
3T1ecczgUPFQm7p7Y2f8X1ids7FHZdUU7daNgoHMFtX3+0V4+A7evkncxS/ireNT
XdGrf9rI4RS65d7tT3O9lcPwoT7hc4s9DtHdk/VqbHMdTUzsqDMcHiqH6kZK7tgA
Ul3Hvf61Sh3WesaddVurjKO/3a0sSBWXb/wkzUbsQqADJXfP40qHo/8kZJi4UiOz
SjIT9SAUR4QU1pO5T73o
=cssX
-END PGP SIGNATURE-

Changes since libreoffice-6.0.4.1-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-6.0.4.2' created by Christian Lohmaier 
 at 2018-05-04 13:30 +

Tag libreoffice-6.0.4.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJa7GBxAAoJEPQ0oe+v7q6jOMIQAJAC9WDUhLwFsPgbi3LLxDUa
Mt8hlmwqbeEwmqp+sMBWVLMz/hzZcaq83rllfipADB8Pz/Dird40DqNdTaPVud90
rPZz2qd9MfLU7XVc7ZASU21sOvrpZrjq93DgcltBUaAmi/oikmFOM0mxLvQnloB6
hNtgjENWH5fIUhF1K05ADdsBkGk5qBEXzL7phQpWhzQyaia6z4AHVQBgLKoE+I0K
1z6iaxTAE2co4eztqTff0lUBF9YZsQQLEr8ctiHrAS/jAizeIRoEWIoLNr8YDiXq
oy2W/bQ69yNX1I4FhkxxTEPDTxA0JzceaGpiPYruSfMLvPNfAfMa3V+9MWtieLAJ
iINEXHkzujuTbiv9ofAC9Bi8Bp4ZwSuneMI1rYsTimLS6P6uQe5MPDf1UoN+eW0u
DMgoxVocBGCqVkoK5rJFrEUmNMGLq5seRNrae08cLOR1WjErXL2F+fObww6+4W8Q
vejBzxnnck1WY9rfawmb5ZLlfA7UqF9XVC1J4D0MubGXTbnHzUzPQy9xOgJ0Pq8S
mTxj3wt+BJJT0VhDksHbtMjPMe46lfmaOxihRvImxxnWFjovZPx0/J3obS69n2MK
b5ACMmEhf9qu36sI72xLbKO4owYsoIVgVRiJuuE2/bmfa+VHtxVmRNYC2DvelaTt
+Ocvr9glseRnT+t/sNDX
=bj85
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-6.0.4.2' created by Christian Lohmaier 
 at 2018-05-04 13:30 +

Tag libreoffice-6.0.4.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJa7GBnAAoJEPQ0oe+v7q6jqkAP+wSHF8qABdeRYvJDbnwn/ZBi
il45wWQSp1JoWItpbM/HUwwk+Ifwbu9CrZpavEiYauovwB6RHhG+8ha6BB2ni09N
Mr7c0HRwheHsQlouxAJoiWNQXAZ94TjdnvpO+xm0tEkXhNyG92PfxIE85LHFrqXy
XKMIaZGVGLJEEAPyb+w/P+D7MdsyttXi9mORDh7+ZVRyl2ztbg1kRc4kQEF1ctdG
/a8Akk41WTt+PtrL0xT9LGuWFUOzOUWWf9Ku0kreCtwth3XxmpXmhV3QvTe9ckj+
nwMSWbRfatuEhgRi2LCSsXYrHIOpbqS2NKj46zZwxOjwg5U9N5WzkCIWYt3gypkG
pKDFZYbBpD+Ct0przdYQkxgsfI4Wgy6ecsJZ3Ju069cAXQ4RZTtJs/dQyueoH9v/
oSMaaqJgflY5lLyaN3XS0Z9OZXrcR40VM4iIGYja9KBAnHebZ+wtjV5gLdjT6gt+
QFD724KiJgX3+KMREbXeEpuRgrxd4unRIdPmxrGEA2EZON/EQkCnA0so/EZfaBgx
7T/aMVhtcw8y0gb/SpQxdMJwITEMfq+BFrRnThnikzsJVIg9ASx/8fq3oYMigNwp
zK+a/Dhb3bTi+EKVXpuJmwbxz5r4k4loYATA4l/K1qwDuacVzDnKwB7ZWjS5byG/
Gbv7VjdIeyXpdGdnXyK2
=iBoC
-END PGP SIGNATURE-

Changes since cp-6.0-2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-6.0.4.2' created by Christian Lohmaier 
 at 2018-05-04 13:30 +

Tag libreoffice-6.0.4.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJa7GBqAAoJEPQ0oe+v7q6jU7AQAIrN3AUM78PS/tYqdH03AJ9U
6lcDo8FZL4Sk9ukR9RBBJnUeH4sJWyiFpDnDQuepQeZf0+W5zhVmvjqjs+P6hN6N
J3a0cnilUDsTX0zrBiKb9hNeCdAfndJfcmfx7ibQ3vm92rXThPAyyRGQtuq9yH6B
E2pSFIsj3jsr2NuKyihttwGEo+wtIzwILVRJl6G8UzxobxQ/axb9NS8K388RCA2j
wUsYwyNn9tCut2SKJ+9LoL0MWwck6MostEnU+ufzfExxeXTLX7nd1w8xnL3iTmjE
tK4Mt+mABS2Mpm29qA1w/YsbUdzQC//vvs1W/A0YrnPHUD1IZulF3V9C4AYU+sR+
ajqqvTJV5iaQbb4nSC2omLDiZSqNySuQjLqvZbMHOQAZyu39nCp5bGIJiJ2cO6Sn
PPxdbM4f3rHNAbVt0FoMGn9pY3ZEeNf+9MK8dOEoaNr7wdLVmP9MjxRCzPfyHvL1
MilYZhmBVwRClZ1+Qb0d5fRmdiGC13rPaSMREWL+ll8OPXDNfZ2gVR8XLUvG3nVf
zJ+KRdu2Ox7ldaT6h3Z56Hg9QGfObMXZ6RM/zE14DJWUVjRvixGeABlZkLYf10cc
otByy5R93CRzsS//karMduehgumjI8rh06BNe7hjwZy+wOtXfzX41ZLzh9dDrnpn
balhY/jkF6zZy0viyMQB
=fhx2
-END PGP SIGNATURE-

Changes since cp-6.0-2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-4' - configure.ac

[Christian Lohmaier]

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

New commits:
commit 3dd38cfa345d61685dfb673dac0a5bef48eb7a7d
Author: Christian Lohmaier 
Date:   Fri May 4 15:30:54 2018 +0200

bump product version to 6.0.4.2.0+

Change-Id: Ic769ee108f6f2b9bc46bc38fdc96d6da0157770c

diff --git a/configure.ac b/configure.ac
index e6bfb13ebab8..ed0b23c697fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.4.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.4.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-4' - 2 commits - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4724 ++--
 1 file changed, 2393 insertions(+), 2331 deletions(-)

New commits:
commit e27b1eb1632840135af87d25deae520fbf5f0d0e
Author: Christian Lohmaier 
Date:   Fri May 4 15:20:38 2018 +0200

update credits

Change-Id: I8732abab556f9330791d9edcde6aec00ffc97d51
(cherry picked from commit 71bbb0989f1a76b760a75f0fb2f332a8e82b18ce)
(cherry picked from commit 46b49b0f3f539d9a8645c6447a8c4b2e0b463cac)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 35ac812e9c01..0614bed53bb4 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.3.2$Linux_X86_64
 
LibreOffice_project/8f48d515416608e3a835360314dac7e47fd0b8212012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.3.2$Linux_X86_64
 
LibreOffice_project/8f48d515416608e3a835360314dac7e47fd0b8212012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   552
+   621
501
41965
-   21327
+   22412
true
true

@@ -16,9 +16,9 @@
  3649
  3471
  501
- 552
+ 621
  42464
- 21878
+ 23031
  0
  0
  false
@@ -72,7 +72,7 @@
false
false
true
-   7654181
+   7718445
false
false
false
@@ -318,16 +318,16 @@
  
  
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -416,7 +416,7 @@
   

   
-  
+  

   
   
@@ -1048,7 +1048,7 @@

   
  Credits
-1337 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-04-25 23:15:52.
+1337 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-05-04 11:21:15.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1075,10 +1075,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 24051Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 24112Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16009Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16025Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1086,13 +1086,13 @@
  
  
   
-   *Noel GrandinCommits: 
9242Joined: 2011-12-12
+   *Noel GrandinCommits: 
9306Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8153Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8154Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6916Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 6924Joined: 
2010-07-29
   
   
Michael 
StahlCommits: 6417Joined: 
2008-06-16
@@ -1109,12 +1109,12 @@
   

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 2 commits - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4724 ++--
 1 file changed, 2393 insertions(+), 2331 deletions(-)

New commits:
commit 46b49b0f3f539d9a8645c6447a8c4b2e0b463cac
Author: Christian Lohmaier 
Date:   Fri May 4 15:20:38 2018 +0200

update credits

Change-Id: I8732abab556f9330791d9edcde6aec00ffc97d51
(cherry picked from commit 71bbb0989f1a76b760a75f0fb2f332a8e82b18ce)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 35ac812e9c01..0614bed53bb4 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.3.2$Linux_X86_64
 
LibreOffice_project/8f48d515416608e3a835360314dac7e47fd0b8212012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.3.2$Linux_X86_64
 
LibreOffice_project/8f48d515416608e3a835360314dac7e47fd0b8212012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   552
+   621
501
41965
-   21327
+   22412
true
true

@@ -16,9 +16,9 @@
  3649
  3471
  501
- 552
+ 621
  42464
- 21878
+ 23031
  0
  0
  false
@@ -72,7 +72,7 @@
false
false
true
-   7654181
+   7718445
false
false
false
@@ -318,16 +318,16 @@
  
  
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -416,7 +416,7 @@
   

   
-  
+  

   
   
@@ -1048,7 +1048,7 @@

   
  Credits
-1337 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-04-25 23:15:52.
+1337 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-05-04 11:21:15.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1075,10 +1075,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 24051Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 24112Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16009Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16025Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1086,13 +1086,13 @@
  
  
   
-   *Noel GrandinCommits: 
9242Joined: 2011-12-12
+   *Noel GrandinCommits: 
9306Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8153Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8154Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6916Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 6924Joined: 
2010-07-29
   
   
Michael 
StahlCommits: 6417Joined: 
2008-06-16
@@ -1109,12 +1109,12 @@
Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
   
  

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-7' - 2 commits - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4724 ++--
 1 file changed, 2393 insertions(+), 2331 deletions(-)

New commits:
commit c929028b9eba570a32d2a8ce8cf0c153de8f2f19
Author: Christian Lohmaier 
Date:   Fri May 4 15:20:38 2018 +0200

update credits

Change-Id: I8732abab556f9330791d9edcde6aec00ffc97d51
(cherry picked from commit 71bbb0989f1a76b760a75f0fb2f332a8e82b18ce)
(cherry picked from commit 065dd5e3f6cfdb962755d00e5dedc284ab5e2173)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 35ac812e9c01..0614bed53bb4 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.3.2$Linux_X86_64
 
LibreOffice_project/8f48d515416608e3a835360314dac7e47fd0b8212012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.3.2$Linux_X86_64
 
LibreOffice_project/8f48d515416608e3a835360314dac7e47fd0b8212012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   552
+   621
501
41965
-   21327
+   22412
true
true

@@ -16,9 +16,9 @@
  3649
  3471
  501
- 552
+ 621
  42464
- 21878
+ 23031
  0
  0
  false
@@ -72,7 +72,7 @@
false
false
true
-   7654181
+   7718445
false
false
false
@@ -318,16 +318,16 @@
  
  
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -416,7 +416,7 @@
   

   
-  
+  

   
   
@@ -1048,7 +1048,7 @@

   
  Credits
-1337 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-04-25 23:15:52.
+1337 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-05-04 11:21:15.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1075,10 +1075,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 24051Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 24112Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16009Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16025Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1086,13 +1086,13 @@
  
  
   
-   *Noel GrandinCommits: 
9242Joined: 2011-12-12
+   *Noel GrandinCommits: 
9306Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8153Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8154Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6916Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 6924Joined: 
2010-07-29
   
   
Michael 
StahlCommits: 6417Joined: 
2008-06-16
@@ -1109,12 +1109,12 @@
   

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - 2 commits - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4724 ++--
 1 file changed, 2393 insertions(+), 2331 deletions(-)

New commits:
commit 065dd5e3f6cfdb962755d00e5dedc284ab5e2173
Author: Christian Lohmaier 
Date:   Fri May 4 15:20:38 2018 +0200

update credits

Change-Id: I8732abab556f9330791d9edcde6aec00ffc97d51
(cherry picked from commit 71bbb0989f1a76b760a75f0fb2f332a8e82b18ce)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 35ac812e9c01..0614bed53bb4 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.3.2$Linux_X86_64
 
LibreOffice_project/8f48d515416608e3a835360314dac7e47fd0b8212012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.3.2$Linux_X86_64
 
LibreOffice_project/8f48d515416608e3a835360314dac7e47fd0b8212012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   552
+   621
501
41965
-   21327
+   22412
true
true

@@ -16,9 +16,9 @@
  3649
  3471
  501
- 552
+ 621
  42464
- 21878
+ 23031
  0
  0
  false
@@ -72,7 +72,7 @@
false
false
true
-   7654181
+   7718445
false
false
false
@@ -318,16 +318,16 @@
  
  
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -416,7 +416,7 @@
   

   
-  
+  

   
   
@@ -1048,7 +1048,7 @@

   
  Credits
-1337 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-04-25 23:15:52.
+1337 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-05-04 11:21:15.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1075,10 +1075,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 24051Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 24112Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16009Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16025Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1086,13 +1086,13 @@
  
  
   
-   *Noel GrandinCommits: 
9242Joined: 2011-12-12
+   *Noel GrandinCommits: 
9306Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8153Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8154Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6916Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 6924Joined: 
2010-07-29
   
   
Michael 
StahlCommits: 6417Joined: 
2008-06-16
@@ -1109,12 +1109,12 @@
Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
   
  

[Libreoffice-commits] core.git: readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 1546 ++--
 1 file changed, 780 insertions(+), 766 deletions(-)

New commits:
commit 71bbb0989f1a76b760a75f0fb2f332a8e82b18ce
Author: Christian Lohmaier 
Date:   Fri May 4 15:20:38 2018 +0200

update credits

Change-Id: I8732abab556f9330791d9edcde6aec00ffc97d51

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 35ac812e9c01..0614bed53bb4 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.3.2$Linux_X86_64
 
LibreOffice_project/8f48d515416608e3a835360314dac7e47fd0b8212012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.3.2$Linux_X86_64
 
LibreOffice_project/8f48d515416608e3a835360314dac7e47fd0b8212012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   552
+   621
501
41965
-   21327
+   22412
true
true

@@ -16,9 +16,9 @@
  3649
  3471
  501
- 552
+ 621
  42464
- 21878
+ 23031
  0
  0
  false
@@ -72,7 +72,7 @@
false
false
true
-   7654181
+   7718445
false
false
false
@@ -318,16 +318,16 @@
  
  
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -416,7 +416,7 @@
   

   
-  
+  

   
   
@@ -1048,7 +1048,7 @@

   
  Credits
-1337 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-04-25 23:15:52.
+1337 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-05-04 11:21:15.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1075,10 +1075,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 24051Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 24112Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16009Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16025Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1086,13 +1086,13 @@
  
  
   
-   *Noel GrandinCommits: 
9242Joined: 2011-12-12
+   *Noel GrandinCommits: 
9306Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8153Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8154Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6916Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 6924Joined: 
2010-07-29
   
   
Michael 
StahlCommits: 6417Joined: 
2008-06-16
@@ -1109,12 +1109,12 @@
Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
   
   
-   Eike 
RathkeCommits: 4383Joined: 
2000-10-11
+   Eike 
Rathke

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - sw/source

[Caolán McNamara]

 sw/source/filter/xml/xmltexti.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 1bb74bc5410af8773c9ba815fc30252bc99c6791
Author: Caolán McNamara 
Date:   Tue May 1 12:57:02 2018 +0100

set Referer on link mediadescriptor

to allow determining if the source document is from a trusted/untrusted
location

Reviewed-on: https://gerrit.libreoffice.org/53693
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926)

Reviewed-on: https://gerrit.libreoffice.org/53803
Reviewed-by: Miklos Vajna 
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04)

Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c

diff --git a/sw/source/filter/xml/xmltexti.cxx 
b/sw/source/filter/xml/xmltexti.cxx
index 06a6bbe6aeb3..aa2c7fd5fe79 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -575,17 +575,22 @@ uno::Reference< XPropertySet > 
SwXMLTextImportHelper::createAndInsertOOoLink(
 
 uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
 aMediaDescriptor[0].Name = "URL";
-aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL( 
INetURLObject::NO_DECODE ) );
-if ( pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
+aMediaDescriptor[0].Value <<= aURLObj.GetMainURL( 
INetURLObject::NO_DECODE )
+
+if (SfxMedium* pMedium = pDoc->GetDocShell() ? 
pDoc->GetDocShell()->GetMedium() : nullptr)
 {
-uno::Reference< task::XInteractionHandler > xInteraction =
-
pDoc->GetDocShell()->GetMedium()->GetInteractionHandler();
+uno::Reference< task::XInteractionHandler > xInteraction = 
pMedium->GetInteractionHandler();
 if ( xInteraction.is() )
 {
 aMediaDescriptor.realloc( 2 );
 aMediaDescriptor[1].Name = "InteractionHandler";
 aMediaDescriptor[1].Value <<= xInteraction;
 }
+
+const auto nLen = aMediaDescriptor.getLength() + 1;
+aMediaDescriptor.realloc(nLen);
+aMediaDescriptor[nLen - 1].Name = "Referer";
+aMediaDescriptor[nLen - 1].Value <<= pMedium->GetName();
 }
 
 uno::Reference < embed::XEmbeddedObject > xObj(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 basctl/source/dlged/dlged.cxx |5 +-
 basctl/source/dlged/dlgedpage.cxx |3 -
 include/svx/svdpage.hxx   |   15 ++
 sd/source/core/sdpage.cxx |3 -
 svx/source/dialog/contwnd.cxx |3 -
 svx/source/dialog/imapwnd.cxx |4 -
 svx/source/svdraw/svdpage.cxx |   82 +-
 7 files changed, 72 insertions(+), 43 deletions(-)

New commits:
commit 0fe7bda233da3c1f95a82c0050c8f917dc39c22e
Author: Armin Le Grand 
Date:   Fri May 4 11:21:15 2018 +0200

tdf#116879 Separate SdrObjList::Clear() as needed

SdrObjList::Clear() does broadcast the SdrObject
removals and deletions and a SetChanged() to SdrModel.
The old version avoided this in the destructor (with
a comment to not call virtual methods in destructor,
but  the problem is more that the ::Notify triggered
works on the SdrPage already in destruction). To allow
calls to Clear() without broadcasting I splitted this
to a impClearSdrObjList(bool bBrodacast) and rename
of ::Clear to ::ClearSdrObjList to get all places.
Adapted all places in the code as needed, already pre-
checked on Linux that this fixes the problem.

Change-Id: Iea46758fb6b57f2b3d9896959a35260c6f6d52d5
Reviewed-on: https://gerrit.libreoffice.org/53839
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 186e83521b05..f3755414bfb3 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -414,7 +414,10 @@ void DlgEditor::ResetDialog ()
 SdrPageView* pPgView = pDlgEdView->GetSdrPageView();
 bool bWasMarked = pDlgEdView->IsObjMarked( pOldDlgEdForm );
 pDlgEdView->UnmarkAll();
-pPage->Clear();
+
+// clear SdrObjects with broadcasting
+pPage->ClearSdrObjList();
+
 pPage->SetDlgEdForm( nullptr );
 SetDialog( m_xUnoControlDialogModel );
 if( bWasMarked )
diff --git a/basctl/source/dlged/dlgedpage.cxx 
b/basctl/source/dlged/dlgedpage.cxx
index da9ba12ef1b0..73241128d447 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -34,7 +34,8 @@ DlgEdPage::DlgEdPage(DlgEdModel& rModel, bool bMasterPage)
 
 DlgEdPage::~DlgEdPage()
 {
-Clear();
+// clear SdrObjects with broadcasting
+ClearSdrObjList();
 }
 
 SdrPage* DlgEdPage::Clone(SdrModel* const pNewModel) const
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index a4cc40feebd4..fa5364bae022 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -88,13 +88,24 @@ protected:
 private:
 /// simple ActionChildInserted forwarder to have it on a central place
 static void impChildInserted(SdrObject const & rChild);
+
+// tdf#116879 Clear SdrObjList, no Undo done. Used from destructor, but 
also
+// from other places. When used from destructor, suppress broadcasts
+// to not get callbacks to evtl. derived objects already in destruction
+// (e.g. SdrPage)
+void impClearSdrObjList(bool bBroadcast);
+
 public:
 SdrObjList(SdrPage* pNewPage = nullptr);
 virtual ~SdrObjList();
 
 void CopyObjects(const SdrObjList& rSrcList, SdrModel* pNewModel = 
nullptr);
-/// clean up everything (without Undo)
-voidClear();
+
+// tdf#116879 clean up everything (without Undo), plus broadcasting
+// changes. Split to this call and a private one (impClearSdrObjList)
+// that allows cleanup without broadcasting in the destructor
+void ClearSdrObjList();
+
 SdrObjListKind GetListKind() const  { return eListKind; }
 void   SetListKind(SdrObjListKind eNewKind) { eListKind=eNewKind; }
 SdrObjList*GetUpList() const{ return pUpList; }
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index fc60775f6cef..aadb6a91e905 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -175,7 +175,8 @@ SdPage::~SdPage()
 
 clearChildNodes(mxAnimationNode);
 
-Clear();
+// clear SdrObjects with broadcasting
+ClearSdrObjList();
 }
 
 struct OrdNumSorter
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 4ac1e23083d5..014a10d9e472 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -54,7 +54,8 @@ void ContourWindow::SetPolyPolygon(const tools::PolyPolygon& 
rPolyPoly)
 // them first (!)
 pView->UnmarkAllObj();
 
-pPage->Clear();
+// clear SdrObjects with broadcasting
+pPage->ClearSdrObjList();
 
 for (sal_uInt16 i = 0; i < nPolyCount; i++)
 {
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 3e3f1667fbf2..6275842c6791 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -101,8 +101,8 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap 
)
 
 if(pPage)
 {
-// clear all draw objects
-pPage->Clear();
+ 

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

[Caolán McNamara]

 sw/source/filter/xml/xmltexti.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 3491f4a2a402116de5b6a3911d334f622c381eb5
Author: Caolán McNamara 
Date:   Tue May 1 12:57:02 2018 +0100

set Referer on link mediadescriptor

to allow determining if the source document is from a trusted/untrusted
location

Reviewed-on: https://gerrit.libreoffice.org/53693
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926)

Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
Reviewed-on: https://gerrit.libreoffice.org/53803
Reviewed-by: Miklos Vajna 
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04)

diff --git a/sw/source/filter/xml/xmltexti.cxx 
b/sw/source/filter/xml/xmltexti.cxx
index 3cc7372f8986..a26e4f7640dc 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -575,17 +575,22 @@ uno::Reference< XPropertySet > 
SwXMLTextImportHelper::createAndInsertOOoLink(
 
 uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
 aMediaDescriptor[0].Name = "URL";
-aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ) );
-if ( pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
+aMediaDescriptor[0].Value <<= aURLObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE );
+
+if (SfxMedium* pMedium = pDoc->GetDocShell() ? 
pDoc->GetDocShell()->GetMedium() : nullptr)
 {
-uno::Reference< task::XInteractionHandler > xInteraction =
-
pDoc->GetDocShell()->GetMedium()->GetInteractionHandler();
+uno::Reference< task::XInteractionHandler > xInteraction = 
pMedium->GetInteractionHandler();
 if ( xInteraction.is() )
 {
 aMediaDescriptor.realloc( 2 );
 aMediaDescriptor[1].Name = "InteractionHandler";
 aMediaDescriptor[1].Value <<= xInteraction;
 }
+
+const auto nLen = aMediaDescriptor.getLength() + 1;
+aMediaDescriptor.realloc(nLen);
+aMediaDescriptor[nLen - 1].Name = "Referer";
+aMediaDescriptor[nLen - 1].Value <<= pMedium->GetName();
 }
 
 uno::Reference < embed::XEmbeddedObject > xObj(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.1' - sw/source

[Caolán McNamara]

 sw/source/filter/xml/xmltexti.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 7a6b608591e21ef61dc05cff9fc58da531035755
Author: Caolán McNamara 
Date:   Tue May 1 12:57:02 2018 +0100

set Referer on link mediadescriptor

to allow determining if the source document is from a trusted/untrusted
location

Reviewed-on: https://gerrit.libreoffice.org/53693
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926)

Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
Reviewed-on: https://gerrit.libreoffice.org/53803
Reviewed-by: Miklos Vajna 
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04)

diff --git a/sw/source/filter/xml/xmltexti.cxx 
b/sw/source/filter/xml/xmltexti.cxx
index 3cc7372f8986..a26e4f7640dc 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -575,17 +575,22 @@ uno::Reference< XPropertySet > 
SwXMLTextImportHelper::createAndInsertOOoLink(
 
 uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
 aMediaDescriptor[0].Name = "URL";
-aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ) );
-if ( pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
+aMediaDescriptor[0].Value <<= aURLObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE );
+
+if (SfxMedium* pMedium = pDoc->GetDocShell() ? 
pDoc->GetDocShell()->GetMedium() : nullptr)
 {
-uno::Reference< task::XInteractionHandler > xInteraction =
-
pDoc->GetDocShell()->GetMedium()->GetInteractionHandler();
+uno::Reference< task::XInteractionHandler > xInteraction = 
pMedium->GetInteractionHandler();
 if ( xInteraction.is() )
 {
 aMediaDescriptor.realloc( 2 );
 aMediaDescriptor[1].Name = "InteractionHandler";
 aMediaDescriptor[1].Value <<= xInteraction;
 }
+
+const auto nLen = aMediaDescriptor.getLength() + 1;
+aMediaDescriptor.realloc(nLen);
+aMediaDescriptor[nLen - 1].Name = "Referer";
+aMediaDescriptor[nLen - 1].Value <<= pMedium->GetName();
 }
 
 uno::Reference < embed::XEmbeddedObject > xObj(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - sw/source

[Caolán McNamara]

 sw/source/filter/xml/xmltexti.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit cc57a57d632f0d592063653f80a5616b4e6ee368
Author: Caolán McNamara 
Date:   Tue May 1 12:57:02 2018 +0100

set Referer on link mediadescriptor

to allow determining if the source document is from a trusted/untrusted
location

Reviewed-on: https://gerrit.libreoffice.org/53693
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926)

Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
Reviewed-on: https://gerrit.libreoffice.org/53803
Reviewed-by: Miklos Vajna 
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04)

diff --git a/sw/source/filter/xml/xmltexti.cxx 
b/sw/source/filter/xml/xmltexti.cxx
index 3cc7372f8986..a26e4f7640dc 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -575,17 +575,22 @@ uno::Reference< XPropertySet > 
SwXMLTextImportHelper::createAndInsertOOoLink(
 
 uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
 aMediaDescriptor[0].Name = "URL";
-aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ) );
-if ( pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
+aMediaDescriptor[0].Value <<= aURLObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE );
+
+if (SfxMedium* pMedium = pDoc->GetDocShell() ? 
pDoc->GetDocShell()->GetMedium() : nullptr)
 {
-uno::Reference< task::XInteractionHandler > xInteraction =
-
pDoc->GetDocShell()->GetMedium()->GetInteractionHandler();
+uno::Reference< task::XInteractionHandler > xInteraction = 
pMedium->GetInteractionHandler();
 if ( xInteraction.is() )
 {
 aMediaDescriptor.realloc( 2 );
 aMediaDescriptor[1].Name = "InteractionHandler";
 aMediaDescriptor[1].Value <<= xInteraction;
 }
+
+const auto nLen = aMediaDescriptor.getLength() + 1;
+aMediaDescriptor.realloc(nLen);
+aMediaDescriptor[nLen - 1].Name = "Referer";
+aMediaDescriptor[nLen - 1].Value <<= pMedium->GetName();
 }
 
 uno::Reference < embed::XEmbeddedObject > xObj(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-4' - translations

[Christian Lohmaier]

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

New commits:
commit 48d971e698ebfaac9574964cdc2efef00c16be2a
Author: Christian Lohmaier 
Date:   Fri May 4 13:40:06 2018 +0200

Updated core
Project: translations  04deccf23ffd036da3c85079d34aa41749f5a801

update translations for 6.0.4 rc2

and force-fix errors using pocheck

Change-Id: I07ccad5e9307bdbc75778efe4cba01a5e82f84d4
(cherry picked from commit adb3b92c5d9fff53ba638017eda2a2536ff8beb4)

diff --git a/translations b/translations
index 0433857c218d..04deccf23ffd 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0433857c218d32fdf3e8ce5570e44a7dad6fc3bb
+Subproject commit 04deccf23ffd036da3c85079d34aa41749f5a801
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - translations

[Christian Lohmaier]

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

New commits:
commit d7fc88beb0c2f0f22a6d2d5e66874a617c2e8b25
Author: Christian Lohmaier 
Date:   Fri May 4 13:40:06 2018 +0200

Updated core
Project: translations  adb3b92c5d9fff53ba638017eda2a2536ff8beb4

update translations for 6.0.4 rc2

and force-fix errors using pocheck

Change-Id: I07ccad5e9307bdbc75778efe4cba01a5e82f84d4

diff --git a/translations b/translations
index d42511d49b23..adb3b92c5d9f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d42511d49b23ede170624557f8674303b7ab116b
+Subproject commit adb3b92c5d9fff53ba638017eda2a2536ff8beb4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'distro/collabora/collabora-online-cd-3-2'

[Jan Holesovsky]

New branch 'distro/collabora/collabora-online-cd-3-2' available with the 
following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'distro/collabora/cd-5.3-3.2'

[Caolán McNamara]

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

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

[Stephan Bergmann]

 compilerplugins/clang/compat.hxx  |   12 +++
 compilerplugins/clang/constparams.cxx |2 -
 compilerplugins/clang/cppunitassertequals.cxx |3 +-
 compilerplugins/clang/cstylecast.cxx  |   24 --
 compilerplugins/clang/literaltoboolconversion.cxx |4 +--
 compilerplugins/clang/nullptr.cxx |   11 --
 compilerplugins/clang/salcall.cxx |2 -
 compilerplugins/clang/sallogareas.cxx |3 +-
 8 files changed, 39 insertions(+), 22 deletions(-)

New commits:
commit b72a31b37f9bdcfd3f59b3256b465bf0fb5a50ca
Author: Stephan Bergmann 
Date:   Thu May 3 21:13:35 2018 +0200

Adapt to Clang trunk SourceManager::getImmediateExpansionRange changes

...of 
"PR37189 Fix incorrect end source location and spelling for a split '>>' 
token",
changing (among others) the return type of getImmediateExpansionRange from a
std::pair of token locations to CharSourceRange (which will typically also
represent token locations, but might also represent char locations).

For now, map the return value of getImmediateExpansionRange back to a 
std::pair
(as expected by our compilerplugins code in its current form), and mark the
char location case with a TODO (which will need to be addressed if any of 
our
plugins starts to produce wrong results due to not handling that char 
location
case).  In the long run, we should instead adapt our code to use the new 
return
type of getImmediateExpansionRange directly.

Change-Id: Idc2f5dc43830af4798b55bf605976c4ab146c522
Reviewed-on: https://gerrit.libreoffice.org/53817
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 5a540b8ef695..e77846ab1166 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_COMPILERPLUGINS_CLANG_COMPAT_HXX
 
 #include 
+#include 
 
 #include "clang/AST/Decl.h"
 #include "clang/AST/Expr.h"
@@ -49,6 +50,17 @@ inline clang::FunctionDecl::param_const_range parameters(
 }
 #endif
 
+inline std::pair 
getImmediateExpansionRange(
+clang::SourceManager const & SM, clang::SourceLocation Loc)
+{
+#if CLANG_VERSION >= 7
+auto const csr = SM.getImmediateExpansionRange(Loc);
+if (csr.isCharRange()) { /*TODO*/ }
+return {csr.getBegin(), csr.getEnd()};
+#else
+return SM.getImmediateExpansionRange(Loc);
+#endif
+}
 
 inline bool isPointWithin(
 clang::SourceManager const & SM, clang::SourceLocation Location, 
clang::SourceLocation Start,
diff --git a/compilerplugins/clang/constparams.cxx 
b/compilerplugins/clang/constparams.cxx
index 89be6f684033..471da7367dc0 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -179,7 +179,7 @@ bool ConstParams::CheckTraverseFunctionDecl(FunctionDecl * 
functionDecl)
 canonicalDecl->getLocStart(), compiler.getSourceManager(), 
compiler.getLangOpts()) };
 if (name.startswith("DECL_LINK") || 
name.startswith("DECL_STATIC_LINK"))
 return false;
-auto loc2 = 
compiler.getSourceManager().getImmediateExpansionRange(canonicalDecl->getLocStart()).first;
+auto loc2 = 
compat::getImmediateExpansionRange(compiler.getSourceManager(), 
canonicalDecl->getLocStart()).first;
 if (compiler.getSourceManager().isMacroBodyExpansion(loc2))
 {
 StringRef name2 { Lexer::getImmediateMacroName(
diff --git a/compilerplugins/clang/cppunitassertequals.cxx 
b/compilerplugins/clang/cppunitassertequals.cxx
index 5b0f8f5278c4..cff8908c7a46 100644
--- a/compilerplugins/clang/cppunitassertequals.cxx
+++ b/compilerplugins/clang/cppunitassertequals.cxx
@@ -9,6 +9,7 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "compat.hxx"
 
 /**
   Check for calls to CPPUNIT_ASSERT when it should be using 
CPPUNIT_ASSERT_EQUALS
@@ -95,7 +96,7 @@ bool CppunitAssertEquals::VisitCallExpr(const CallExpr* 
callExpr)
 << callExpr->getSourceRange();
 return true;
 }
-auto range = compiler.getSourceManager().getImmediateExpansionRange(loc);
+auto range = 
compat::getImmediateExpansionRange(compiler.getSourceManager(), loc);
 checkExpr(
 SourceRange(range.first, range.second), name,
 e2->IgnoreParenImpCasts(), false);
diff --git a/compilerplugins/clang/cstylecast.cxx 
b/compilerplugins/clang/cstylecast.cxx
index 228e3878e5eb..4bf3aaf6460f 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -12,6 +12,8 @@
 #include 
 #include 
 #include 
+
+#include "compat.hxx"
 #include "plugin.hxx"
 
 //
@@ -351,7 +353,7 @@ bool CStyleCast::isLastTokenOfImmediateMacroBodyExpansion(
 assert(MI != nullptr);
 if (spell == MI->getDefinitionEndLoc()

[Libreoffice-commits] core.git: instsetoo_native/inc_common

[andreas kainz]

 instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico   
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico 
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico 
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico 
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico  
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico   
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico  
|binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico
|binary
 9 files changed

New commits:
commit fe18111ac42101e6653402c214f7fc1df03acd43
Author: andreas kainz 
Date:   Thu May 3 08:35:52 2018 +0200

tdf#103677 Windows installer icons

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

diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico
index c57e3da02ce6..061408d83569 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico
index 28506ef2c0d5..1b5128f8f296 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico
index 6ffe0b43a3ad..f07622f71acb 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico
index 8f7e90089208..8e308aaf18c4 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico
index e15c79f57211..49e6a3f3759e 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico 
and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico 
differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico
index 3d74e0db4ae4..2c7168a3e7fb 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico 
differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico
index 72248002ef14..1130136b80eb 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico 
differ
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico
index 7ee77b084edf..862f4285add2 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico
index c976e3839edb..dcab5c3e2459 100644
Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico 
and b/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libnumbertext

[Stephan Bergmann]

 external/libnumbertext/UnpackedTarball_libnumbertext.mk |6 ++
 external/libnumbertext/configure.patch  |   10 ++
 2 files changed, 16 insertions(+)

New commits:
commit d59760428669a3e6b90524b9bc52829ece539c80
Author: Stephan Bergmann 
Date:   Thu May 3 16:54:11 2018 +0200

Allow actually passing CXXFLAGS into external/libnumbertext

...as external/libnumbertext/ExternalProject_libnumbertext.mk tried to do

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

diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk 
b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
index ac2a14133205..f5c1607562e3 100644
--- a/external/libnumbertext/UnpackedTarball_libnumbertext.mk
+++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
@@ -13,4 +13,10 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libnumbertext,$(LIBNUMBERTEXT_TARBA
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libnumbertext))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libnumbertext,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \
+external/libnumbertext/configure.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libnumbertext/configure.patch 
b/external/libnumbertext/configure.patch
new file mode 100644
index ..f31ab31cdc57
--- /dev/null
+++ b/external/libnumbertext/configure.patch
@@ -0,0 +1,10 @@
+--- configure.ac
 configure.ac
+@@ -22,7 +22,6 @@
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_LANG([C++])
+-CXXFLAGS='-Wall -std=c++11'
+ 
+ AC_CHECK_HEADERS([codecvt regex])
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 277062b509b2709ce5f4f9a8f67713a3b7d0
Author: Gabor Kelemen 
Date:   Fri May 4 12:58:13 2018 +0200

Updated core
Project: help  f624ccb2b85d920da466a11b10134ae8bbddb05b

Fix ahelps and bookmarks on Text direction pages

Change-Id: I32709b69cec1883c2427f702f1959484070d7ac3
Reviewed-on: https://gerrit.libreoffice.org/53842
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 9c5d8ae1bdbb..f624ccb2b85d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9c5d8ae1bdbbf28b4ba9a6ff0a11b3c9bd1ce296
+Subproject commit f624ccb2b85d920da466a11b10134ae8bbddb05b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/shared/02/0204.xhp |7 ---
 source/text/shared/02/0205.xhp |7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit f624ccb2b85d920da466a11b10134ae8bbddb05b
Author: Gabor Kelemen 
Date:   Fri May 4 12:58:13 2018 +0200

Fix ahelps and bookmarks on Text direction pages

Change-Id: I32709b69cec1883c2427f702f1959484070d7ac3
Reviewed-on: https://gerrit.libreoffice.org/53842
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/shared/02/0204.xhp 
b/source/text/shared/02/0204.xhp
index 24e89fe69..ad65b5d56 100644
--- a/source/text/shared/02/0204.xhp
+++ b/source/text/shared/02/0204.xhp
@@ -33,9 +33,10 @@
   
   
   
-  
-Text running from left to right
-  Specifies the 
horizontal direction of the text.
+
+
+Text 
running from left to right
+  Specifies the horizontal direction of the 
text.
   
   
   
diff --git a/source/text/shared/02/0205.xhp 
b/source/text/shared/02/0205.xhp
index 64132ba1f..7295b66bf 100644
--- a/source/text/shared/02/0205.xhp
+++ b/source/text/shared/02/0205.xhp
@@ -33,9 +33,10 @@
   
   
   
-  
-Text running from top to bottom
-  Specifies the vertical 
direction of the text.
+
+
+Text 
running from top to bottom
+  Specifies the vertical 
direction of the text.
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/shared/01/0209.xhp |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9c5d8ae1bdbbf28b4ba9a6ff0a11b3c9bd1ce296
Author: Gabor Kelemen 
Date:   Fri May 4 12:33:23 2018 +0200

Fix bookmarks and ahelps on Select All commands page

Change-Id: I3f117c2e62bf23c8f2036fc9ea85715a2e784d65
Reviewed-on: https://gerrit.libreoffice.org/53841
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/shared/01/0209.xhp 
b/source/text/shared/01/0209.xhp
index 218bd8eae..eefcdbe88 100644
--- a/source/text/shared/01/0209.xhp
+++ b/source/text/shared/01/0209.xhp
@@ -34,17 +34,17 @@
   
 
   
-  
-
-Select All
-  Selects the entire 
content of the current file, frame, or text 
object.
+
+
+Select 
All
+  Selects the entire content of the current file, 
frame, or text object.
   
 
To 
select all of the cells on a sheet, click the button at the intersection of the 
column and row header in the top left corner of the sheet. 
 
   
   
 
-  
- To 
select all of the sheets in a spreadsheet file, right-click the name tab of a 
sheet, and then choose Select All Sheets.Selects all of the sheets in the 
current spreadsheet.  

+  
+ To select all of the sheets in a 
spreadsheet file, right-click the name tab of a sheet, and then choose 
Select All Sheets.Selects all of the sheets in the current 
spreadsheet.  
  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit ed70c94ccfd39844a8facd60f1e7294d2fe9b908
Author: Gabor Kelemen 
Date:   Fri May 4 12:33:23 2018 +0200

Updated core
Project: help  9c5d8ae1bdbbf28b4ba9a6ff0a11b3c9bd1ce296

Fix bookmarks and ahelps on Select All commands page

Change-Id: I3f117c2e62bf23c8f2036fc9ea85715a2e784d65
Reviewed-on: https://gerrit.libreoffice.org/53841
Tested-by: Jenkins 
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 819ea03090a6..9c5d8ae1bdbb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 819ea03090a68b250f09df30731f9ad0c0f9e625
+Subproject commit 9c5d8ae1bdbbf28b4ba9a6ff0a11b3c9bd1ce296
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sfx2/source/appl/sfxhelp.cxx |   99 +++
 1 file changed, 7 insertions(+), 92 deletions(-)

New commits:
commit 7cb822ca4875704f0a8b3816ad4f23d230848400
Author: Stephan Bergmann 
Date:   Wed May 2 10:46:31 2018 +0200

Revert "Enable new Help to be installed as extension"

This reverts commit cdbb14cedb7d07aec0dda47fbb5ab65a02fb0cf6, no longer 
needed
after e606179d5722427bc4137838585b38892e01b328 "tdf#116240: Include
--with-help=html in installation sets".

Change-Id: Iaf26b937aa40a6563589ac182b7365224b455482
Reviewed-on: https://gerrit.libreoffice.org/53725
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index a45f2ac62b6d..0ebb845b1dcc 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -39,7 +39,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -83,10 +82,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::system;
-using ::com::sun::star::deployment::PackageInformationProvider;
-using ::com::sun::star::deployment::XPackageInformationProvider;
-
-namespace uno = css::uno ;
 
 class NoHelpErrorBox
 {
@@ -205,78 +200,6 @@ bool impl_hasHTMLHelpInstalled()
 return bOK;
 }
 
-// Root path of the HTML help extension
-OUString getExtensionHTMLHelpRootURL()
-{
-static OUString s_instURL;
-if (!s_instURL.isEmpty())
-return s_instURL;
-
-static OUString aLocaleStr;
-
-if (aLocaleStr.isEmpty())
-{
-// detect installed locale
-aLocaleStr = HelpLocaleString();
-}
-
-Reference< XComponentContext > m_xContext( 
comphelper::getProcessComponentContext() );
-const Reference< XPackageInformationProvider > xPackageInfo = 
PackageInformationProvider::get(m_xContext);
-
-s_instURL = xPackageInfo->getPackageLocation(aLocaleStr + 
".help.libreoffice.org");
-
-return s_instURL;
-}
-
-/// Check if HTML help extension is installed
-/// verify extension installed and correct version
-bool impl_hasHTMLHelpExtensionInstalled()
-{
-if (comphelper::LibreOfficeKit::isActive())
-return false;
-
-static OUString aLocaleStr;
-static OUString aRootURL;
-static OUString aVersion;
-
-if (aLocaleStr.isEmpty())
-{
-// detect installed locale
-aLocaleStr = HelpLocaleString();
-}
-
-OUString aIdentifier(aLocaleStr + ".help.libreoffice.org");
-
-if (aRootURL.isEmpty())
-{
-Reference< XComponentContext > m_xContext( 
comphelper::getProcessComponentContext() );
-const Reference< XPackageInformationProvider > xPackageInfo = 
PackageInformationProvider::get(m_xContext);
-aRootURL = xPackageInfo->getPackageLocation(aIdentifier);
-if(aRootURL.isEmpty())
-{
-return false;
-}
-uno::Sequence< uno::Sequence< OUString > > aExtensionList 
(xPackageInfo->getExtensionList());
-
-if(aExtensionList.hasElements())
-{
-for (long i = aExtensionList.getLength() - 1; i >= 0; i--)
-{
-SAL_INFO("sfx.appl", aExtensionList[i][0] + " - " + 
aExtensionList[i][1]) ;
-if (aExtensionList[i][0] == aIdentifier)
-{
-aVersion = aExtensionList[i][1];
-break;
-}
-}
-}
-}
-
-bool bOK(!aRootURL.isEmpty() && 
(aVersion.startsWith(utl::ConfigManager::getProductVersion(;
-
-return bOK;
-}
-
 } // namespace
 
 /// Return the locale we prefer for displaying help
@@ -767,12 +690,12 @@ static bool impl_showOnlineHelp( const OUString& rURL )
 #define SHTML3 "\"> window.location.href = \""
 #define SHTML4 "\";Help Page 
Redirection"
 
-
-static bool impl_showOfflineHelp( const OUString& rURL, const OUString& 
rBaseInstallPath)
+static bool impl_showOfflineHelp( const OUString& rURL )
 {
+OUString aBaseInstallPath = getHelpRootURL();
 OUString const aInternal( "vnd.sun.star.help://"  );
 
-OUString aHelpLink( rBaseInstallPath + "/index.html?" );
+OUString aHelpLink( aBaseInstallPath + "/index.html?" );
 aHelpLink += rURL.copy( aInternal.getLength() );
 aHelpLink = aHelpLink.replaceAll("%2F","/").replaceAll("%3A",":");
 
@@ -890,14 +813,10 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 impl_showOnlineHelp( aHelpURL );
 return true;
 }
-if ( impl_hasHTMLHelpExtensionInstalled() )
-{
-impl_showOfflineHelp( aHelpURL, getExtensionHTMLHelpRootURL() );
-return true;
-}
+
 if ( impl_hasHTMLHelpInstalled() )
 {
-impl_showOfflineHelp(aHelpURL, getHelpRootURL());
+impl_showOfflineHelp(aHelpURL);
 return true;
 }
 
@@ -1037,16 +956,12 @@ bool SfxHelp::Start_Impl(cons

[Libreoffice-commits] core.git: vcl/inc vcl/win

[Noel Grandin]

 vcl/inc/win/salgdi.h|1 -
 vcl/win/gdi/salfont.cxx |   24 +++-
 vcl/win/gdi/salgdi.cxx  |3 +--
 3 files changed, 8 insertions(+), 20 deletions(-)

New commits:
commit e74fd983e3195ea2867acd4b925e9899571a1651
Author: Noel Grandin 
Date:   Thu May 3 13:38:44 2018 +0200

tdf#117364 Special Character dialog grid font issues

Revert "tdf#113643 Editing tables in Impress lags terribly"
This reverts commit 13a1bc409d9b2f0d14f4d316b7977b1fc2eb3c8a.

Will probably need more sophisticated caching, so just revert this
for now.

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

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index f45d85c4c89c..23531842dde3 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -177,7 +177,6 @@ private:
 RGNDATA*mpClipRgnData;  // ClipRegion-Data
 RGNDATA*mpStdClipRgnData;   // Cache 
Standard-ClipRegion-Data
 int mnPenWidth; // line width
-const PhysicalFontFace* mpCurrentPhysicalFontFace; // the font face 
currently selected into the DC
 
 LogicalFontInstance* GetWinFontEntry(int nFallbackLevel);
 
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 0acdbd666bef..6fe84173c710 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -57,22 +57,10 @@
 
 using namespace vcl;
 
-using BoundRectCacheKey = std::pair;
-namespace std
-{
-template<> struct hash
-{
-std::size_t operator()(const BoundRectCacheKey & key ) const
-{
-return std::hash()(key.first)
-^  std::hash()(key.second);
-}
-};
-};
 // GetGlyphOutlineW() seems to be a little slow, and doesn't seem to do it's 
own caching (tested on Windows10).
 // TODO include the font as part of the cache key, then we won't need to clear 
it on font change
 // The cache limit is set by the rough number of characters needed to read 
your average Asian newspaper.
-static o3tl::lru_map 
g_BoundRectCache(3000);
+static o3tl::lru_map g_BoundRectCache(3000);
 
 static const int MAXFONTHEIGHT = 2048;
 
@@ -852,9 +840,10 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
 
 HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern const * i_pFont, float& 
o_rFontScale, HFONT& o_rOldFont)
 {
-mpCurrentPhysicalFontFace = i_pFont->mpFontData;
-
+// clear the cache on font change
+g_BoundRectCache.clear();
 HFONT hNewFont = nullptr;
+
 HDC hdcScreen = nullptr;
 if( mbVirDev )
 // only required for virtual devices, see below for details
@@ -1366,7 +1355,7 @@ void WinSalGraphics::ClearDevFontCache()
 
 bool WinSalGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, 
tools::Rectangle& rRect)
 {
-auto it = 
g_BoundRectCache.find({mpCurrentPhysicalFontFace,rGlyph.maGlyphId});
+auto it = g_BoundRectCache.find(rGlyph.maGlyphId);
 if (it != g_BoundRectCache.end())
 {
 rRect = it->second;
@@ -1397,7 +1386,8 @@ bool WinSalGraphics::GetGlyphBoundRect(const GlyphItem& 
rGlyph, tools::Rectangle
 rRect.SetTop(static_cast( mfCurrentFontScale * rRect.Top() ));
 rRect.SetBottom(static_cast( mfCurrentFontScale * rRect.Bottom() ) + 
1);
 
-g_BoundRectCache.insert({{mpCurrentPhysicalFontFace,rGlyph.maGlyphId}, 
rRect});
+g_BoundRectCache.insert({rGlyph.maGlyphId, rRect});
+
 return true;
 }
 
diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index 890b28cc0c57..8aa601a461b2 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -614,8 +614,7 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, 
bool bScreen, HWND hW
 mhDefFont(nullptr),
 mhDefPal(nullptr),
 mpStdClipRgnData(nullptr),
-mnPenWidth(GSL_PEN_WIDTH),
-mpCurrentPhysicalFontFace(nullptr)
+mnPenWidth(GSL_PEN_WIDTH)
 {
 if (OpenGLHelper::isVCLOpenGLEnabled() && !mbPrinter)
 mpImpl.reset(new WinOpenGLSalGraphicsImpl(*this, pProvider));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

 filter/source/xslt/export/wordml/ooo2wordml_list.xsl |   11 ++-
 sw/source/filter/ww8/docxattributeoutput.cxx |3 +++
 writerfilter/source/dmapper/ConversionHelper.cxx |   11 +++
 3 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 1501df419ea4d40358d705a281fd9662088ba51e
Author: László Németh 
Date:   Fri May 4 00:56:39 2018 +0200

tdf#117171 DOCX export/import of cardinalText, ordinalText

and ordinal (indicator) numbering styles.

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

diff --git a/filter/source/xslt/export/wordml/ooo2wordml_list.xsl 
b/filter/source/xslt/export/wordml/ooo2wordml_list.xsl
index 8c090d92ca30..e3c9614d6e06 100644
--- a/filter/source/xslt/export/wordml/ooo2wordml_list.xsl
+++ b/filter/source/xslt/export/wordml/ooo2wordml_list.xsl
@@ -228,6 +228,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -328,7 +337,7 @@
 
 
 
-
 
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6324318cd45f..a1eaea107ffb 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6158,6 +6158,9 @@ static OString impl_LevelNFC( sal_uInt16 nNumberingType , 
const SfxItemSet *pOut
 case style::NumberingType::CHARS_ARABIC: aType="arabicAlpha"; break;
 case style::NumberingType::CHARS_THAI: aType="thaiLetters"; break;
 case style::NumberingType::CHARS_PERSIAN: aType="hindiVowels"; break;
+case style::NumberingType::TEXT_NUMBER: aType="ordinal"; break;
+case style::NumberingType::TEXT_CARDINAL: aType="cardinalText"; break;
+case style::NumberingType::TEXT_ORDINAL: aType="ordinalText"; break;
 /*
 Fallback the rest to decimal.
 case style::NumberingType::NATIVE_NUMBERING:
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx 
b/writerfilter/source/dmapper/ConversionHelper.cxx
index d2311e46713a..f4eddffc2625 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -485,7 +485,7 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
 nRet = style::NumberingType::ROMAN_LOWER;
 break;
 case NS_ooxml::LN_Value_ST_NumberFormat_ordinal:
-nRet = style::NumberingType::ARABIC;
+nRet = style::NumberingType::TEXT_NUMBER;
 break;
 case NS_ooxml::LN_Value_ST_NumberFormat_bullet:
 nRet = style::NumberingType::CHAR_SPECIAL;
@@ -576,12 +576,15 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
 case NS_ooxml::LN_Value_ST_NumberFormat_decimalFullWidth2:
 nRet = style::NumberingType::FULLWIDTH_ARABIC;
 break;
+case NS_ooxml::LN_Value_ST_NumberFormat_cardinalText:
+nRet = style::NumberingType::TEXT_CARDINAL;
+break;
+case NS_ooxml::LN_Value_ST_NumberFormat_ordinalText:
+nRet = style::NumberingType::TEXT_ORDINAL;
+break;
 default: nRet = style::NumberingType::ARABIC;
 }
 /*  TODO: Lots of additional values are available - some are supported in the 
I18 framework
-NS_ooxml::LN_Value_ST_NumberFormat_ordinal = 91682;
-NS_ooxml::LN_Value_ST_NumberFormat_cardinalText = 91683;
-NS_ooxml::LN_Value_ST_NumberFormat_ordinalText = 91684;
 NS_ooxml::LN_Value_ST_NumberFormat_hex = 91685;
 NS_ooxml::LN_Value_ST_NumberFormat_chicago = 91686;
 NS_ooxml::LN_Value_ST_NumberFormat_decimalFullWidth = 91691;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: autoconf and libnumbertext dependency

[Chris Sherlock]

On 4 May 2018, at 4:41 pm, Tor Lillqvist  wrote:
> 
> 
> configure.ac:6 : error: Autoconf version 2.68 or 
> higher is required
> 
> I’m running on MacOS High Sierra. 
> 
> macOS does not come with any version of autoconf (or automake), so you have 
> always needed to build it yourself anyway in order to build LibreOffice, no? 
> (Installing some pre-built one from some 3rd-party packaging thing, homebrew 
> etc, has not been recommended). So just make sure that you build and install 
> a new enough version? I seem to have 2.69, and it is from 2015, so version 
> 2.68 isn't exactly brand new.
> 
> (How LODE handles it I have no idea. Does it include autoconf, and is that 
> what is too old?)
> 
> --tml
> 

Reasonable point, I’ll look into this more. Thanks Tor. 

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

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

[Caolán McNamara]

 include/sfx2/tabdlg.hxx|4 +--
 sfx2/source/dialog/tabdlg.cxx  |   44 +++--
 sw/source/ui/envelp/label1.cxx |4 +--
 3 files changed, 25 insertions(+), 27 deletions(-)

New commits:
commit d038d1f5ee0d24a5ad739d5e91015f90fd09b02e
Author: Caolán McNamara 
Date:   Thu May 3 15:39:05 2018 +0100

coverity#1435273 Resource leak in object

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

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index c3d6d6ec2cf6..2d9b449112d5 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -254,7 +254,7 @@ protected:
 virtual voidRefreshInputSet();
 virtual voidPageCreated(const OString &rName, SfxTabPage 
&rPage);
 
-SfxItemSet* m_pExampleSet;
+std::unique_ptr m_xExampleSet;
 SfxItemSet* GetInputSetImpl();
 SfxTabPage* GetTabPage(const OString& rPageId) const;
 
@@ -294,7 +294,7 @@ public:
 
 short   execute();
 
-const SfxItemSet*   GetExampleSet() const { return m_pExampleSet; }
+const SfxItemSet*   GetExampleSet() const { return m_xExampleSet.get(); }
 
 SAL_DLLPRIVATE void Start_Impl();
 };
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index ec2c9befddda..8c4e04983358 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1470,7 +1470,6 @@ SfxTabDialogController::SfxTabDialogController
 , m_pSet(pItemSet ? new SfxItemSet(*pItemSet) : nullptr)
 , m_pOutSet(nullptr)
 , m_pRanges(nullptr)
-, m_pExampleSet(nullptr)
 {
 Init_Impl(bEditFmt);
 }
@@ -1492,7 +1491,7 @@ void SfxTabDialogController::Init_Impl(bool /*bFmtFlag*/)
 
 if (m_pSet)
 {
-m_pExampleSet = new SfxItemSet(*m_pSet);
+m_xExampleSet.reset(new SfxItemSet(*m_pSet));
 m_pOutSet.reset(new SfxItemSet(*m_pSet->GetPool(), 
m_pSet->GetRanges()));
 }
 }
@@ -1557,8 +1556,8 @@ IMPL_LINK_NOARG(SfxTabDialogController, ResetHdl, 
weld::Button&, void)
 // Also reset relevant items of ExampleSet and OutSet to initial state
 if (pDataObject->fnGetRanges)
 {
-if (!m_pExampleSet)
-m_pExampleSet = new SfxItemSet(*m_pSet);
+if (!m_xExampleSet)
+m_xExampleSet.reset(new SfxItemSet(*m_pSet));
 
 const SfxItemPool* pPool = m_pSet->GetPool();
 const sal_uInt16* pTmpRanges = (pDataObject->fnGetRanges)();
@@ -1584,12 +1583,12 @@ IMPL_LINK_NOARG(SfxTabDialogController, ResetHdl, 
weld::Button&, void)
 const SfxPoolItem* pItem;
 if (SfxItemState::SET == m_pSet->GetItemState(nWh, false, 
&pItem))
 {
-m_pExampleSet->Put(*pItem);
+m_xExampleSet->Put(*pItem);
 m_pOutSet->Put(*pItem);
 }
 else
 {
-m_pExampleSet->ClearItem(nWh);
+m_xExampleSet->ClearItem(nWh);
 m_pOutSet->ClearItem(nWh);
 }
 nTmp++;
@@ -1624,8 +1623,8 @@ IMPL_LINK(SfxTabDialogController, ActivatePageHdl, const 
OString&, rPage, void)
 pTabPage->Reset(m_pSet);
 pDataObject->bRefresh = false;
 
-if (m_pExampleSet)
-pTabPage->ActivatePage(*m_pExampleSet);
+if (m_xExampleSet)
+pTabPage->ActivatePage(*m_xExampleSet);
 
 if (pTabPage->IsReadOnly() || m_pImpl->bHideResetBtn)
 m_xResetBtn->hide();
@@ -1660,8 +1659,8 @@ IMPL_LINK(SfxTabDialogController, DeactivatePageHdl, 
const OString&, rPage, bool
 
 DeactivateRC nRet = DeactivateRC::LeavePage;
 
-if (!m_pExampleSet && pPage->HasExchangeSupport() && m_pSet)
-m_pExampleSet = new SfxItemSet(*m_pSet->GetPool(), 
m_pSet->GetRanges());
+if (!m_xExampleSet && pPage->HasExchangeSupport() && m_pSet)
+m_xExampleSet.reset(new SfxItemSet(*m_pSet->GetPool(), 
m_pSet->GetRanges()));
 
 if (m_pSet)
 {
@@ -1672,9 +1671,9 @@ IMPL_LINK(SfxTabDialogController, DeactivatePageHdl, 
const OString&, rPage, bool
 else
 nRet = pPage->DeactivatePage(nullptr);
 if ( ( DeactivateRC::LeavePage & nRet ) == DeactivateRC::LeavePage &&
- aTmp.Count() && m_pExampleSet)
+ aTmp.Count() && m_xExampleSet)
 {
-m_pExampleSet->Put( aTmp );
+m_xExampleSet->Put( aTmp );
 m_pOutSet->Put( aTmp );
 }
 }
@@ -1682,13 +1681,12 @@ IMPL_LINK(SfxTabDialogController, DeactivatePageHdl, 
const OString&, rPage, bool
 {
 if ( pPage->HasExchangeSupport() ) //!!!
 {
-if ( !m_pExampleSet )
+if (!m_xExampleSet)
 {
 SfxItemPool* pPool = pPage->GetItemSet().GetPool();
-m_pExampleSet =
- 

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

[Eike Rathke]

 svl/source/numbers/zforfind.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 90df301f6d4e7ab0b660d9e39c6fe639ef5ae348
Author: Eike Rathke 
Date:   Thu May 3 14:59:33 2018 +0200

Use the currently active locale if no format passed

No format passed doesn't necessarily mean the init/system locale,
use the locale set at SvNumberFormatter::IsNumberFormat()

Change-Id: Ief1025fa14145396ba096842e2f3341496ce4ce8
Reviewed-on: https://gerrit.libreoffice.org/53829
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index e55786ea9d17..be310b5cf390 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -709,8 +709,9 @@ bool ImpSvNumberInputScan::GetCurrency( const OUString& 
rString, sal_Int32& nPos
 if ( rString.getLength() > nPos )
 {
 if ( !aUpperCurrSymbol.getLength() )
-{   // if no format specified the currency of the initialized formatter
-LanguageType eLang = (mpFormat ? mpFormat->GetLanguage() : 
pFormatter->GetLanguage());
+{   // If no format specified the currency of the currently active 
locale.
+LanguageType eLang = (mpFormat ? mpFormat->GetLanguage() :
+
pFormatter->GetLocaleData()->getLanguageTag().getLanguageType());
 aUpperCurrSymbol = pFormatter->GetCharClass()->uppercase(
 SvNumberFormatter::GetCurrencyEntry( eLang ).GetSymbol() );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/xml/xmltexti.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 2d87c267267530077a94c894bc619831b01d1c04
Author: Caolán McNamara 
Date:   Tue May 1 12:57:02 2018 +0100

set Referer on link mediadescriptor

to allow determining if the source document is from a trusted/untrusted
location

Reviewed-on: https://gerrit.libreoffice.org/53693
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926)

Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
Reviewed-on: https://gerrit.libreoffice.org/53803
Reviewed-by: Miklos Vajna 
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/sw/source/filter/xml/xmltexti.cxx 
b/sw/source/filter/xml/xmltexti.cxx
index 537dbcadb7ae..d1498cf3cc71 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -572,17 +572,22 @@ uno::Reference< XPropertySet > 
SwXMLTextImportHelper::createAndInsertOOoLink(
 
 uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
 aMediaDescriptor[0].Name = "URL";
-aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ) );
-if ( pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
+aMediaDescriptor[0].Value <<= aURLObj.GetMainURL( 
INetURLObject::DecodeMechanism::NONE );
+
+if (SfxMedium* pMedium = pDoc->GetDocShell() ? 
pDoc->GetDocShell()->GetMedium() : nullptr)
 {
-uno::Reference< task::XInteractionHandler > xInteraction =
-
pDoc->GetDocShell()->GetMedium()->GetInteractionHandler();
+uno::Reference< task::XInteractionHandler > xInteraction = 
pMedium->GetInteractionHandler();
 if ( xInteraction.is() )
 {
 aMediaDescriptor.realloc( 2 );
 aMediaDescriptor[1].Name = "InteractionHandler";
 aMediaDescriptor[1].Value <<= xInteraction;
 }
+
+const auto nLen = aMediaDescriptor.getLength() + 1;
+aMediaDescriptor.realloc(nLen);
+aMediaDescriptor[nLen - 1].Name = "Referer";
+aMediaDescriptor[nLen - 1].Value <<= pMedium->GetName();
 }
 
 uno::Reference < embed::XEmbeddedObject > xObj(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/qa/extras/rtfexport/data/tdf117268.rtf   |   35 ++
 sw/qa/extras/rtfexport/rtfexport.cxx|   38 
 writerfilter/source/rtftok/rtfdispatchvalue.cxx |7 
 3 files changed, 80 insertions(+)

New commits:
commit aa51623f7a8a11e0701913a34eab8c0a11316733
Author: Mike Kaganski 
Date:   Thu May 3 15:09:40 2018 +0300

tdf#117268: treat erroneous \itap0 the same way as Word does

... so that if we are inside a table, it would not convert table
paragraphs into top-level paragraphs. (The in-the-wild documents
with this invalid input are, e.g., generated by Consultant+ legal
reference database).

Reviewed-on: https://gerrit.libreoffice.org/53790
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
(cherry picked from commit 247dabcb0b92a62b233ec0237deac84e6675325c)

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

diff --git a/sw/qa/extras/rtfexport/data/tdf117268.rtf 
b/sw/qa/extras/rtfexport/data/tdf117268.rtf
new file mode 100644
index ..608ea65637cc
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf117268.rtf
@@ -0,0 +1,35 @@
+{\rtf1
+{\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000
+\pard
+Text 1
+\itap0
+\cell
+\row}
+\pard
+\par
+\itap0
+{\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000
+\pard
+Text 2
+\itap0
+\cell
+\row}
+\itap0
+{\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000
+\pard
+\itap2
+Text 3
+\nestcell
+\itap2
+{\nesttableprops\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx1000
+\nestrow}
+\itap0
+\cell
+\row}
+\itap0
+\par
+}
\ No newline at end of file
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index ebc700c194f4..fd25f1cefe3d 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -1331,6 +1332,43 @@ DECLARE_RTFEXPORT_TEST(testTdf113202, "tdf113202.rtf")
 CPPUNIT_ASSERT(getProperty(getParagraph(4), "ParaContextMargin"));
 }
 
+DECLARE_RTFEXPORT_TEST(testTdf117268, "tdf117268.rtf")
+{
+// Here we check that we correctly mimic Word's treatment of erroneous 
\itap0 inside tables.
+// Previously, the first table was import as text, and second top-level 
one only imported
+// last row with nested table (first row was also imported as text).
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY_THROW);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(),
+uno::UNO_QUERY_THROW);
+
+// First (simple) table
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("Text 1"), xCell->getString());
+
+// Nested table
+xTable.set(xTables->getByIndex(1), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
+xCell.set(xTable->getCellByName("A1"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("Text 3"), xCell->getString());
+uno::Reference xNestedAnchor(xTable->getAnchor(), 
uno::UNO_QUERY_THROW);
+uno::Reference 
xAnchorCell(xNestedAnchor->getPropertyValue("Cell"),
+ uno::UNO_QUERY_THROW);
+
+// Outer table
+xTable.set(xTables->getByIndex(2), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
+xCell.set(xTable->getCellByName("A1"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("Text 2"), xCell->getString());
+xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY_THROW);
+uno::Reference xTextRangeCompare(xCell, 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), 
xTextRangeCompare->compareRegionStarts(xAnchorCell, xCell));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx 
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 20379b4ef45f..3e1fd25b7b6a 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -228,6 +228,13 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword 
nKeyword, int nParam)
 {
 c

Re: How to make a locale available for CTL text

[Eike Rathke]

Hi Khaled,

On Sunday, 2018-04-29 11:00:19 +0200, Khaled Hosny wrote:

> > Does it have to be [ms] and [ms-Arab] or could it be {[ms] or [zsm] or
> > [zlm]} and {[zsm-Arab] or [zlm-Arab] (or maybe [ms-Arab])}?
> 
> I don’t really know. HarfBuzz expects a BCP 47 language tag, and I use
> LanguageTag::getBcp47() to get that, so as long as it gives me “ms” all
> good (the script part is redundant for me, because that is detected from
> the text string and passed independently to HarfBuzz).

That should do then:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=10a047ae8a6e5c47edc1ca11ed573f340b249f61

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/inc

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |2 ++
 i18nlangtag/source/isolang/mslangid.cxx|8 ++--
 i18nlangtag/source/languagetag/languagetag.cxx |2 +-
 include/i18nlangtag/lang.h |2 ++
 svtools/inc/langtab.hrc|4 +++-
 5 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 10a047ae8a6e5c47edc1ca11ed573f340b249f61
Author: Eike Rathke 
Date:   Fri May 4 00:21:33 2018 +0200

Add Malay Arabic [ms-Arab-MY] and [ms-Arab-BN] to language list, both CTL

Change-Id: Iac7dddf8b29048c504b9ec695ecd08e5bf12a768
Reviewed-on: https://gerrit.libreoffice.org/53828
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index c994fd1c7cc0..f2af1092ed42 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -758,6 +758,8 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_USER_CREE_PLAINS_LATIN, "crk-Latn", "CN", kSAME },  
 // erroneous tdf#73973
 { LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CN", kSAME },  
 // erroneous tdf#73973
 { LANGUAGE_USER_HUNGARIAN_ROVAS,"hu-Hung", "HU", k0},
+{ LANGUAGE_USER_MALAY_ARABIC_MALAYSIA,  "ms-Arab", "MY", k0},
+{ LANGUAGE_USER_MALAY_ARABIC_BRUNEI,"ms-Arab", "BN", k0},
 { LANGUAGE_DONTKNOW,"",""  , k0}   
 // marks end of table
 };
 
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 6d4b98781640..dc15bf30662e 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -215,7 +215,9 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
 LANGUAGE_KURDISH_ARABIC_LSO,
 LANGUAGE_USER_KURDISH_SOUTHERN_IRAN,
 LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ,
-LANGUAGE_USER_HUNGARIAN_ROVAS))
+LANGUAGE_USER_HUNGARIAN_ROVAS,
+LANGUAGE_USER_MALAY_ARABIC_MALAYSIA,
+LANGUAGE_USER_MALAY_ARABIC_BRUNEI))
 {
 return true;
 }
@@ -332,7 +334,9 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
  LANGUAGE_USER_KYRGYZ_CHINA,
  LANGUAGE_USER_HUNGARIAN_ROVAS,
  LANGUAGE_USER_MANCHU,
- LANGUAGE_USER_XIBE))
+ LANGUAGE_USER_XIBE,
+ LANGUAGE_USER_MALAY_ARABIC_MALAYSIA,
+ LANGUAGE_USER_MALAY_ARABIC_BRUNEI))
 {
 nScript = css::i18n::ScriptType::COMPLEX;
 }
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 8d9c2424c9b9..d46ff8bba324 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -3117,7 +3117,7 @@ LanguageTag 
makeLanguageTagFromAppleLanguageId(AppleLanguageId nLanguage)
 nLang = LANGUAGE_MALAY_MALAYSIA;
 break;
 case AppleLanguageId::MALAY_ARABIC:
-return LanguageTag("ms-Arab");
+nLang = LANGUAGE_USER_MALAY_ARABIC_MALAYSIA;
 break;
 case AppleLanguageId::AMHARIC:
 nLang = LANGUAGE_AMHARIC_ETHIOPIA;
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index e1645f31d94f..4030651e9123 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -740,6 +740,8 @@ namespace o3tl
 #define LANGUAGE_USER_ARMENIAN_IRAN LanguageType(0x842B)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_ARMENIAN)) */
 #define LANGUAGE_USER_ARMENIAN_WESTERN  LanguageType(0x069F)
 #define LANGUAGE_USER_ARMENIAN_CLASSIC  LanguageType(0x06A0)
+#define LANGUAGE_USER_MALAY_ARABIC_MALAYSIA LanguageType(0x803E)  /* 
makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_MALAY_MALAYSIA)) */
+#define LANGUAGE_USER_MALAY_ARABIC_BRUNEI   LanguageType(0x843E)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_MALAY_BRUNEI_DARUSSALAM)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index a054dbe3232c..69f397cfab29 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -410,7 +410,9 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Russia)") , 
LANGUAGE_USER_ARMENIAN_RUSSIA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Iran)") , 
LANGUAGE_USER_ARMENIAN_IRAN },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Western (Armenia)") , 
LANGUAGE_USER_ARMENIAN_WESTERN },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Classic (Armenia)") , 
LANGUAGE_USER_ARMENIAN_CLASSIC }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Classic (Armenia)") , 
LANGUAGE_USER_ARMENIAN_CLASSIC },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Malaysia)") , 
LANGUAGE_USER_MALAY_ARABIC_MALAY

[Libreoffice-commits] core.git: configure.ac lingucomponent/source

[Rene Engelhard]

 configure.ac|2 +-
 lingucomponent/source/numbertext/numbertext.cxx |4 
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 672501c91feab21824e77f3087dc3e69a14f5f0b
Author: Rene Engelhard 
Date:   Fri May 4 10:55:42 2018 +0200

set -DENABLE_LIBNJUMBERTEXT after pkg-config

so that we don't "loose" the pkg-config --cflags info. That also makes the
 #ifdef in lingucomponent/source/numbertext/numbertext.cxx not needed 
anymore

Change-Id: Ia5771859a4a181f1a8a450d9ad4130b1e53abf8e

diff --git a/configure.ac b/configure.ac
index a840bed74350..657c11001367 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9653,8 +9653,8 @@ dnl 
===
 dnl Checking for libnumbertext
 dnl ===
 ENABLE_LIBNUMBERTEXT=TRUE
-LIBNUMBERTEXT_CFLAGS="-DENABLE_LIBNUMBERTEXT"
 libo_CHECK_SYSTEM_MODULE([libnumbertext],[LIBNUMBERTEXT],[libnumbertext >= 
1.0.0])
+LIBNUMBERTEXT_CFLAGS="$LIBNUMBERTEXT_CFLAGS -DENABLE_LIBNUMBERTEXT"
 if test "$with_system_libnumbertext" = "yes"; then
 SYSTEM_LIBNUMBERTEXT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir 
libnumbertext`
 SYSTEM_LIBNUMBERTEXT=YES
diff --git a/lingucomponent/source/numbertext/numbertext.cxx 
b/lingucomponent/source/numbertext/numbertext.cxx
index 237aaa46ba01..ec841a4bcab2 100644
--- a/lingucomponent/source/numbertext/numbertext.cxx
+++ b/lingucomponent/source/numbertext/numbertext.cxx
@@ -37,13 +37,9 @@
 
 #include 
 
-#ifdef SYSTEM_LIBNUMBERTEXT
-#include 
-#else
 #ifdef ENABLE_LIBNUMBERTEXT
 #include 
 #endif
-#endif
 
 using namespace ::osl;
 using namespace ::cppu;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GCC 8 code generation

[Michael Stahl]

it looks like GCC 8 has sprouted some new security mitigation features:

https://gcc.gnu.org/gcc-8/changes.html

-fstack-clash-protection:
* The new option -fstack-clash-protection causes the compiler to insert 
probes whenever stack space is allocated statically or dynamically to 
reliably detect stack overflows and thus mitigate the attack vector that 
relies on jumping over a stack guard page as provided by the operating 
system.


-fcf-protection:
* A new option -fcf-protection=[full|branch|return|none] is introduced 
to perform code instrumentation to increase program security by checking 
that target addresses of control-flow transfer instructions (such as 
indirect function call, function return, indirect jump) are valid. 
Currently the instrumentation is supported on x86 GNU/Linux targets 
only. See the user guide for further information about the option syntax 
and section "New Targets and Target Specific Improvements" for 
IA-32/x86-64 for more details.


the latter looks similar to MSVC's /guard:cf, which we don't use yet, 
and might potentially run into issues with the C++/UNO bridge's dynamic 
code generation.


https://docs.microsoft.com/en-us/cpp/build/reference/guard-enable-control-flow-guard

but i'm hoping the stack-clash-protection could be enabled without issues.

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

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e046c36776503f2dc934891412a8019c62530e03
Author: Stephan Bergmann 
Date:   Fri May 4 10:21:23 2018 +0200

workdir/UnpackedTarball/libnumbertext/src/config.h is generated

...from workdir/UnpackedTarball/libnumbertext/src/config.h.in, and included 
via
lingucomponent/source/numbertext/numbertext.cxx ->
workdir/UnpackedTarball/libnumbertext/src/Numbertext.hxx

Change-Id: Idd007cf230b0c297c6dd692b1565336209a73ba8

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 299400174d2c..ce29fb744cfe 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -847,7 +847,7 @@ else
 $(call gb_LinkTarget_add_libs,$(1),\
$(call 
gb_UnpackedTarball_get_dir,libnumbertext)/src/.libs/libnumbertext-1.0.a\
 )
-$(call gb_LinkTarget_use_external_project,$(1),libnumbertext)
+$(call gb_LinkTarget_use_external_project,$(1),libnumbertext,full)
 
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/ImageTree.hxx  |4 +++
 vcl/inc/implimagetree.hxx  |3 ++
 vcl/source/image/ImageTree.cxx |5 
 vcl/source/image/ImplImageTree.cxx |   40 +
 vcl/unx/gtk3/gtk3gtkinst.cxx   |   32 +++--
 5 files changed, 69 insertions(+), 15 deletions(-)

New commits:
commit 92d5cd31d93ca30f97fab09304a59aa41268431e
Author: Caolán McNamara 
Date:   Thu May 3 17:47:43 2018 +0100

give icon data directly to gtk, skipping internal loaders

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

diff --git a/include/vcl/ImageTree.hxx b/include/vcl/ImageTree.hxx
index a40905d863ef..66a82b000ebc 100644
--- a/include/vcl/ImageTree.hxx
+++ b/include/vcl/ImageTree.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -55,6 +56,9 @@ public:
 VCL_DLLPUBLIC OUString getImageUrl(
 OUString const & name, OUString const & style, OUString const & lang);
 
+VCL_DLLPUBLIC std::shared_ptr getImageStream(
+OUString const & rName, OUString const & rStyle, OUString const & 
rLang);
+
 VCL_DLLPUBLIC bool loadImage(
 OUString const & name, OUString const & style,
 BitmapEx & bitmap, bool localized,
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index 92052e3c57e4..e35c9ac6ccfb 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -69,6 +69,9 @@ public:
 OUString getImageUrl(
 OUString const & name, OUString const & style, OUString const & lang);
 
+std::shared_ptr getImageStream(
+OUString const & rName, OUString const & rStyle, OUString const & 
rLang);
+
 bool loadImage(
 OUString const & name, OUString const & style,
 BitmapEx & bitmap, bool localized,
diff --git a/vcl/source/image/ImageTree.cxx b/vcl/source/image/ImageTree.cxx
index 941812925190..2e20183b0da5 100644
--- a/vcl/source/image/ImageTree.cxx
+++ b/vcl/source/image/ImageTree.cxx
@@ -30,6 +30,11 @@ OUString ImageTree::getImageUrl(OUString const & rName, 
OUString const & rStyle,
 return mpImplImageTree->getImageUrl(rName, rStyle, rLang);
 }
 
+std::shared_ptr ImageTree::getImageStream(OUString const & 
rName, OUString const & rStyle, OUString const & rLang)
+{
+return mpImplImageTree->getImageStream(rName, rStyle, rLang);
+}
+
 bool ImageTree::loadImage(OUString const & rName, OUString const & rStyle,
   BitmapEx & rBitmap, bool bLocalized,
   const ImageLoadFlags eFlags)
diff --git a/vcl/source/image/ImplImageTree.cxx 
b/vcl/source/image/ImplImageTree.cxx
index 296800681fa7..ba1f22155d27 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -256,6 +256,46 @@ OUString ImplImageTree::getImageUrl(OUString const & 
rName, OUString const & rSt
 return OUString();
 }
 
+std::shared_ptr ImplImageTree::getImageStream(OUString const & 
rName, OUString const & rStyle, OUString const & rLang)
+{
+OUString aStyle(rStyle);
+
+while (!aStyle.isEmpty())
+{
+try
+{
+setStyle(aStyle);
+
+if (checkPathAccess())
+{
+IconSet& rIconSet = getCurrentIconSet();
+const css::uno::Reference& 
rNameAccess = rIconSet.maNameAccess;
+
+LanguageTag aLanguageTag(rLang);
+
+for (OUString& rPath: getPaths(rName, aLanguageTag))
+{
+if (rNameAccess->hasByName(rPath))
+{
+css::uno::Reference aStream;
+bool ok = rNameAccess->getByName(rPath) >>= aStream;
+assert(ok);
+(void)ok; // prevent unused warning in release build
+return wrapStream(aStream);
+}
+}
+}
+}
+catch (const css::uno::Exception & e)
+{
+SAL_INFO("vcl", e);
+}
+
+aStyle = fallbackStyle(aStyle);
+}
+return std::shared_ptr();
+}
+
 OUString ImplImageTree::fallbackStyle(const OUString& rsStyle)
 {
 OUString sResult;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index ed78e141b124..d88b8a5b9e95 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -32,8 +32,8 @@
 #include 
 #include 
 #include 
+#include 
 #include 
-#include 
 #include 
 
 using namespace com::sun::star;
@@ -4226,6 +4226,8 @@ private:
 ResHookProc m_pStringReplace;
 OUString m_sHelpRoot;
 OString m_aUtf8HelpRoot;
+OUString m_aIconTheme;
+OUString m_aUILang;
 GtkBuilder* m_pBuilder;
 GSList* m_pObjectList;
 GtkWidget* m_pParentWidget;
@@ -4251,20 +4253,18 @@ private:
 if (icon_name)

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

[Caolán McNamara]

 sc/source/ui/inc/mergecellsdialog.hxx  |   15 +-
 sc/source/ui/miscdlgs/mergecellsdialog.cxx |   30 -
 sc/source/ui/view/viewfun2.cxx |7 +++---
 sc/uiconfig/scalc/ui/mergecellsdialog.ui   |   25 ++--
 4 files changed, 34 insertions(+), 43 deletions(-)

New commits:
commit 736cebb414af587e7ac82f1326b06ce4022badf4
Author: Caolán McNamara 
Date:   Thu May 3 16:46:52 2018 +0100

weld ScMergeCellsDialog

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

diff --git a/sc/source/ui/inc/mergecellsdialog.hxx 
b/sc/source/ui/inc/mergecellsdialog.hxx
index 49ef2da533b5..5fcbea926dda 100644
--- a/sc/source/ui/inc/mergecellsdialog.hxx
+++ b/sc/source/ui/inc/mergecellsdialog.hxx
@@ -11,9 +11,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_MERGECELLSDIALOG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_MERGECELLSDIALOG_HXX
 
-#include 
-#include 
-#include 
+#include 
 
 enum ScMergeCellsOption
 {
@@ -22,16 +20,15 @@ enum ScMergeCellsOption
 EmptyContentHiddenCells
 };
 
-class ScMergeCellsDialog : public ModalDialog
+class ScMergeCellsDialog : public weld::GenericDialogController
 {
-VclPtr mpRBMoveContent;
-VclPtr mpRBKeepContent;
-VclPtr mpRBEmptyContent;
+std::unique_ptr m_xRBMoveContent;
+std::unique_ptr m_xRBKeepContent;
+std::unique_ptr m_xRBEmptyContent;
 
 public:
-ScMergeCellsDialog( vcl::Window * pParent );
+ScMergeCellsDialog(weld::Window* pParent);
 virtual ~ScMergeCellsDialog() override;
-virtual void dispose() override;
 
 ScMergeCellsOption GetMergeCellsOption();
 };
diff --git a/sc/source/ui/miscdlgs/mergecellsdialog.cxx 
b/sc/source/ui/miscdlgs/mergecellsdialog.cxx
index aaff85bf8eaf..b936890437ab 100644
--- a/sc/source/ui/miscdlgs/mergecellsdialog.cxx
+++ b/sc/source/ui/miscdlgs/mergecellsdialog.cxx
@@ -10,41 +10,29 @@
 
 #include 
 
-ScMergeCellsDialog::ScMergeCellsDialog( vcl::Window * pParent )
-: ModalDialog( pParent, "MergeCellsDialog",
-   "modules/scalc/ui/mergecellsdialog.ui" )
+ScMergeCellsDialog::ScMergeCellsDialog(weld::Window * pParent)
+: GenericDialogController(pParent, "modules/scalc/ui/mergecellsdialog.ui", 
"MergeCellsDialog")
+, m_xRBMoveContent(m_xBuilder->weld_radio_button("move-cells-radio"))
+, m_xRBKeepContent(m_xBuilder->weld_radio_button("keep-content-radio"))
+, m_xRBEmptyContent(m_xBuilder->weld_radio_button("empty-cells-radio"))
 {
-get(mpRBMoveContent, "move-cells-radio");
-get(mpRBKeepContent, "keep-content-radio");
-get(mpRBEmptyContent, "empty-cells-radio");
-
-mpRBKeepContent->Check();
+m_xRBKeepContent->set_active(true);
 }
 
 ScMergeCellsDialog::~ScMergeCellsDialog()
 {
-disposeOnce();
-}
-
-void ScMergeCellsDialog::dispose()
-{
-mpRBMoveContent.disposeAndClear();
-mpRBKeepContent.disposeAndClear();
-mpRBEmptyContent.disposeAndClear();
-ModalDialog::dispose();
 }
 
 ScMergeCellsOption ScMergeCellsDialog::GetMergeCellsOption()
 {
-if ( mpRBMoveContent->IsChecked() )
+if ( m_xRBMoveContent->get_active() )
 return MoveContentHiddenCells;
-if ( mpRBKeepContent->IsChecked() )
+if ( m_xRBKeepContent->get_active() )
 return KeepContentHiddenCells;
-if ( mpRBEmptyContent->IsChecked() )
+if ( m_xRBEmptyContent->get_active() )
 return EmptyContentHiddenCells;
 assert(!"Unknown selection for merge cells.");
 return KeepContentHiddenCells; // default value
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 956593bfd234..29da9f810ff0 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1148,12 +1148,13 @@ bool ScViewFunc::MergeCells( bool bApi, bool& 
rDoContents, bool bCenter )
 bool bShowDialog = 
officecfg::Office::Calc::Compatibility::MergeCells::ShowDialog::get();
 if (!bApi && bShowDialog)
 {
-ScopedVclPtr aBox( 
VclPtr::Create( GetViewData().GetDialogParent() ) );
-sal_uInt16 nRetVal = aBox->Execute();
+vcl::Window* pWin = GetViewData().GetDialogParent();
+ScMergeCellsDialog aBox(pWin ? pWin->GetFrameWeld() : nullptr);
+sal_uInt16 nRetVal = aBox.run();
 
 if ( nRetVal == RET_OK )
 {
-switch ( aBox->GetMergeCellsOption() )
+switch (aBox.GetMergeCellsOption())
 {
 case MoveContentHiddenCells:
 rDoContents = true;
diff --git a/sc/uiconfig/scalc/ui/mergecellsdialog.ui 
b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
index a7413ff396b5..028b56862846 100644
--- a/sc/uiconfig/scalc/ui/mergecellsdialog.ui
+++ b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
@@ -1,15 +1,15 @@

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

[Caolán McNamara]

 vcl/source/image/ImplImageTree.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a7dde8db81624c4f31c93b8611a4636d662f548e
Author: Caolán McNamara 
Date:   Thu May 3 16:59:08 2018 +0100

can make good use of fact its a SvMemorystream

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

diff --git a/vcl/source/image/ImplImageTree.cxx 
b/vcl/source/image/ImplImageTree.cxx
index d27eaec8d018..296800681fa7 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -124,14 +124,14 @@ OUString getNameNoExtension(OUString const & sName)
 return sName.copy(0, nDotPosition);
 }
 
-std::shared_ptr wrapStream(css::uno::Reference< 
css::io::XInputStream > const & stream)
+std::shared_ptr wrapStream(css::uno::Reference< 
css::io::XInputStream > const & stream)
 {
 // This could use SvInputStream instead if that did not have a broken
 // SeekPos implementation for an XInputStream that is not also XSeekable
 // (cf. "@@@" at tags/DEV300_m37/svtools/source/misc1/strmadpt.cxx@264807
 // l. 593):
 OSL_ASSERT(stream.is());
-std::shared_ptr s(std::make_shared());
+std::shared_ptr s(std::make_shared());
 for (;;)
 {
 sal_Int32 const size = 2048;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: distro-configs/LibreOfficeVanillaMacAppStore.conf

[Tor Lillqvist]

 distro-configs/LibreOfficeVanillaMacAppStore.conf |   23 ++
 1 file changed, 23 insertions(+)

New commits:
commit c1293a13b0e98eae5a2e12e59693bdfbf93b6dc9
Author: Tor Lillqvist 
Date:   Fri May 4 10:22:57 2018 +0300

Add a distro-config file for LibreOffice Vanilla on the Mac App Store

In addition to the options in this file, the following are present in
our autogen.input for the 6.0 branch:

--disable-ccache
--enable-macosx-code-signing=
--enable-macosx-package-signing=
--with-external-tar=/Users/tml/lo/src
--with-lang=bg br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr 
ga gd gl hr hu id is it ja km lt lv nb nl nn pl pt\
 pt-BR ro ru sk sl sv ta tr uk zh-CN zh-TW
--with-macosx-bundle-identifier=com.collabora.libreoffice-free
--with-product-name=LibreOffice Vanilla
--with-package-version=
--with-referenced-git=/Users/tml/lo/core
--without-parallelism

The language list is a guesstimate of what localisations are good
enough. Suggestions of languages that should be dropped (or added)
welcome.

(We don't want a language with immediately visible holes (in top level
menus or common dialogs) in the translation coverage. That is an
insult to a user who would want to use that language and worse than
not providing a localisation in that language at all. In my opinion.)

Change-Id: I0dd1c2848cd964f6bf9e17d95d1735b81b235b1c

diff --git a/distro-configs/LibreOfficeVanillaMacAppStore.conf 
b/distro-configs/LibreOfficeVanillaMacAppStore.conf
new file mode 100644
index ..dfcf54f3c0e0
--- /dev/null
+++ b/distro-configs/LibreOfficeVanillaMacAppStore.conf
@@ -0,0 +1,23 @@
+--disable-ext-ct2n
+--disable-ext-mariadb-connector
+--disable-ext-numbertext
+--disable-firebird-sdbc
+--disable-lotuswordpro
+--disable-lpsolve
+--disable-neon
+--disable-odk
+--disable-online-update
+--disable-pdfimport
+--disable-postgresql-sdbc
+--enable-extension-integration
+--enable-macosx-sandbox
+--enable-mpl-subset
+--enable-readonly-installset
+--enable-release-build
+--enable-symbols
+--with-help
+--with-myspell-dicts
+--with-theme=tango
+--with-vendor=Collabora
+--without-java
+--without-package-format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

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

New commits:
commit fb027f0f556c48e42a08059c8e92c3bfc0f52209
Author: Gabor Kelemen 
Date:   Thu May 3 21:03:07 2018 +0200

tdf#112607 Use better wording for single/multiple print job option

Separate seems to be more straightforward here

Change-Id: I214211d75354da4b01ca5fe23dd51525d9892743
Reviewed-on: https://gerrit.libreoffice.org/53816
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 3ea852d44397..b2308cf2f5b9 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1454,7 +1454,7 @@
 6
 
   
-Create single print jobs for collated 
output
+Create separate print jobs for collated 
output
 True
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits