[API CHANGE] Adapt css.uri UNOIDL entities to RFC 3986

[Stephan Bergmann]

I'd like to draw your attention to the planned URE API change 
 "[API CHANGE] Adapt css.uri 
UNOIDL entities to RFC 3986".  The original implementation of 
css.uri.UriReferenceFactory et al was based on then-current RFC 2396 
( "Uniform Resource Identifiers 
(URI): Generic Syntax"), but which has long since been obsoleted by RFC 
3986 ( "Uniform Resource Identifier 
(URI): Generic Syntax").  Conformance with the new RFC required some 
changes in behavior of those UNOIDL entities, mostly around corner 
cases; for details see the list below, extracted from the commit message.


If there is no objections over the coming days, I'm going to push this 
to master soon.




* XUriReference.isHierarchical is obsolete and deprecated.

* The behavior of XUriReference.hasAuthority, XUriReference.getAuthority,
  XUriReference.getPath, XUriReference.hasRelativePath,
  XUriReference.getPathSegmentCount, XUriReference.getPathSegment,
  XUriReference.hasQuery, and XUriReference.getQuery has been made consistent
  for all URIs, no matter whether they were considered hierarchical or opaque in
  the past.

* The behavior of XUriReferenceFactory.makeAbsolute and
  XUriReferenceFactory.makeRelative has been changed to match the RFC 3986
  reference resolution specification.  The XUriReferenceFactory.makeAbsolulte
  parameter processSpecialBaseSegments has been renamed to
  processAdditionalSpecialSegments, as per the updated specification it now
  controls treatment of special segments in the given uriReference, in addition
  to special segments in the given baseUriReference.  (Renaming UNOIDL interface
  method parameters is technically an incompatible change, but the benefits of
  improved clarity presumably outweigh any potential drawbacks in this case.)


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

Re: We'd like to continue the production of the 32-bit deb packages

[Stephan Bergmann]

On 21/08/2019 00:11, dreamn...@gmail.com wrote:
If the Red Hat Developer Toolset is the answer, that would mean that the 
OS adequate to produce distro-agnostic deb and rpm packages is Red Hat 
or CentOS?


Yes (matching the "Linux: Runtime: RHEL 7 or CentOS 7" in the "The build 
chain and runtime baselines" section of README.md in the root of the LO 
core git repo).


[...]


Butt, with the help of all you guys, we managed to solve the issue for 
our own distribution, although we would have loved to offer 32-bit 
distro-neutral deb packages for anyone else. But, who knows, maybe in 
fact is not worth the effort, given the tiny amount of downloads that 
prompted TDF to shutdown the release of binaries for this architecture.


On Linux, typically each distro produces LO binaries for all the 
architectures supported by that distro, so there is likely less demand 
anyway for generic binaries offered from a central place (unlike is the 
case for e.g. macOS and Windows).  But your attempt is appreciated!

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

[Libreoffice-commits] core.git: odk/examples

[Vasily Melenchuk (via logerrit)]

 odk/examples/cpp/complextoolbarcontrols/Makefile |2 +-
 odk/examples/cpp/custompanel/Makefile|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3c0826b9c300d84d10dcca90b22ae662211316a
Author: Vasily Melenchuk 
AuthorDate: Tue Aug 20 15:16:46 2019 +0300
Commit: Julien Nabet 
CommitDate: Wed Aug 21 08:00:50 2019 +0200

odk: fixed typos in generated manifests

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

diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile 
b/odk/examples/cpp/complextoolbarcontrols/Makefile
index 1199e637a4f1..446b06e50e15 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -112,7 +112,7 @@ $(OUT_COMP_GEN)/%/manifest.xml :
@echo $(SQM)   
$(SQM)manifest:full-path="$(QM)Addons.xcu$(QM)"/$(CSEP) >> $@
@echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry 
manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> 
$@
@echo $(SQM)   
$(SQM)manifest:full-path="$(QM)WriterWindowState.xcu$(QM)"/$(CSEP) >> $@
-   @echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry 
manifest:meda-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@
+   @echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry 
manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> 
$@
@echo $(SQM)   
$(SQM)manifest:full-path="$(QM)CalcWindowState.xcu$(QM)"/$(CSEP) >> $@
@echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry 
manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> 
$@
@echo $(SQM)   
$(SQM)manifest:full-path="$(QM)ProtocolHandler.xcu$(QM)"/$(CSEP) >> $@
diff --git a/odk/examples/cpp/custompanel/Makefile 
b/odk/examples/cpp/custompanel/Makefile
index c696e46ce353..fcbcd20dcedf 100644
--- a/odk/examples/cpp/custompanel/Makefile
+++ b/odk/examples/cpp/custompanel/Makefile
@@ -106,7 +106,7 @@ $(OUT_COMP_GEN)/%/manifest.xml :
@echo $(OSEP)?xml version="$(QM)1.0$(QM)" 
encoding="$(QM)UTF-8$(QM)"?$(CSEP) > $@
@echo $(OSEP)!DOCTYPE manifest:manifest PUBLIC 
"$(QM)-//OpenOffice.org//DTD Manifest 1.0//EN$(QM)" 
"$(QM)Manifest.dtd$(QM)"$(CSEP) >> $@
@echo $(OSEP)manifest:manifest 
xmlns:manifest="$(QM)http://openoffice.org/2001/manifest$(QM)"$(CSEP) >> $@
-   @echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry 
manifest:meda-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@
+   @echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry 
manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> 
$@
@echo $(SQM)   
$(SQM)manifest:full-path="$(QM)CalcWindowState.xcu$(QM)"/$(CSEP) >> $@
@echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry 
manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> 
$@
@echo $(SQM)   
$(SQM)manifest:full-path="$(QM)DrawWindowState.xcu$(QM)"/$(CSEP) >> $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 extensions/source/ole/unoconversionutilities.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 330447702b207f587aaba2d7530634b8402bb112
Author: Andrea Gelmini 
AuthorDate: Tue Aug 20 14:50:20 2019 +0200
Commit: Julien Nabet 
CommitDate: Wed Aug 21 07:05:44 2019 +0200

Fix typo

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

diff --git a/extensions/source/ole/unoconversionutilities.hxx 
b/extensions/source/ole/unoconversionutilities.hxx
index 9f3f307bd235..5e4a96a2ef0d 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -2201,11 +2201,11 @@ Sequence 
UnoConversionUtilities::createOleArrayWrapper(SAFEARRAY* pArray
 return ret;
 }
 
-// If a VARIANT has the type VT_DISPATCH it can either be an JScript Array
+// If a VARIANT has the type VT_DISPATCH it can either be a JScript Array
 // or some other object. This function finds out if it is such an array or
 // not. Currently there's no way to make sure it's an array
 // so we assume that when the object has a property "0" then it is an Array.
-// An JScript has property like "0", "1", "2" etc. which represent the
+// A JScript has property like "0", "1", "2" etc. which represent the
 // value at the corresponding index of the array
 template
 bool UnoConversionUtilities::isJScriptArray(const VARIANT* rvar)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ahmed ElShreif (via logerrit)]

 uitest/ui_logger_dsl/General_commands.tx  |4 ++--
 uitest/ui_logger_dsl/Special_commands.tx  |   26 +-
 uitest/ui_logger_dsl/UI_Object_commands.tx|4 ++--
 uitest/ui_logger_dsl/dsl_core.py  |   16 
 uitest/ui_logger_dsl/starter_commands.tx  |4 ++--
 uitest/ui_logger_dsl/ui_logger_dsl_grammar.tx |4 ++--
 uitest/ui_logger_dsl/uno_commands.tx  |4 ++--
 vcl/source/uitest/logger.cxx  |4 ++--
 8 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 01af2d7122e8de8cbf96d1a04eb88817276db410
Author: Ahmed ElShreif 
AuthorDate: Tue Aug 20 22:37:17 2019 -0500
Commit: Ahmed ElShreif 
CommitDate: Tue Aug 20 22:37:17 2019 -0500

uitest: Fix typos

Change-Id: I41023dd1fd06ca48849726d3372f74a4990c27a3

diff --git a/uitest/ui_logger_dsl/General_commands.tx 
b/uitest/ui_logger_dsl/General_commands.tx
index aa3645112569..5f5c404402f5 100644
--- a/uitest/ui_logger_dsl/General_commands.tx
+++ b/uitest/ui_logger_dsl/General_commands.tx
@@ -1,6 +1,6 @@
 /*
-This file for the log statments that is general for all application
-we can use it as general commands then relate it to its application 
+This file for the log statements that is general for all application
+we can use it as general commands then relate it to its application
 as we have in the starter command
 //
 also I make set zoom to be general as it will be better
diff --git a/uitest/ui_logger_dsl/Special_commands.tx 
b/uitest/ui_logger_dsl/Special_commands.tx
index a4bf1a697504..1667eace0ef3 100644
--- a/uitest/ui_logger_dsl/Special_commands.tx
+++ b/uitest/ui_logger_dsl/Special_commands.tx
@@ -1,7 +1,7 @@
 import type_options
 
 /*
-This file for the log statments that relates to each diffrent applications
+This file for the log statements that relates to each different 
applications
 Each Grammar Command here is related to his own application
 */
 
@@ -10,8 +10,8 @@ SpecialCommand:
 ;
 
 /*
-  This part for all the writer log statments:
-   
+  This part for all the writer log statements:
+
 1)  Type
 2)  Select
 3)  GOTO page
@@ -55,7 +55,7 @@ writer_Insert_BreakPage:
 
 //=//
 /*
-  This part for all the calc log statments:
+  This part for all the calc log statements:
 
 1)  select sheet
 2)  Select cell or range
@@ -87,7 +87,7 @@ calc_Select_cell:
   'Select from calc' select_op=select_options
 ;
 calc_AutoFill_filter:
-  'Lanuch AutoFilter from Col' col_num=INT 'and Row' row_num=INT
+  'Launch AutoFilter from Col' col_num=INT 'and Row' row_num=INT
 ;
 range_of_cells:
 '{' '"RANGE":' input_range=STRING '}'
@@ -132,9 +132,9 @@ select_options:
 
 //=//
 /*
-  This part for all the impress log statments:
-   
-1)  Type 
+  This part for all the impress log statements:
+
+1)  Type
 2)  Insert New Slide
 3)  Delete Slide
 4)  Duplicate Slide
@@ -163,9 +163,9 @@ impress_Rename_Slide:
 ;
 //=//
 /*
-  This part for all the math log statments:
-   
-1)  element selector 
+  This part for all the math log statements:
+
+1)  element selector
 2)  Type
 
   then we can add whatever we need in the future
@@ -182,8 +182,8 @@ math_Type_command:
 
 //=//
 /*
-  This part for all the draw log statments:
-   
+  This part for all the draw log statements:
+
 1) Type
 2) Insert New Page
 3) Delete Page
diff --git a/uitest/ui_logger_dsl/UI_Object_commands.tx 
b/uitest/ui_logger_dsl/UI_Object_commands.tx
index 9b25e09c6efc..58697a0fe216 100644
--- a/uitest/ui_logger_dsl/UI_Object_commands.tx
+++ b/uitest/ui_logger_dsl/UI_Object_commands.tx
@@ -37,13 +37,13 @@ EditUIObject:
action=action_on_UIObject ('from' parent_id=ID)?
 ;
 SpinFieldUIObject:
-   change=increase_or_ecrease Spin_id=STRING ('from' parent_id=ID)? 
+   change=increase_or_ecrease Spin_id=STRING ('from' parent_id=ID)?
 ;
 ListBoxUIObject:
'Select element with position ' POS=INT 'in' list_id=STRING ('from' 
parent_id=ID)?
 ;
 //=
-//hellper grammer for EditUIObject
+//hellper grammar for EditUIObject
 action_on_UIObject:
 Type_action | SELECT | Clear
 ;
diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index d0e563f99fa6..074e4b871467 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -103,7 +103,7 @@ class ul_Compiler:
 "EditUIObject": self.handle_Edit_uiObject,
 "writer_Type_command": self.handle_writer_type,
 "writer_Select_command": self.handle_writer_select,
-"writer_GOTO_comm

GSOC19 UI_Logger Report

[ahmed El-Shreif]

Hello,

here is just a documentation of the project:
https://ahmedelshreif.blogspot.com/2019/08/ui-logger.html

This is not the final report. I am working now on the final one.

waiting for all your feedback.

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

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

[Kohei Yoshida (via logerrit)]

 sc/inc/orcusfilters.hxx   |3 ++-
 sc/source/filter/inc/orcusfiltersimpl.hxx |2 +-
 sc/source/filter/orcus/orcusfiltersimpl.cxx   |4 ++--
 sc/source/ui/dataprovider/xmldataprovider.cxx |2 +-
 sc/source/ui/xmlsource/xmlsourcedlg.cxx   |2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 494b11bb7a069900e75ef1154323408cd7aa2560
Author: Kohei Yoshida 
AuthorDate: Tue Aug 20 20:26:14 2019 -0400
Commit: Kohei Yoshida 
CommitDate: Wed Aug 21 03:30:52 2019 +0200

Return std::unique_ptr directly.

Change-Id: If0b8263ec6659fccfb329676e09d5441bec6e60c
Reviewed-on: https://gerrit.libreoffice.org/77864
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index 99f55306b226..ee0ced0bd2cd 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_SC_INC_ORCUSFILTERS_HXX
 
 #include 
+#include 
 
 class ScDocument;
 struct ScOrcusXMLTreeParam;
@@ -52,7 +53,7 @@ public:
  * The caller is responsible for deleting the instance returned from this
  * method when it's done.
  */
-virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const 
OUString& rPath) const = 0;
+virtual std::unique_ptr createXMLContext(ScDocument& 
rDoc, const OUString& rPath) const = 0;
 };
 
 class ScOrcusXMLContext
diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx 
b/sc/source/filter/inc/orcusfiltersimpl.hxx
index bef07a43e2dc..ac8603c6cfaf 100644
--- a/sc/source/filter/inc/orcusfiltersimpl.hxx
+++ b/sc/source/filter/inc/orcusfiltersimpl.hxx
@@ -27,7 +27,7 @@ public:
 
 virtual bool importODS_Styles(ScDocument& rDoc, OUString& aFileName) const 
override;
 
-virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const 
OUString& rPath) const override;
+virtual std::unique_ptr createXMLContext(ScDocument& 
rDoc, const OUString& rPath) const override;
 };
 
 class ScOrcusXMLContextImpl : public ScOrcusXMLContext
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx 
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 8e9b0b1a5f04..0f3b03dbbd15 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -153,9 +153,9 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, 
OUString& aPath) con
 return true;
 }
 
-ScOrcusXMLContext* ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, 
const OUString& rPath) const
+std::unique_ptr 
ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const OUString& rPath) 
const
 {
-return new ScOrcusXMLContextImpl(rDoc, rPath);
+return std::make_unique(rDoc, rPath);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dataprovider/xmldataprovider.cxx 
b/sc/source/ui/dataprovider/xmldataprovider.cxx
index 42b5d5620374..da0f9bd28535 100644
--- a/sc/source/ui/dataprovider/xmldataprovider.cxx
+++ b/sc/source/ui/dataprovider/xmldataprovider.cxx
@@ -58,7 +58,7 @@ void XMLFetchThread::execute()
 if (!pOrcus)
 return;
 
-mpXMLContext.reset(pOrcus->createXMLContext(mrDocument, maURL));
+mpXMLContext = pOrcus->createXMLContext(mrDocument, maURL);
 if (!mpXMLContext)
 return;
 
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 3a209294cb36..dd78ab5e18b9 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -195,7 +195,7 @@ void ScXMLSourceDlg::LoadSourceFileStructure(const 
OUString& rPath)
 if (!pOrcus)
 return;
 
-mpXMLContext.reset(pOrcus->createXMLContext(*mpDoc, rPath));
+mpXMLContext = pOrcus->createXMLContext(*mpDoc, rPath);
 if (!mpXMLContext)
 return;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vasily Melenchuk (via logerrit)]

 sw/inc/doc.hxx   |3 
 sw/source/core/inc/UndoAttribute.hxx |   11 -
 sw/source/core/undo/unattr.cxx   |  197 +++
 3 files changed, 97 insertions(+), 114 deletions(-)

New commits:
commit db257d6605143813e0b75ffa878a18810c8b3412
Author: Vasily Melenchuk 
AuthorDate: Thu Aug 15 12:08:06 2019 +0300
Commit: Thorsten Behrens 
CommitDate: Wed Aug 21 00:24:58 2019 +0200

sw undo/redo: avoid usage of pointers as a style references

Style can be created on previous undo steps and so after undo/redo
pointer can became invalid. Style name as a reference looks like
a good alternative to pointers.

Change-Id: Ia099a717eaec1f1a23296b2c1273b8c1983a2b96
Reviewed-on: https://gerrit.libreoffice.org/77495
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 09228fabe88f3457105cf26d83c003719a793114)
Reviewed-on: https://gerrit.libreoffice.org/77782

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 1e78ee0aea40..f70e4704cfac 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -336,7 +336,6 @@ private:
 FNCopyFormat fnCopyFormat, SwFormat& rDfltFormat );
 void CopyPageDescHeaderFooterImpl( bool bCpyHeader,
 const SwFrameFormat& rSrcFormat, 
SwFrameFormat& rDestFormat );
-static SwFormat* FindFormatByName( const SwFormatsBase& rFormatArr, const 
OUString& rName );
 
 SwDoc( const SwDoc &) = delete;
 
@@ -753,6 +752,8 @@ public:
 // Remove all language dependencies from all existing formats
 void RemoveAllFormatLanguageDependencies();
 
+static SwFormat* FindFormatByName(const SwFormatsBase& rFormatArr, const 
OUString& rName);
+
 SwFrameFormat  *MakeFrameFormat(const OUString &rFormatName, SwFrameFormat 
*pDerivedFrom,
   bool bBroadcast = false, bool bAuto = true);
 void   DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast = false 
);
diff --git a/sw/source/core/inc/UndoAttribute.hxx 
b/sw/source/core/inc/UndoAttribute.hxx
index 288eabe20765..cc73197fd7c6 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -85,14 +85,13 @@ public:
 class SwUndoFormatAttr : public SwUndo
 {
 friend class SwUndoDefaultAttr;
-SwFormat * m_pFormat;
+OUString m_sFormatName;
 std::unique_ptr m_pOldSet;  // old attributes
 sal_uLong m_nNodeIndex;
 const sal_uInt16 m_nFormatWhich;
 const bool m_bSaveDrawPt;
 
-bool IsFormatInDoc( SwDoc* );   //is the attribute format still in the Doc?
-void SaveFlyAnchor( bool bSaveDrawPt = false );
+void SaveFlyAnchor( const SwFormat * pFormat, bool bSaveDrawPt = false );
 // #i35443# - Add return value, type .
 // Return value indicates, if anchor attribute is restored.
 // Notes: - If anchor attribute is restored, all other existing attributes
@@ -103,7 +102,7 @@ class SwUndoFormatAttr : public SwUndo
 //  This situation occurs for undo of styles.
 bool RestoreFlyAnchor(::sw::UndoRedoContext & rContext);
 // --> OD 2008-02-27 #refactorlists# - removed 
-void Init();
+void Init( const SwFormat & rFormat );
 
 public:
 // register at the Format and save old attributes
@@ -123,8 +122,8 @@ public:
 
 virtual SwRewriter GetRewriter() const override;
 
-void PutAttr( const SfxPoolItem& rItem );
-SwFormat* GetFormat( SwDoc& rDoc );   // checks if it is still in the Doc!
+void PutAttr( const SfxPoolItem& rItem, const SwDoc& rDoc );
+SwFormat* GetFormat( const SwDoc& rDoc );   // checks if it is still in 
the Doc!
 };
 
 // --> OD 2008-02-12 #newlistlevelattrs#
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index a8245c7a45bc..9edd72ac00f6 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -71,9 +71,10 @@ void SwUndoFormatAttrHelper::Modify( const SfxPoolItem* 
pOld, const SfxPoolItem*
 if ( pOld->Which() == RES_OBJECTDYING ) {
 CheckRegistration( pOld );
 } else if ( pNew ) {
+const SwDoc& rDoc = 
*static_cast(GetRegisteredInNonConst())->GetDoc();
 if( POOLATTR_END >= pOld->Which() ) {
 if ( GetUndo() ) {
-m_pUndo->PutAttr( *pOld );
+m_pUndo->PutAttr( *pOld, rDoc );
 } else {
 m_pUndo.reset( new SwUndoFormatAttr( *pOld,
   
*static_cast(GetRegisteredInNonConst()), m_bSaveDrawPt ) );
@@ -84,7 +85,7 @@ void SwUndoFormatAttrHelper::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem*
 *static_cast(pOld)->GetChgSet() );
 const SfxPoolItem* pItem = aIter.GetCurItem();
 while ( pItem ) {
-m_pUndo->PutAttr( *pItem );
+m_pUndo->PutAttr( *pItem, rDoc );
   

Re: We'd like to continue the production of the 32-bit deb packages

[dreamn...@gmail.com]

For some reason, I always thought that Debian was the OS used to produce
the Linux distro-agnostic binaries, but I proved wrong when did a test on
Debian 9 (as Debian 10 could not be have been used previously due its
recent release date). Debian 9 indeed includes a very old C/C++ compiler
unable to work with relatively recent versions of LibreOffice, and seems to
be an ugly hassle to try to update its compiler.

If the Red Hat Developer Toolset is the answer, that would mean that the OS
adequate to produce distro-agnostic deb and rpm packages is Red Hat or
CentOS? Either way, doing that would be a very steep endeavor for our
limited experience. We are not aware of documented procedures to produce
LibreOffice distro-neutral binaries, or how to setup a system capable of
achieving that feat. AFAIK, the guy or gal that was responsible for
producing the 32-bit neutral TDF LibreOffice deb and rpm packages didn't
seem to step in this thread, so his/her real life experience, know-how and
expertise on pitfalls and errors avoidance could now be lost on the demise
of the Linux 32-bit support. That's really sad, at least for us. :'(

Butt, with the help of all you guys, we managed to solve the issue for our
own distribution, although we would have loved to offer 32-bit
distro-neutral deb packages for anyone else. But, who knows, maybe in fact
is not worth the effort, given the tiny amount of downloads that prompted
TDF to shutdown the release of binaries for this architecture.

El mar., 20 ago. 2019 a las 7:38, Stephan Bergmann ()
escribió:

> On 16/08/2019 20:43, dreamn...@gmail.com wrote:
> > What we did if after a ‘make’ with errors, we had to ran ‘make
> > build-nocheck’ to be able to bypass those errors on a Debian 10 schroot
> > environment. This time, the required debs files were produced. However,
> > when installing those debs and trying to run LibreOffice on Escuelas
> > Linux (the main target distribution) it does not work, as it complains
> > about a glibc mismatch version. So, it seems that the generated deb
> > files are not distribution-independent as the ones that were previously
> > released by The Document Foundation.
>
> Note that producing builds that are compatible with our baseline (as
> spelled out in README.md) is a non-trivial endeavour.  You typically do
> such builds on a baseline machine to make sure you do not link against
> functionality in e.g. libc.so.6 that is only available in newer versions
> of that library.  However, a baseline machine typically has a C++
> compiler that is too old for our needs, so you need a newer compiler but
> which generates code that only links against functionality that is
> already available in the baseline libstdc++.so.6 (e.g., by using Red Hat
> Developer Toolset).
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Kohei Yoshida (via logerrit)]

 sc/source/ui/xmlsource/xmlsourcedlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf03ccae15f05de7cc6003ecd7ed3a442d55bf8f
Author: Kohei Yoshida 
AuthorDate: Tue Aug 20 15:41:28 2019 -0400
Commit: Kohei Yoshida 
CommitDate: Wed Aug 21 00:01:51 2019 +0200

Namespace doesn't need a semicolon.

Change-Id: I0f34f02ea7827cddb842e2d2ce466fe61e6fd95a
Reviewed-on: https://gerrit.libreoffice.org/77863
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 26b0cbcf4f1a..3a209294cb36 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -241,7 +241,7 @@ std::unique_ptr getReferenceEntry(const 
weld::TreeView& rTree, w
 return xCurEntry;
 }
 
-};
+}
 
 void ScXMLSourceDlg::TreeItemSelected()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: We'd like to continue the production of the 32-bit deb packages

[dreamn...@gmail.com]

Thanks for this info.

If the issue was recently solved by commit
c78dd0a726b32d922a0d75a26a51d4c30612368c ("configure: don't enable export
validation if there are no schemas"), then it should mean that in future
LIbreOffice versions this error would not appear again. Nevertheless, this
specific issue appeared during a compilation test using Debian 10. I do not
remember having these errors when compiling in Escuelas Linux (Ubuntu 18.04
based), but other errors instead, already described on some previous posts
in this thread. On Debian is when appeared that "Exception in thread "main"
java.lang.NullPointerException", even when having a valid JDK. Anyway, we
ended compiling on Escuelas Linux -also with errors without the
-build-nocheck, otherwise the binaries would not run on our main distro
target.

El lun., 19 ago. 2019 a las 11:59, Michael Weghorn ()
escribió:

> On 15/08/2019 12.45, dreamn...@gmail.com wrote:
> > Well, I think I figured out the correct deletion of lines at
> > sal/Module_sal.mk file, since I got no errors related to sal after
> > making those changes.
>
> OK; once the other issues are dealt with, the schroot setup should
> probably be updated to make disabling those tests unnecessary, but let's
> do that in a follow-up step...
>
> Regarding your test failure
>
> > ScFiltersTest::testSheetNamesXLSX finished in: 47ms
> > Exception in thread "main" java.lang.NullPointerException
> > at
> >
> org.odftoolkit.odfvalidator.ODFValidator.getValidatorForSchema(ODFValidator.java:286)
> > at
> >
> org.odftoolkit.odfvalidator.ODFValidator.getManifestValidator(ODFValidator.java:186)
> > at
> >
> org.odftoolkit.odfvalidator.ODFRootPackageValidator.validateManifest(ODFRootPackageValidator.java:170)
> > at
> >
> org.odftoolkit.odfvalidator.ODFRootPackageValidator.validatePre(ODFRootPackageValidator.java:93)
> > at
> >
> org.odftoolkit.odfvalidator.ODFPackageValidator._validate(ODFPackageValidator.java:111)
> > at
> >
> org.odftoolkit.odfvalidator.ODFPackageValidator.validate(ODFPackageValidator.java:81)
> > at
> >
> org.odftoolkit.odfvalidator.ODFValidator.validateFile(ODFValidator.java:163)
> > at
> org.odftoolkit.odfvalidator.ODFValidator.validate(ODFValidator.java:125)
> > at org.odftoolkit.odfvalidator.Main.main(Main.java:314)
> > expected height 6001 actual 5999
> > expected width 2001 actual 2001
> > expected left 6000 actual 5976
> > expected right -2000 actual -1998
> > expected startrow 0 actual 0
> > expected startcol 5 actual 5
> > expected endrow 3 actual 3
> > expected endcol 7 actual 7
> >
> /home/linux/libreoffice-6.3.0.4/test/source/bootstrapfixture.cxx:199:ScFiltersTest::testLegacyCellAnchoredRotatedShape
> > equality assertion failed
> > - Expected: 0
> > - Actual  : 256
> > - failed to execute: sh
> > /home/linux/libreoffice-6.3.0.4/bin/odfvalidator.sh -M
> >
> /home/linux/libreoffice-6.3.0.4/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng
> > -D
> >
> /home/linux/libreoffice-6.3.0.4/schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng
> > -O
> >
> /home/linux/libreoffice-6.3.0.4/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
> > -m /home/linux/libreoffice-6.3.0.4/schema/mathml2/mathml2.xsd
> > /tmp/lu5683d1zw.tmp > /tmp/lu5683d201.tmp
>
> please see the mail thread starting at [1] which seems to be about the
> same issue that is specific to building from the tarballs and which was
> fixed recently by commit c78dd0a726b32d922a0d75a26a51d4c30612368c
> ("configure: don't enable export validation if there are no schemas") [2].
>
>
> [1]
> https://lists.freedesktop.org/archives/libreoffice/2019-August/083288.html
> [2] https://gerrit.libreoffice.org/#/c/77383/
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: i18npool/Library_localedata_en.mk i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/Library_localedata_en.mk |1 
 i18npool/source/localedata/data/en_NG.xml |   50 ++
 i18npool/source/localedata/localedata.cxx |1 
 3 files changed, 52 insertions(+)

New commits:
commit e51bf749af8b881d6a0df214b84642f093471c54
Author: Eike Rathke 
AuthorDate: Tue Aug 20 20:35:11 2019 +0200
Commit: Eike Rathke 
CommitDate: Tue Aug 20 22:11:21 2019 +0200

Resolves: tdf#127011 add English (Nigeria) [en-NG] locale data

Change-Id: Ia2e34a90fd7dc2a0ef648b8457412f1a393441e4
Co-authored-by: Benjamin Chiagoziem Livinus 
Reviewed-on: https://gerrit.libreoffice.org/77856
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/Library_localedata_en.mk 
b/i18npool/Library_localedata_en.mk
index 2b0a77a42f0e..86a9178bf4ed 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -22,6 +22,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_en,\
CustomTarget/i18npool/localedata/localedata_en_LK \
CustomTarget/i18npool/localedata/localedata_en_MW \
CustomTarget/i18npool/localedata/localedata_en_NA \
+   CustomTarget/i18npool/localedata/localedata_en_NG \
CustomTarget/i18npool/localedata/localedata_en_NZ \
CustomTarget/i18npool/localedata/localedata_en_PH \
CustomTarget/i18npool/localedata/localedata_en_TT \
diff --git a/i18npool/source/localedata/data/en_NG.xml 
b/i18npool/source/localedata/data/en_NG.xml
new file mode 100644
index ..028b99e38b61
--- /dev/null
+++ b/i18npool/source/localedata/data/en_NG.xml
@@ -0,0 +1,50 @@
+
+
+
+
+  
+
+  en
+  English
+
+
+  NG
+  Nigeria
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  NGN
+  ₦
+  NGN
+  Naira
+  2
+
+  
+  
+  
+  
+  
+
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 4a46025aa2f0..d09f65772c60 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -80,6 +80,7 @@ static const struct {
 { "en_BW",  lcl_DATA_EN },
 { "en_ZM",  lcl_DATA_EN },
 { "en_LK",  lcl_DATA_EN },
+{ "en_NG",  lcl_DATA_EN },
 
 { "es_ES",  lcl_DATA_ES },
 { "es_AR",  lcl_DATA_ES },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About putting back Firebird experimental

[Robert Großkopf]

Hi Julien,

migration wizard is a good help for people, who know how to fix the
other issues, which would appear. I have migrated some databeses from
the Base-Handbook to Firebird.

I know I first have to save the old file. So I open the fiel in 6.3.0.4
with a backup and let the migration wizard work. Save the file and edit
the content-xml and remove the entry, which makes it unpossible to work
with subforms. After this I close 6.3 and open 6.2.6.2 for moving all
the parts from HSQLDB to Firebird, which couldn't be moved correctly
(like views with unknown functions, like not correctly imported fields
...) I won't do this in 6.3, because the wizard appears soon and wants
to migrate my old HSQLDB-file.

Most of the databases I have migrated with the wizard are unusable
directly after the migration process. I call such a tool "experimental"
and so LO 6.3.0.4 is completly experimental and not the LO version I am
using for daily work with databases, because the wizard will appear
every time and one (unconcentrated) moment I click the wrong button and
 ... shit happens.

Regards

Robert
-- 
Homepage: http://robert.familiegrosskopf.de
LibreOffice Community: http://robert.familiegrosskopf.de/map_3



signature.asc
Description: OpenPGP digital 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 (via logerrit)]

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a66098e901dc06cd09d7243dde6552fa15129c28
Author: Eike Rathke 
AuthorDate: Tue Aug 20 20:18:20 2019 +0200
Commit: Eike Rathke 
CommitDate: Tue Aug 20 21:08:09 2019 +0200

Related: tdf#127011 add English (Nigeria) [en-NG] 0xA809 to language list

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

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 612efc294db5..ac8e0b565215 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -679,6 +679,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ILOKO, "ilo", "PH", k0},
 { LANGUAGE_USER_ENGLISH_ZAMBIA, "en", "ZM", k0},
 { LANGUAGE_USER_ENGLISH_SRI_LANKA,  "en", "LK", k0},
+{ LANGUAGE_USER_ENGLISH_NIGERIA,"en", "NG", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index fb7ee80118bf..0978e822e669 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -751,6 +751,7 @@ namespace o3tl
 #define LANGUAGE_USER_ILOKO LanguageType(0x06A3)
 #define LANGUAGE_USER_ENGLISH_ZAMBIALanguageType(0xA009)  /* 
makeLangID( 0x28, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_ENGLISH_SRI_LANKA LanguageType(0xA409)  /* 
makeLangID( 0x29, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_ENGLISH_NIGERIA   LanguageType(0xA809)  /* 
makeLangID( 0x2A, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 48a6126edc39..7ca5feb8156b 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -418,7 +418,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Naro") , LANGUAGE_USER_NARO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Iloko") , LANGUAGE_USER_ILOKO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Zambia)") , 
LANGUAGE_USER_ENGLISH_ZAMBIA },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Sri Lanka)") , 
LANGUAGE_USER_ENGLISH_SRI_LANKA }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Sri Lanka)") , 
LANGUAGE_USER_ENGLISH_SRI_LANKA },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Nigeria)") , 
LANGUAGE_USER_ENGLISH_NIGERIA }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

3 new defect(s) introduced to LibreOffice found with Coverity Scan.
1 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 3 of 3 defect(s)


** CID 1452395:  API usage errors  (INVALIDATE_ITERATOR)
/vcl/source/uitest/logger.cxx: 352 in ::GetKeyInMapWithIndex(const 
std::map, 
std::allocator>> &, int)()



*** CID 1452395:  API usage errors  (INVALIDATE_ITERATOR)
/vcl/source/uitest/logger.cxx: 352 in ::GetKeyInMapWithIndex(const 
std::map, 
std::allocator>> &, int)()
346 
347 std::map::const_iterator itr = 
rParameters.begin();
348 
349 for (; itr != rParameters.end() && j < index; ++itr, ++j)
350 ;
351 
>>> CID 1452395:  API usage errors  (INVALIDATE_ITERATOR)
>>> Dereferencing iterator "itr" though it is already past the end of its 
>>> container.
352 return itr->first;
353 }
354 }
355 
356 void UITestLogger::logEvent(const EventDescription& rDescription)
357 {

** CID 1452394:  API usage errors  (INVALIDATE_ITERATOR)
/vcl/source/uitest/logger.cxx: 340 in ::GetValueInMapWithIndex(const 
std::map, 
std::allocator>> &, int)()



*** CID 1452394:  API usage errors  (INVALIDATE_ITERATOR)
/vcl/source/uitest/logger.cxx: 340 in ::GetValueInMapWithIndex(const 
std::map, 
std::allocator>> &, int)()
334 
335 std::map::const_iterator itr = 
rParameters.begin();
336 
337 for (; itr != rParameters.end() && j < index; ++itr, ++j)
338 ;
339 
>>> CID 1452394:  API usage errors  (INVALIDATE_ITERATOR)
>>> Dereferencing iterator "itr" though it is already past the end of its 
>>> container.
340 return itr->second;
341 }
342 
343 OUString GetKeyInMapWithIndex(const std::map& 
rParameters, sal_Int32 index)
344 {
345 sal_Int32 j = 0;

** CID 1452393:(INVALIDATE_ITERATOR)
/sc/source/core/data/dpoutput.cxx: 1178 in 
ScDPOutput::GetMemberResultNames(std::unordered_set, std::equal_to, 
std::allocator> &, long)()
/sc/source/core/data/dpoutput.cxx: 1178 in 
ScDPOutput::GetMemberResultNames(std::unordered_set, std::equal_to, 
std::allocator> &, long)()



*** CID 1452393:(INVALIDATE_ITERATOR)
/sc/source/core/data/dpoutput.cxx: 1178 in 
ScDPOutput::GetMemberResultNames(std::unordered_set, std::equal_to, 
std::allocator> &, long)()
1172 }
1173 
1174 // collect the member names
1175 
1176 if ( bFound )
1177 {
>>> CID 1452393:(INVALIDATE_ITERATOR)
>>> Dereferencing iterator "it" though it is already past the end of its 
>>> container.
1178 const uno::Sequence aMemberResults = 
it->maResult;
1179 for (const sheet::MemberResult& rMemberResult : aMemberResults)
1180 {
1181 if ( rMemberResult.Flags & 
sheet::MemberResultFlags::HASMEMBER )
1182 rNames.insert(rMemberResult.Name);
1183 }
/sc/source/core/data/dpoutput.cxx: 1178 in 
ScDPOutput::GetMemberResultNames(std::unordered_set, std::equal_to, 
std::allocator> &, long)()
1172 }
1173 
1174 // collect the member names
1175 
1176 if ( bFound )
1177 {
>>> CID 1452393:(INVALIDATE_ITERATOR)
>>> Dereferencing iterator "it" though it is already past the end of its 
>>> container.
1178 const uno::Sequence aMemberResults = 
it->maResult;
1179 for (const sheet::MemberResult& rMemberResult : aMemberResults)
1180 {
1181 if ( rMemberResult.Flags & 
sheet::MemberResultFlags::HASMEMBER )
1182 rNames.insert(rMemberResult.Name);
1183 }



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB73RtgzoPcQtNNP5dkHLuV1E-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpydN1LOlpVCvYEuj-2BPLWY9abIX-2FyCec9UuTsK-2BfR9pq7EFfwJps0ZlaR8rcaIyfWkFfI4LZUqzcwQF7kJAmTgMu54DdkXHFJaeVouFcA5G1wavBru1P4TO2vyARVjWVRjF4rfqqHunOOHdB5FszraR1ZLyxh9g-2FsKp53pmj1q4pm0-3D

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

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

[Eike Rathke (via logerrit)]

 include/svl/zforlist.hxx|3 +++
 svl/source/numbers/zforlist.cxx |   16 +---
 svl/source/numbers/zformat.cxx  |   18 ++
 3 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit 152c4fcbf1aa5b7454834581927056cfc9d1d7e5
Author: Eike Rathke 
AuthorDate: Tue Aug 20 19:42:39 2019 +0200
Commit: Eike Rathke 
CommitDate: Tue Aug 20 20:37:51 2019 +0200

Resolves: tdf#122110 convert condition decimal separator to target locale

Otherwise re-scanning the format code in the target locale failed.

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

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 2d52ce4322b5..adbde81c9315 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -719,6 +719,9 @@ public:
 /// Return the decimal separator matching the locale of the given format
 OUString GetFormatDecimalSep( sal_uInt32 nFormat ) const;
 
+/// Return the decimal separator matching the given locale / LanguageType.
+OUString GetLangDecimalSep( LanguageType nLang ) const;
+
 /// Return a NfCurrencyTable with pointers to NfCurrencyEntry 
entries
 static const NfCurrencyTable& GetTheCurrencyTable();
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index cc44b9bcb523..7a558bd015df 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -2076,20 +2076,30 @@ OUString SvNumberFormatter::GetFormatDecimalSep( 
sal_uInt32 nFormat ) const
 {
 ::osl::MutexGuard aGuard( GetInstanceMutex() );
 const SvNumberformat* pFormat = GetFormatEntry(nFormat);
-if ( !pFormat || pFormat->GetLanguage() == ActLnge )
+if (!pFormat)
+{
+return GetNumDecimalSep();
+}
+return GetLangDecimalSep( pFormat->GetLanguage());
+}
+
+OUString SvNumberFormatter::GetLangDecimalSep( LanguageType nLang ) const
+{
+::osl::MutexGuard aGuard( GetInstanceMutex() );
+if (nLang == ActLnge)
 {
 return GetNumDecimalSep();
 }
 OUString aRet;
 LanguageType eSaveLang = xLocaleData.getCurrentLanguage();
-if ( pFormat->GetLanguage() == eSaveLang )
+if (nLang == eSaveLang)
 {
 aRet = xLocaleData->getNumDecimalSep();
 }
 else
 {
 LanguageTag aSaveLocale( xLocaleData->getLanguageTag() );
-const_cast(this)->xLocaleData.changeLocale( 
LanguageTag( pFormat->GetLanguage()) );
+const_cast(this)->xLocaleData.changeLocale( 
LanguageTag( nLang));
 aRet = xLocaleData->getNumDecimalSep();
 const_cast(this)->xLocaleData.changeLocale( 
aSaveLocale );
 }
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index c182c932d099..792f6cb4758e 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -788,8 +788,11 @@ SvNumberformat::SvNumberformat(OUString& rString,
 sBuff.replace( cNNBSp, ' ');
 }
 
+OUString aConvertFromDecSep;
+OUString aConvertToDecSep;
 if (rScan.GetConvertMode())
 {
+aConvertFromDecSep = GetFormatter().GetNumDecimalSep();
 maLocale.meLanguage = rScan.GetNewLnge();
 eLan = maLocale.meLanguage; // Make sure to return switch
 }
@@ -850,6 +853,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
 sal_Int32 nCntChars = ImpGetNumber(sBuff, nPos, sStr);
 if (nCntChars > 0)
 {
+sal_Int32 nDecPos;
 SvNumFormatType F_Type = SvNumFormatType::UNDEFINED;
 if (!pISc->IsNumberFormat(sStr, F_Type, fNumber, 
nullptr) ||
 ( F_Type != SvNumFormatType::NUMBER &&
@@ -861,6 +865,20 @@ SvNumberformat::SvNumberformat(OUString& rString,
 sBuff.insert(nPos, '0');
 nPos++;
 }
+else if (rScan.GetConvertMode() && ((nDecPos = 
sStr.indexOf( aConvertFromDecSep)) >= 0))
+{
+if (aConvertToDecSep.isEmpty())
+aConvertToDecSep = 
GetFormatter().GetLangDecimalSep( rScan.GetNewLnge());
+if (aConvertToDecSep != aConvertFromDecSep)
+{
+const OUString aStr( sStr.replaceAt( nDecPos,
+aConvertFromDecSep.getLength(), 
aConvertToDecSep));
+nPos = nPos - nCntChars;
+sBuff.remove(nPos, nCntChars);
+sBuff.insert(nPos, aStr);
+nPos += aStr.getLength();
+}
+}
 }
 else

GSOC19 Week 12 Report

[ahmed El-Shreif]

Hello,

here is my week 12 report:
https://ahmedelshreif.blogspot.com/2019/08/week-12-report.html

This is not the final report. I am working now on the final one.

waiting for all your feedback.

Thanks in advance
Ahmed
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel Grandin (via logerrit)]

 include/comphelper/interfacecontainer3.hxx  |  356 
 sc/source/ui/Accessibility/DrawModelBroadcaster.cxx |4 
 sc/source/ui/inc/DrawModelBroadcaster.hxx   |4 
 3 files changed, 360 insertions(+), 4 deletions(-)

New commits:
commit 89ea9340aca77a87ef10785a734201d2f400a933
Author: Noel Grandin 
AuthorDate: Tue Aug 20 13:46:01 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 20:35:01 2019 +0200

tdf#119388 speed up listener broadcast

when deleting columns with lots of shapes. The UNO_QUERY is expensive in
this case, so create a new comphelper::OInterfaceContainerHelper3 that
knows what type the listener interface is.

Takes the time from 47s to 41s for me.

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

diff --git a/include/comphelper/interfacecontainer3.hxx 
b/include/comphelper/interfacecontainer3.hxx
new file mode 100644
index ..087dc45e12cc
--- /dev/null
+++ b/include/comphelper/interfacecontainer3.hxx
@@ -0,0 +1,356 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INCLUDED_COMPHELPER_INTERFACECONTAINER3_H
+#define INCLUDED_COMPHELPER_INTERFACECONTAINER3_H
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+class XInterface;
+}
+}
+}
+}
+namespace osl
+{
+class Mutex;
+}
+
+/** */ //for docpp
+namespace comphelper
+{
+template  class OInterfaceContainerHelper3;
+/**
+  This is the iterator of an InterfaceContainerHelper. Typically
+  one constructs an instance on the stack for one firing session.
+  It is not allowed to assign or copy an instance of this class.
+
+  @tparam ListenerT UNO event listener type
+  @see OInterfaceContainerHelper
+ */
+template  class OInterfaceIteratorHelper3
+{
+public:
+/**
+   Create an iterator over the elements of the container. The iterator
+   copies the elements of the container. A change to the container
+   during the lifetime of an iterator is allowed and does not
+   affect the iterator-instance. The iterator and the container take cares
+   themself for concurrent access, no additional guarding is necessary.
+
+   Remark: The copy is on demand. The iterator copy the elements only if 
the container
+   change the contents..
+
+   @param rCont the container of the elements.
+ */
+OInterfaceIteratorHelper3(OInterfaceContainerHelper3& rCont_)
+: rCont(rCont_)
+, maData(rCont.maData)
+, nRemain(maData->size())
+{
+}
+
+/** Return true, if there are more elements in the iterator. */
+bool hasMoreElements() const { return nRemain != 0; }
+/** Return the next element of the iterator. Calling this method if
+hasMoreElements() has returned false, is an error.
+ */
+css::uno::Reference const& next();
+
+/** Removes the current element (the last one returned by next())
+from the underlying container. Calling this method before
+next() has been called or calling it twice with no next()
+in between is an error.
+*/
+void remove();
+
+private:
+OInterfaceContainerHelper3& rCont;
+o3tl::cow_wrapper>> maData;
+sal_Int32 nRemain;
+
+OInterfaceIteratorHelper3(const OInterfaceIteratorHelper3&) = delete;
+OInterfaceIteratorHelper3& operator=(const OInterfaceIteratorHelper3&) = 
delete;
+};
+
+template 
+const css::uno::Reference& 
OInterfaceIteratorHelper3::next()
+{
+nRemain--;
+return (*maData)[nRemain];
+}
+
+template  void OInterfaceIteratorHelper3::remove()
+{
+rCont.removeInterface((*maData)[nRemain]);
+}
+
+/**
+  A container of interfaces. To access the elements use an iterator.
+  This implementation is thread safe.
+
+  @tparam ListenerT UNO event listener type
+  @see OInterfaceIteratorHelper
+ */
+template  class OInterfaceContainerHelper3
+{
+public:
+/**
+   Create an interface container.
+
+   @param rMutexthe mu

Benjamin Chiagoziem Livinus license statement

[Chiagoziem Livinus]

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

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

[Tamás Zolnai (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf126792.odt   |binary
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |   27 ++
 sw/source/filter/ww8/docxattributeoutput.cxx  |3 ++
 3 files changed, 30 insertions(+)

New commits:
commit 8d84f32d55df06c2944da78e2b779de2dba21d50
Author: Tamás Zolnai 
AuthorDate: Tue Aug 20 15:51:42 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Aug 20 20:29:06 2019 +0200

tdf#126792: DOCX legacy drop-downs are only supposed to hold 25 items, DOCX

Truncate item list if the MSO limit is exceeded.

Change-Id: I21fd63fd2b8d6c8fe76500e1cdd468d4692612c1
Reviewed-on: https://gerrit.libreoffice.org/77844
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf126792.odt 
b/sw/qa/extras/ooxmlexport/data/tdf126792.odt
new file mode 100644
index ..7eb43e78a71c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf126792.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 9e5fc9ccb3d4..d716ad535f84 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -711,6 +711,33 @@ DECLARE_OOXMLEXPORT_TEST( testDateFieldAtEndOfParagraph, 
"date_field_at_end_of_p
 CPPUNIT_ASSERT_EQUAL(OUString("Click here to enter a date."), 
pFieldmark->GetContent());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testDropDownFieldEntryLimit, "tdf126792.odt" )
+{
+// In MSO, there is a limit of 25 for the items in a drop-down form field.
+// So we truncate the list of items to not exceed this limit.
+
+SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMarkAccess->getAllMarksCount());
+
+::sw::mark::IFieldmark* pFieldmark
+  = 
dynamic_cast<::sw::mark::IFieldmark*>(*pMarkAccess->getAllMarksBegin());
+CPPUNIT_ASSERT(pFieldmark);
+CPPUNIT_ASSERT_EQUAL(OUString(ODF_FORMDROPDOWN), 
pFieldmark->GetFieldname());
+
+const sw::mark::IFieldmark::parameter_map_t* const pParameters = 
pFieldmark->GetParameters();
+auto pListEntries = pParameters->find(ODF_FORMDROPDOWN_LISTENTRY);
+CPPUNIT_ASSERT(bool(pListEntries != pParameters->end()));
+css::uno::Sequence vListEntries;
+pListEntries->second >>= vListEntries;
+if (!mbExported)
+CPPUNIT_ASSERT_EQUAL(sal_Int32(26), vListEntries.getLength());
+else
+CPPUNIT_ASSERT_EQUAL(sal_Int32(25), vListEntries.getLength());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8746deaa6397..4a087e8188a4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1837,6 +1837,9 @@ void DocxAttributeOutput::WriteFFData(  const FieldInfos& 
rInfos )
 OUString sName, sSelected;
 
 params.extractParam( ODF_FORMDROPDOWN_LISTENTRY, vListEntries );
+if (vListEntries.getLength() > ODF_FORMDROPDOWN_ENTRY_COUNT_LIMIT)
+vListEntries = uno::Sequence< OUString>(vListEntries.getArray(), 
ODF_FORMDROPDOWN_ENTRY_COUNT_LIMIT);
+
 sName = params.getName();
 sal_Int32 nSelectedIndex = 0;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny (via logerrit)]

 download.lst  |4 ++--
 external/harfbuzz/ExternalProject_harfbuzz.mk |1 -
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |6 --
 external/harfbuzz/msvc.patch  |   17 -
 4 files changed, 2 insertions(+), 26 deletions(-)

New commits:
commit 352924a64750bb99aec54feea3af0121603c12a8
Author: Khaled Hosny 
AuthorDate: Tue Aug 20 10:33:40 2019 +0200
Commit: Khaled Hosny 
CommitDate: Tue Aug 20 20:08:59 2019 +0200

Update HarfBbuzz to 2.6.0

Change-Id: I7983dd10fe6599a2473caf0da04a0df3e63e9b2a
Reviewed-on: https://gerrit.libreoffice.org/77790
Tested-by: Jenkins
Reviewed-by: Khaled Hosny 

diff --git a/download.lst b/download.lst
index 4539a35a9b3c..c0217d93b9d0 100644
--- a/download.lst
+++ b/download.lst
@@ -96,8 +96,8 @@ export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e64
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
 export GRAPHITE_SHA256SUM := 
d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
 export GRAPHITE_TARBALL := graphite2-minimal-1.3.13.tgz
-export HARFBUZZ_SHA256SUM := 
f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468
-export HARFBUZZ_TARBALL := harfbuzz-2.3.1.tar.bz2
+export HARFBUZZ_SHA256SUM := 
9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966
+export HARFBUZZ_TARBALL := harfbuzz-2.6.0.tar.xz
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk 
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 6a8b46f722ea..9bb2f5b9bc71 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -36,7 +36,6 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
--with-fontconfig=no \
--with-cairo=no \
--with-glib=no \
-   --with-ucdn=no \
--with-graphite2=yes \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
--libdir=$(call 
gb_UnpackedTarball_get_dir,harfbuzz/src/.libs) \
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 8101f244f4df..a99f116d80ad 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -15,10 +15,4 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,harfbuzz))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
-# * external/harfbuzz/msvc.patch sent upstream as 

-#   "Fix hb_atomic_* variants based on C++11 atomics":
-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-external/harfbuzz/msvc.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/msvc.patch b/external/harfbuzz/msvc.patch
deleted file mode 100644
index f6796a99bf8e..
--- a/external/harfbuzz/msvc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 src/hb-atomic.hh
-+++ src/hb-atomic.hh
-@@ -85,11 +85,11 @@
- #define hb_atomic_int_impl_add(AI, V) 
(reinterpret_cast *> (AI)->fetch_add ((V), 
std::memory_order_acq_rel))
- #define hb_atomic_int_impl_set_relaxed(AI, V) 
(reinterpret_cast *> (AI)->store ((V), 
std::memory_order_relaxed))
- #define hb_atomic_int_impl_set(AI, V) 
(reinterpret_cast *> (AI)->store ((V), 
std::memory_order_release))
--#define hb_atomic_int_impl_get_relaxed(AI)
(reinterpret_cast *> (AI)->load (std::memory_order_relaxed))
--#define hb_atomic_int_impl_get(AI)
(reinterpret_cast *> (AI)->load (std::memory_order_acquire))
-+#define hb_atomic_int_impl_get_relaxed(AI)
(reinterpret_cast const *> (AI)->load 
(std::memory_order_relaxed))
-+#define hb_atomic_int_impl_get(AI)
(reinterpret_cast const *> (AI)->load 
(std::memory_order_acquire))
- 
- #define hb_atomic_ptr_impl_set_relaxed(P, V)  
(reinterpret_cast *> (P)->store ((V), 
std::memory_order_relaxed))
--#define hb_atomic_ptr_impl_get_relaxed(P) 
(reinterpret_cast *> (P)->load (std::memory_order_relaxed))
-+#define hb_atomic_ptr_impl_get_relaxed(P) 
(reinterpret_cast const *> (P)->load 
(std::memory_order_relaxed))
- #define hb_atomic_ptr_impl_get(P) 
(reinterpret_cast *> (P)->load (std::memory_order_acquire))
- static inline bool
- _hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 include/xmloff/odffields.hxx |1 +
 sw/inc/strings.hrc   |1 +
 sw/source/ui/fldui/DropDownFormFieldDialog.cxx   |   13 +
 sw/source/uibase/inc/DropDownFormFieldDialog.hxx |1 +
 4 files changed, 16 insertions(+)

New commits:
commit d3c8973f54037f915e12cd038a6a76501d237ea4
Author: Tamás Zolnai 
AuthorDate: Tue Aug 20 15:01:34 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Aug 20 19:08:13 2019 +0200

tdf#126792: DOCX legacy drop-downs are only supposed to hold 25 items, GUI

Implement GUI part. Do not allow to add more items to the drop-down
field if the count of items reached the 25 limit.

Change-Id: I126edc500bc18e2f0f4b6864775f89be6801f887
Reviewed-on: https://gerrit.libreoffice.org/77843
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/include/xmloff/odffields.hxx b/include/xmloff/odffields.hxx
index 8b5fc6dc7bcb..c37631f07d46 100644
--- a/include/xmloff/odffields.hxx
+++ b/include/xmloff/odffields.hxx
@@ -32,6 +32,7 @@
 #define ODF_FORMDROPDOWN "vnd.oasis.opendocument.field.FORMDROPDOWN"
 #define ODF_FORMDROPDOWN_LISTENTRY "Dropdown_ListEntry"
 #define ODF_FORMDROPDOWN_RESULT "Dropdown_Selected"
+#define ODF_FORMDROPDOWN_ENTRY_COUNT_LIMIT 25
 
 #define ODF_FORMDATE "vnd.oasis.opendocument.field.FORMDATE"
 #define ODF_FORMDATE_DATEFORMAT "DateField_DateFormat" // e.g. "MM.DD.YY"
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 232e673fbd5e..010d7e662724 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -550,6 +550,7 @@
 #define STR_UNDO_TBLSTYLE_UPDATE
NC_("STR_UNDO_TBLSTYLE_UPDATE", "Update table style: $1")
 #define STR_UNDO_TABLE_DELETE   NC_("STR_UNDO_TABLE_DELETE", 
"Delete table")
 #define STR_UNDO_INSERT_FORM_FIELD  
NC_("STR_UNDO_INSERT_FORM_FIELD", "Insert form field")
+#define STR_DROP_DOWN_FIELD_ITEM_LIMIT  
NC_("STR_DROP_DOWN_FIELD_ITEM_LIMIT", "You can specify maximum of 25 items for 
a drop-down form field.")
 
 #define STR_ACCESS_DOC_NAME NC_("STR_ACCESS_DOC_NAME", 
"Document view")
 #define STR_ACCESS_DOC_DESC NC_("STR_ACCESS_DOC_DESC", 
"Document view")
diff --git a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx 
b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
index 177fd00bb961..7d703dee7122 100644
--- a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
@@ -11,6 +11,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 namespace sw
 {
@@ -18,6 +21,7 @@ 
DropDownFormFieldDialog::DropDownFormFieldDialog(weld::Widget* pParent,
  mark::IFieldmark* 
pDropDownField)
 : GenericDialogController(pParent, 
"modules/swriter/ui/dropdownformfielddialog.ui",
   "DropDownFormFieldDialog")
+, m_pParent(pParent)
 , m_pDropDownField(pDropDownField)
 , m_bListHasChanged(false)
 , m_xListItemEntry(m_xBuilder->weld_entry("item_entry"))
@@ -128,6 +132,15 @@ void DropDownFormFieldDialog::AppendItemToList()
 {
 if (m_xListAddButton->get_sensitive())
 {
+if (m_xListItemsTreeView->n_children() >= 
ODF_FORMDROPDOWN_ENTRY_COUNT_LIMIT)
+{
+std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(
+m_pParent, VclMessageType::Info, VclButtonsType::Ok,
+SwResId(STR_DROP_DOWN_FIELD_ITEM_LIMIT)));
+xInfoBox->run();
+return;
+}
+
 const OUString sEntry(m_xListItemEntry->get_text());
 if (!sEntry.isEmpty())
 {
diff --git a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx 
b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx
index ae1e1b51db62..e3cf8032b97f 100644
--- a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx
+++ b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx
@@ -26,6 +26,7 @@ namespace sw
 class DropDownFormFieldDialog : public weld::GenericDialogController
 {
 private:
+weld::Widget* const m_pParent;
 mark::IFieldmark* m_pDropDownField;
 bool m_bListHasChanged;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: test/source toolkit/source ucb/source unoidl/source unotools/source

[Noel Grandin (via logerrit)]

 test/source/sheet/functiondescription.cxx  |4 ++--
 test/source/sheet/sheetsortdescriptor2.cxx |4 ++--
 toolkit/source/awt/vclxtoolkit.cxx |6 +++---
 toolkit/source/controls/unocontrol.cxx |2 +-
 toolkit/source/helper/btndlg.cxx   |4 ++--
 ucb/source/ucp/ftp/ftpcontentprovider.cxx  |2 +-
 ucb/source/ucp/ftp/ftpurl.cxx  |2 +-
 unoidl/source/sourceprovider-parser.y  |   26 +-
 unoidl/source/unoidl-read.cxx  |4 ++--
 unoidl/source/unoidl-write.cxx |4 ++--
 unotools/source/config/moduleoptions.cxx   |2 +-
 11 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 1d4eb1be35cc393f98496883c2cb4ee89f4bcf0c
Author: Noel Grandin 
AuthorDate: Tue Aug 20 15:54:16 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 18:39:11 2019 +0200

loplugin:constvars in test..unotools

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

diff --git a/test/source/sheet/functiondescription.cxx 
b/test/source/sheet/functiondescription.cxx
index e629331175ae..5b7aeb5ca99a 100644
--- a/test/source/sheet/functiondescription.cxx
+++ b/test/source/sheet/functiondescription.cxx
@@ -24,13 +24,13 @@ namespace apitest
 {
 void FunctionDescription::testFunctionDescriptionProperties()
 {
-uno::Sequence aFunctionDescription(init());
+const uno::Sequence aFunctionDescription(init());
 
 std::vector names;
 // Only test the get/read operation of the values, because set/write 
operation doesn't
 // make any sense. It doesn't trigger any changes.
 // See discussion: 
nabble.documentfoundation.org/Testing-UNO-API-service-properties-td4236286.html.
-for (auto& value : aFunctionDescription)
+for (const auto& value : aFunctionDescription)
 {
 if (value.Name == "Id")
 {
diff --git a/test/source/sheet/sheetsortdescriptor2.cxx 
b/test/source/sheet/sheetsortdescriptor2.cxx
index 9f7133f8809a..85ca8706cd4c 100644
--- a/test/source/sheet/sheetsortdescriptor2.cxx
+++ b/test/source/sheet/sheetsortdescriptor2.cxx
@@ -27,13 +27,13 @@ namespace apitest
 void SheetSortDescriptor2::testSheetSortDescriptor2Properties()
 {
 uno::Reference xSortable(init(), UNO_QUERY_THROW);
-uno::Sequence values = 
xSortable->createSortDescriptor();
+const uno::Sequence values = 
xSortable->createSortDescriptor();
 
 std::vector names;
 // Only test the get/read operation of the values, because set/write 
operation doesn't
 // make any sense. It doesn't trigger any changes.
 // See discussion: 
nabble.documentfoundation.org/Testing-UNO-API-service-properties-td4236286.html.
-for (auto& value : values)
+for (const auto& value : values)
 {
 if (value.Name == "BindFormatsToContent")
 {
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index b385ce385958..7ede778ef9f5 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -2068,7 +2068,7 @@ void VCLXToolkit::callTopWindowListeners(
 {
 css::lang::EventObject aAwtEvent(
 static_cast< css::awt::XWindow * >(pWindow->GetWindowPeer()));
-for (css::uno::Reference & i : aListeners)
+for (const css::uno::Reference & i : aListeners)
 {
 css::uno::Reference< css::awt::XTopWindowListener >
   xListener(i, css::uno::UNO_QUERY);
@@ -2111,7 +2111,7 @@ bool VCLXToolkit::callKeyHandlers(::VclSimpleEvent const 
* pEvent,
 pKeyEvent->GetKeyCode().GetCode(), pKeyEvent->GetCharCode(),
 sal::static_int_cast< sal_Int16 >(
 pKeyEvent->GetKeyCode().GetFunction()));
-for (css::uno::Reference & i : aHandlers)
+for (const css::uno::Reference & i : aHandlers)
 {
 css::uno::Reference< css::awt::XKeyHandler > xHandler(
 i, css::uno::UNO_QUERY);
@@ -2158,7 +2158,7 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent 
const * pEvent,
 static_cast< css::awt::XWindow * >(pWindow->GetWindowPeer()),
 static_cast(pWindow->GetGetFocusFlags()),
 xNext, false);
-for (css::uno::Reference & i : aListeners)
+for (const css::uno::Reference & i : aListeners)
 {
 css::uno::Reference< css::awt::XFocusListener > xListener(
 i, css::uno::UNO_QUERY);
diff --git a/toolkit/source/controls/unocontrol.cxx 
b/toolkit/source/controls/unocontrol.cxx
index 1881fa374bd3..17aa5d74207d 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -579,7 +579,7 @@ void UnoControl::ImplModelPropertiesChanged( const 
Sequence< PropertyChangeEvent
 while ( pLangDepProp->pPropName != nullptr )
 

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

[Noel Grandin (via logerrit)]

 vcl/opengl/RenderList.cxx |2 +-
 vcl/opengl/gdiimpl.cxx|2 +-
 vcl/qt5/Qt5Graphics_GDI.cxx   |2 +-
 vcl/source/app/svapp.cxx  |2 +-
 vcl/source/control/tabctrl.cxx|2 +-
 vcl/source/gdi/WidgetDefinition.cxx   |2 +-
 vcl/source/gdi/pdfwriter_impl.cxx |4 ++--
 vcl/source/gdi/print.cxx  |4 ++--
 vcl/source/gdi/print3.cxx |2 +-
 vcl/source/image/ImplImageTree.cxx|6 +++---
 vcl/source/treelist/imap.cxx  |2 +-
 vcl/source/uitest/logger.cxx  |2 +-
 vcl/source/window/accel.cxx   |2 +-
 vcl/source/window/builder.cxx |4 ++--
 vcl/source/window/dialog.cxx  |4 ++--
 vcl/source/window/dockmgr.cxx |2 +-
 vcl/source/window/event.cxx   |4 ++--
 vcl/source/window/splitwin.cxx|   10 +-
 vcl/source/window/toolbox.cxx |2 +-
 vcl/unx/generic/app/saldisp.cxx   |4 ++--
 vcl/unx/generic/desktopdetect/desktopdetector.cxx |2 +-
 vcl/unx/gtk3/gtk3gtkinst.cxx  |2 +-
 22 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 50a6041bfac60ab03ec896bd638504524853300d
Author: Noel Grandin 
AuthorDate: Tue Aug 20 15:54:28 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 18:37:47 2019 +0200

loplugin:constvars in vcl

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

diff --git a/vcl/opengl/RenderList.cxx b/vcl/opengl/RenderList.cxx
index 823942121f3f..81817950d05a 100644
--- a/vcl/opengl/RenderList.cxx
+++ b/vcl/opengl/RenderList.cxx
@@ -293,7 +293,7 @@ void RenderList::addDrawPolyPolygon(const 
basegfx::B2DPolyPolygon& rPolyPolygon,
 {
 RenderParameters& rTriangleRenderParameter = 
maRenderEntries.back().maTriangleParameters;
 
-for (basegfx::B2DTrapezoid & rTrapezoid : aTrapezoidVector)
+for (const basegfx::B2DTrapezoid & rTrapezoid : aTrapezoidVector)
 {
 GLfloat topX1 = rTrapezoid.getTopXLeft();
 GLfloat topX2 = rTrapezoid.getTopXRight();
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index efbc4cea3682..b7443ffd6d26 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -900,7 +900,7 @@ void OpenGLSalGraphicsImpl::DrawPolyPolygon( const 
basegfx::B2DPolyPolygon& rPol
 basegfx::B2DTrapezoidVector aB2DTrapVector;
 basegfx::utils::trapezoidSubdivide( aB2DTrapVector, aSimplePolyPolygon );
 // draw tessellation result
-for(basegfx::B2DTrapezoid & i : aB2DTrapVector)
+for(const basegfx::B2DTrapezoid & i : aB2DTrapVector)
 DrawTrapezoid( i, blockAA );
 }
 
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index f95f18af474c..2aa70949dc32 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -127,7 +127,7 @@ bool Qt5Graphics::setClipRegion(const vcl::Region& rRegion)
 QRegion aQRegion;
 RectangleVector aRectangles;
 rRegion.GetRegionRectangles(aRectangles);
-for (auto& rRect : aRectangles)
+for (const auto& rRect : aRectangles)
 aQRegion += toQRect(rRect);
 m_aClipRegion = aQRegion;
 if (!m_aClipPath.isEmpty())
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index bbabe2aa9083..28ab180a77f7 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -801,7 +801,7 @@ bool Application::HandleKey( VclEventId nEvent, vcl::Window 
*pWin, KeyEvent* pKe
 bool bProcessed = false;
 // Copy the list, because this can be destroyed when calling a Link...
 std::vector> aCopy( 
pSVData->maAppData.maKeyListeners );
-for ( Link& rLink : aCopy )
+for ( const Link& rLink : aCopy )
 {
 if( rLink.Call( aEvent ) )
 {
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index a63a63d04a56..522bf6e66310 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1134,7 +1134,7 @@ void TabControl::Paint( vcl::RenderContext& 
rRenderContext, const tools::Rectang
 if (mpTabCtrlData->maItemList.size())
 {
 long nRight = 0;
-for (auto &item : mpTabCtrlData->maItemList)
+for (const auto &item : mpTabCtrlData->maItemList)
 if (item.m_bVisible)
 nRight = item.maRect.Right();
 assert(nRight);
diff --git a/vcl/source/gdi/WidgetDefinition.cxx 
b/vcl/source/gdi/WidgetDefinition.cxx
index 2a8ae5025020..cabb0d0817ba 100644
--

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/drwlayer.cxx|6 --
 sw/qa/extras/tiledrendering/tiledrendering.cxx  |2 +-
 sw/qa/extras/uiwriter/uiwriter.cxx  |2 +-
 sw/qa/extras/uiwriter/uiwriter2.cxx |2 +-
 sw/source/core/crsr/crsrsh.cxx  |2 +-
 sw/source/core/doc/DocumentDrawModelManager.cxx |2 +-
 sw/source/core/doc/DocumentTimerManager.cxx |2 +-
 sw/source/core/doc/docbm.cxx|2 +-
 sw/source/core/doc/docedt.cxx   |2 +-
 sw/source/core/doc/doclay.cxx   |2 +-
 sw/source/core/doc/docredln.cxx |2 +-
 sw/source/core/doc/list.cxx |2 +-
 sw/source/core/doc/tblafmt.cxx  |2 +-
 sw/source/core/doc/tblrwcl.cxx  |4 ++--
 sw/source/core/docnode/ndtbl1.cxx   |2 +-
 sw/source/core/draw/dcontact.cxx|4 ++--
 sw/source/core/edit/edatmisc.cxx|2 +-
 sw/source/core/edit/edattr.cxx  |2 +-
 sw/source/core/edit/edfld.cxx   |2 +-
 sw/source/core/edit/editsh.cxx  |4 ++--
 sw/source/core/edit/edredln.cxx |2 +-
 sw/source/core/edit/edsect.cxx  |2 +-
 sw/source/core/edit/edtab.cxx   |2 +-
 sw/source/core/frmedt/fedesc.cxx|2 +-
 sw/source/core/frmedt/fefly1.cxx|2 +-
 sw/source/core/layout/paintfrm.cxx  |2 +-
 sw/source/core/undo/unsort.cxx  |6 +++---
 sw/source/core/unocore/unochart.cxx |2 +-
 sw/source/core/unocore/unostyle.cxx |3 ++-
 sw/source/core/unocore/unotbl.cxx   |4 ++--
 sw/source/core/view/viewsh.cxx  |2 +-
 sw/source/filter/html/htmlgrin.cxx  |2 +-
 sw/source/filter/html/svxcss1.cxx   |4 ++--
 sw/source/filter/html/swhtml.cxx|2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx|2 +-
 sw/source/filter/ww8/docxsdrexport.cxx  |2 +-
 sw/source/filter/ww8/docxtablestyleexport.cxx   |2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx |4 ++--
 sw/source/filter/ww8/rtfexport.cxx  |2 +-
 sw/source/filter/ww8/wrtw8sty.cxx   |2 +-
 sw/source/filter/ww8/ww8par5.cxx|2 +-
 sw/source/filter/ww8/ww8toolbar.cxx |2 +-
 sw/source/filter/xml/XMLRedlineImportHelper.cxx |2 +-
 sw/source/ui/envelp/label1.cxx  |2 +-
 sw/source/ui/index/cnttab.cxx   |6 +++---
 sw/source/uibase/app/mainwn.cxx |2 +-
 sw/source/uibase/dbui/dbmgr.cxx |8 
 sw/source/uibase/dochdl/gloshdl.cxx |2 +-
 sw/source/uibase/docvw/AnnotationWin2.cxx   |2 +-
 sw/source/uibase/docvw/PostItMgr.cxx|6 +++---
 sw/source/uibase/sidebar/ThemePanel.cxx |4 ++--
 sw/source/uibase/uno/unotxdoc.cxx   |2 +-
 sw/source/uibase/utlui/glbltree.cxx |2 +-
 sw/source/uibase/utlui/gloslst.cxx  |2 +-
 54 files changed, 74 insertions(+), 71 deletions(-)

New commits:
commit 102a94c9de3c8c4d1326022dd14a300d6b72e222
Author: Noel Grandin 
AuthorDate: Tue Aug 20 15:53:25 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 18:37:27 2019 +0200

loplugin:constvars in sw

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

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 5851faa56534..fe2d1e510cab 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -298,7 +298,7 @@ void SwTiledRenderingTest::callbackImpl(int nType, const 
char* pPayload)
 boost::property_tree::ptree aTree;
 std::stringstream aStream(pPayload);
 boost::property_tree::read_json(aStream, aTree);
-for (boost::property_tree::ptree::value_type& rValue : 
aTree.get_child("searchResultSelection"))
+for (const boost::property_tree::ptree::value_type& rValue : 
aTree.get_child("searchResultSelection"))
 {
 
m_aSearchResultSelection.emplace_back(rValue.second.get("rectangles").c_str());
 
m_aSearchResultPart.push_back(std::atoi(rValue.second.get("part").c_str()));
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 959a5990744c..b4665cd17b3d 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -4403,7 +4403,7 @@ void SwUiWriterTest::testTdf77014()
 {
 printf ("Portions:\n");
 
-for (auto& rPortionItem : aHandler.mPortionItems)
+for (const auto& rPortionItem : 

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |   25 +
 1 file changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 98f41c22b85e76fb8354a4b9df57f4211824e95e
Author: Jan-Marek Glogowski 
AuthorDate: Mon Aug 19 17:45:14 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Tue Aug 20 18:23:11 2019 +0200

Gtk3 defer LO dragExit handling to an idle

LO expects to handle either a drop or an exit event. Quoting the
Gtk+ docs: "Likewise, the “drag-leave” signal is also emitted
before the ::drag-drop signal, for instance to allow cleaning up
of a preview item created in the “drag-motion” signal handler."

Since we don't know if there will be a drop-event following the
leave event, we have to defer the "fire_draExit" to an idle, which
will be removed by the drop event, before it can be processed.

Fixes D'n'D between two Writer windows. For whatever reason it
works correct in Calc, which probably needs further investigation.

Regression from commit c70b86588fe5 ("Gtk3 inform LO of drag
leave").

Change-Id: Ia59dcc8b20efd442ac5efc895602e5cc432cc379
Reviewed-on: https://gerrit.libreoffice.org/77753
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 53d492f4b8aa..899b2161eefe 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3438,6 +3438,13 @@ gboolean GtkSalFrame::signalDragDrop(GtkWidget* pWidget, 
GdkDragContext* context
 
 gboolean GtkDropTarget::signalDragDrop(GtkWidget* pWidget, GdkDragContext* 
context, gint x, gint y, guint time)
 {
+// remove the deferred dragExit, as we'll do a drop
+#ifndef NDEBUG
+gboolean res =
+#endif
+g_idle_remove_by_data(this);
+assert(res);
+
 css::datatransfer::dnd::DropTargetDropEvent aEvent;
 aEvent.Source = static_cast(this);
 aEvent.Context = new GtkDropTargetDropContext(context, time);
@@ -3606,14 +3613,24 @@ void GtkSalFrame::signalDragLeave(GtkWidget *pWidget, 
GdkDragContext *context, g
 pThis->m_pDropTarget->signalDragLeave(pWidget, context, time);
 }
 
+static gboolean lcl_deferred_dragExit(gpointer user_data)
+{
+GtkDropTarget* pThis = static_cast(user_data);
+css::datatransfer::dnd::DropTargetEvent aEvent;
+aEvent.Source = static_cast(pThis);
+pThis->fire_dragExit(aEvent);
+return FALSE;
+}
+
 void GtkDropTarget::signalDragLeave(GtkWidget* pWidget, GdkDragContext* 
/*context*/, guint /*time*/)
 {
 m_bInDrag = false;
 gtk_drag_unhighlight(pWidget);
-
-css::datatransfer::dnd::DropTargetEvent aEvent;
-aEvent.Source = static_cast(this);
-fire_dragExit(aEvent);
+// defer fire_dragExit, since gtk also sends a drag-leave before the drop, 
while
+// LO expect to either handle the drop or the exit... at least in Writer.
+// but since we don't know there will be a drop following the leave, defer 
the
+// exit handling to an idle.
+g_idle_add(lcl_deferred_dragExit, this);
 }
 
 void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/js wsd/ClientSession.cpp wsd/FileServer.cpp wsd/LOOLWSD.cpp

[Henry Castro (via logerrit)]

 loleaflet/js/global.js |   25 +
 wsd/ClientSession.cpp  |6 ++
 wsd/FileServer.cpp |   19 +--
 wsd/LOOLWSD.cpp|2 --
 4 files changed, 48 insertions(+), 4 deletions(-)

New commits:
commit 3c1a130004845c99a159d634eb79474ff3c8d353
Author: Henry Castro 
AuthorDate: Tue Aug 20 12:21:25 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 18:24:15 2019 +0200

wsd: fix build, with argument "--disable-ssl"

wsd/LOOLWSD.cpp:1034:14: error: ‘SSLEnabled’ is not a member of ‘LOOLWSD’
wsd/LOOLWSD.cpp:1049:14: error: ‘SSLTermination’ is not a member of 
‘LOOLWSD’

Change-Id: I3e81431ef56f46a844733b797b4c443a77afeb6e
Reviewed-on: https://gerrit.libreoffice.org/77850
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index e0518479d..7fa2072e7 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1030,7 +1030,6 @@ void LOOLWSD::initialize(Application& self)
 
 #if ENABLE_SSL
 LOOLWSD::SSLEnabled.set(getConfigValue(conf, "ssl.enable", true));
-#else
 LOOLWSD::SSLEnabled.set(false);
 #endif
 
@@ -1045,7 +1044,6 @@ void LOOLWSD::initialize(Application& self)
 
 #if ENABLE_SSL
 LOOLWSD::SSLTermination.set(getConfigValue(conf, "ssl.termination", 
true));
-#else
 LOOLWSD::SSLTermination.set(false);
 #endif
 
commit 2872bc7be91aabb1bcecbe5f8c761e917115f43d
Author: Henry Castro 
AuthorDate: Mon Jul 1 20:25:10 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 18:24:04 2019 +0200

post logs JavaScript runtime errors to the loolwsd server

Change-Id: Ic8ccff52d2f051ea6d31b6d2bfe08fc08ea4d8c2
Reviewed-on: https://gerrit.libreoffice.org/77849
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index c1d6b9f9e..a8e5eb8f5 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -36,6 +36,31 @@
for (var i = 0; i < methods.length; i++) {
console[methods[i]] = function() {};
}
+   } else {
+   window.onerror = function (msg, src, row, col, err) {
+   var data = {
+   userAgent: navigator.userAgent.toLowerCase(),
+   vendor: navigator.vendor.toLowerCase(),
+   message: msg,
+   source: src,
+   line: row,
+   column: col
+   }, desc = err.message || {}, stack = err.stack || {};
+   var log = 'jserror ' + JSON.stringify(data, null, 2) + 
'\n' + desc + '\n' + stack + '\n';
+   if (global.socket && (global.socket instanceof 
WebSocket) && global.socket.readyState === 1) {
+   global.socket.send(log);
+   } else if (global.socket && (global.socket instanceof 
global.L.Socket) && global.socket.connected()) {
+   global.socket.sendMessage(log);
+   } else {
+   var req = new XMLHttpRequest();
+   var url = global.location.protocol + '//' + 
global.location.host + global.location.pathname.match(/.*\//) + 'logging.html';
+   req.open('POST', url, true);
+   
req.setRequestHeader('Content-type','application/json; charset=utf-8');
+   req.send(log);
+   }
+
+   return false;
+   }
}
 
// fix jquery-ui
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 56f2a3443..00ca2d506 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -361,6 +361,12 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 
 return true;
 }
+
+if (tokens[0] == "jserror")
+{
+LOG_ERR(std::string(buffer, length));
+return true;
+}
 else if (tokens[0] == "load")
 {
 if (getDocURL() != "")
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index f51c67f6c..bfde038c9 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -284,13 +284,28 @@ void FileServerRequestHandler::handleRequest(const 
HTTPRequest& request, Poco::M
 std::vector requestSegments;
 requestUri.getPathSegments(requestSegments);
 const std::string relPath = getRequestPathname(request);
+const std::string endPoint = requestSegments[requestSegments.size() - 
1];
+const auto& config = Application::instance().config();
+
+if (request.getMethod() == HTTPRequest::HTTP_POST && endPoint == 
"logging.html")
+{
+const std::string loleafletLogging = 
config.getString("loleaflet_logging", "false");
+if (loleafletLogging != "false")
+{
+   

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

[Henry Castro (via logerrit)]

 loleaflet/css/toolbar.css |4 
 1 file changed, 4 insertions(+)

New commits:
commit d58f4a937d1477eb6f945ab37d5c05d268fc8c5d
Author: Henry Castro 
AuthorDate: Sat Jul 27 10:40:46 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 17:35:23 2019 +0200

loleaflet: mobile: fix  misaligned font name in android WebView

Change-Id: Ibfee4427fc1fc667f90377f7cb6bbcb08a719b0e
Reviewed-on: https://gerrit.libreoffice.org/77848
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index ccb7b57d9..3ae37ad54 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -65,6 +65,10 @@ w2ui-toolbar {
 z-index: 1000;
 }
 
+.select2-container .select2-selection--single {
+height: 100%;
+}
+
 .w2ui-scroll-left,
 .w2ui-scroll-right {
 z-index: 1000;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2ba4becb75ec2c72931260d8e3892a06c0546f38
Author: Henry Castro 
AuthorDate: Sat Jul 13 15:38:59 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 17:31:19 2019 +0200

loleaflet: mobile: limit the center point with max bounds when zooming

Change-Id: Ic2a3823204a717cb17057f5d8b4e25efea2c7759
Reviewed-on: https://gerrit.libreoffice.org/77847
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 3171e2794..6081c8539 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -341,8 +341,9 @@ L.Map.TouchGesture = L.Handler.extend({
// we need to invert the offset or the map is moved in 
the opposite direction
var offset = {x: e.center.x - this._pinchStartCenter.x, 
y: e.center.y - this._pinchStartCenter.y};
var center = {x: this._pinchStartCenter.x - offset.x, 
y: this._pinchStartCenter.y - offset.y};
-   this._center = this._map.mouseEventToLatLng({clientX: 
center.x, clientY: center.y});
this._zoom = this._map.getScaleZoom(e.scale);
+   this._center = 
this._map._limitCenter(this._map.mouseEventToLatLng({clientX: center.x, 
clientY: center.y}),
+   this._zoom, this._map.options.maxBounds);
 
L.Util.cancelAnimFrame(this._animRequest);
this._animRequest = L.Util.requestAnimFrame(function () 
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |   20 +---
 1 file changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 93992872e18d4043075d2d01d2ba8e74dcb5e38d
Author: Marco Cecchetti 
AuthorDate: Mon Jul 1 20:07:54 2019 +0200
Commit: Henry Castro 
CommitDate: Tue Aug 20 17:31:02 2019 +0200

loleaflet: pinch + pan issue: move in the opposite direction

When the user pans with 2 fingers the document is moved in the
opposite direction. So we store the initial center point and invert
the offset to achieve the correct behavior.

Change-Id: Ief63aa39f56c3b812a90b392ddedc4ba21d813e4
Reviewed-on: https://gerrit.libreoffice.org/77846
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 01b564ddc..3171e2794 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -84,7 +84,8 @@ L.Map.TouchGesture = L.Handler.extend({
this._hammer.on('panstart', L.bind(this._onPanStart, this));
this._hammer.on('pan', L.bind(this._onPan, this));
this._hammer.on('panend', L.bind(this._onPanEnd, this));
-   this._hammer.on('pinchstart pinchmove', L.bind(this._onPinch, 
this));
+   this._hammer.on('pinchstart', L.bind(this._onPinchStart, this));
+   this._hammer.on('pinchmove', L.bind(this._onPinch, this));
this._hammer.on('pinchend', L.bind(this._onPinchEnd, this));
this._hammer.on('tripletap', L.bind(this._onTripleTap, this));
if (window.ThisIsTheiOSApp)
@@ -99,7 +100,8 @@ L.Map.TouchGesture = L.Handler.extend({
this._hammer.off('panstart', L.bind(this._onPanStart, this));
this._hammer.off('pan', L.bind(this._onPan, this));
this._hammer.off('panend', L.bind(this._onPanEnd, this));
-   this._hammer.off('pinchstart pinchmove', L.bind(this._onPinch, 
this));
+   this._hammer.off('pinchstart', L.bind(this._onPinchStart, 
this));
+   this._hammer.off('pinchmove', L.bind(this._onPinch, this));
this._hammer.off('pinchend', L.bind(this._onPinchEnd, this));
this._hammer.off('doubletap', L.bind(this._onDoubleTap, this));
this._hammer.off('tripletap', L.bind(this._onTripleTap, this));
@@ -325,9 +327,21 @@ L.Map.TouchGesture = L.Handler.extend({
}
},
 
+   _onPinchStart: function (e) {
+   if (this._map.getDocType() !== 'spreadsheet') {
+   this._pinchStartCenter = {x: e.center.x, y: e.center.y};
+   }
+   },
+
_onPinch: function (e) {
+   if (!this._pinchStartCenter)
+   return;
+
if (this._map.getDocType() !== 'spreadsheet') {
-   this._center = this._map.mouseEventToLatLng({clientX: 
e.center.x, clientY: e.center.y});
+   // we need to invert the offset or the map is moved in 
the opposite direction
+   var offset = {x: e.center.x - this._pinchStartCenter.x, 
y: e.center.y - this._pinchStartCenter.y};
+   var center = {x: this._pinchStartCenter.x - offset.x, 
y: this._pinchStartCenter.y - offset.y};
+   this._center = this._map.mouseEventToLatLng({clientX: 
center.x, clientY: center.y});
this._zoom = this._map.getScaleZoom(e.scale);
 
L.Util.cancelAnimFrame(this._animRequest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/map/Map.js |9 +
 1 file changed, 9 insertions(+)

New commits:
commit dc4177326771dc2d280ddbba1f4ba88e426742c2
Author: Henry Castro 
AuthorDate: Sat Jul 13 10:22:39 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 17:25:42 2019 +0200

loleaflet: mobile: apply auto fit width zooms when doc layer is loaded

When the leaflet.html is loaded, it fires the resize event, at that
instant the map does not exist nor the document layer. Once the objects
are properly initialized fire again resize to apply fit width zoom.

Change-Id: Ib8c149ca4ff20006884ad567f387d81d9d3086e1
Reviewed-on: https://gerrit.libreoffice.org/77845
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 78602aa4e..5b048ac2a 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -190,6 +190,11 @@ L.Map = L.Evented.extend({
}
}, this);
this.on('doclayerinit', function() {
+   if (window._invalidateSize) {
+   this._size = new L.Point(0,0);
+   this._onResize();
+   delete window._invalidateSize;
+   }
if (!this.initComplete) {
this._fireInitComplete('doclayerinit');
}
@@ -1021,6 +1026,10 @@ L.Map = L.Evented.extend({
},
 
_onResize: function () {
+   if (!this || !this._docLayer) {
+   window._invalidateSize = true;
+   return;
+   }
L.Util.cancelAnimFrame(this._resizeRequest);
this._resizeRequest = L.Util.requestAnimFrame(
function () { this.invalidateSize({debounceMoveend: 
true}); }, this, false, this._container);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 38bce3d6f1e9c54825bbf55a5c2f2659c96d818f
Author: Henry Castro 
AuthorDate: Wed Jul 10 11:57:22 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 17:17:00 2019 +0200

loeaflet: mobile: avoid long press event when a graphic is panning, part2

Change-Id: I9ecc20030f8db2ec85b8dbfca91a390b5d32c841
Reviewed-on: https://gerrit.libreoffice.org/77842
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 331adff01..01b564ddc 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -137,11 +137,13 @@ L.Map.TouchGesture = L.Handler.extend({
} else {
this._state = L.Map.TouchGesture.MAP;
}
+   this._moving = false;
}
 
if (e.isLast && this._state !== L.Map.TouchGesture.MAP) {
this._state = L.Map.TouchGesture.hitTest.MAP;
this._marker = undefined;
+   this._moving = false;
}
 
if ($(e.srcEvent.target).has(this._map._mapPane)) {
@@ -163,7 +165,7 @@ L.Map.TouchGesture = L.Handler.extend({
latlng = this._map.layerPointToLatLng(layerPoint),
mousePos = this._map._docLayer._latLngToTwips(latlng);
 
-   if (this._state === L.Map.TouchGesture.MARKER || this._state 
=== L.Map.TouchGesture.GRAPHIC) {
+   if (this._moving) {
return;
}
 
@@ -292,8 +294,10 @@ L.Map.TouchGesture = L.Handler.extend({
 
if (this._state === L.Map.TouchGesture.MARKER) {
this._map._fireDOMEvent(this._map, point, 'mousemove');
+   this._moving = true;
} else if (this._state === L.Map.TouchGesture.GRAPHIC) {
this._map._docLayer._graphicMarker._onDrag(point);
+   this._moving = true;
} else if (this._state === L.Map.TouchGesture.CURSOR) {
this._map._docLayer._postMouseEvent('move', mousePos.x, 
mousePos.y, 1, 1, 0);
} else {
@@ -310,8 +314,10 @@ L.Map.TouchGesture = L.Handler.extend({
 
if (this._state === L.Map.TouchGesture.MARKER) {
this._map._fireDOMEvent(this._map, point, 'mouseup');
+   this._moving = false;
} else if (this._state === L.Map.TouchGesture.GRAPHIC) {
this._map._docLayer._graphicMarker._onDragEnd(point);
+   this._moving = false;
} else if (this._state === L.Map.TouchGesture.CURSOR) {
this._map._docLayer._postMouseEvent('buttonup', 
mousePos.x, mousePos.y, 1, 1, 0);
} else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e291c42435097209b8c6b5eefb0d970dd30b846e
Author: Henry Castro 
AuthorDate: Wed Jul 10 10:23:16 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 17:14:22 2019 +0200

loleaflet: mobile: avoid long press event when a graphic is panning

Change-Id: I6ba8987e86f304b59336cb473d3fc023819da43e
Reviewed-on: https://gerrit.libreoffice.org/77841
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index a48a316b6..331adff01 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -163,7 +163,7 @@ L.Map.TouchGesture = L.Handler.extend({
latlng = this._map.layerPointToLatLng(layerPoint),
mousePos = this._map._docLayer._latLngToTwips(latlng);
 
-   if (this._state === L.Map.TouchGesture.MARKER) {
+   if (this._state === L.Map.TouchGesture.MARKER || this._state 
=== L.Map.TouchGesture.GRAPHIC) {
return;
}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |   19 ---
 loleaflet/src/dom/DomUtil.js   |2 ++
 2 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 040fa3c77c8fbf4474b715f9d3a815cf98295686
Author: Henry Castro 
AuthorDate: Thu Jul 4 00:03:19 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 17:12:06 2019 +0200

loeaflet: mobile: adjust the dialog position to top center, part2

Change-Id: Ie53ff4702a1559e4e3387adb8f12a70907b43118
Reviewed-on: https://gerrit.libreoffice.org/77840
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index cb4a68e5b..98aa1a5c7 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -23,6 +23,10 @@ function updateTransformation(target) {
target.value.style.webkitTransform = value;
target.value.style.mozTransform = value;
target.value.style.transform = value;
+
+   if (target.transformation.origin) {
+   target.value.style[L.DomUtil.TRANSFORM_ORIGIN] = 
target.transformation.origin;
+   }
}
 }
 
@@ -543,13 +547,6 @@ L.Control.LokDialog = L.Control.extend({
offsetY = -(height - window.screen.height) / 2;
}
 
-   // on mobile, force the positioning to the top, so that it is 
not
-   // covered by the virtual keyboard
-   if (window.mode.isMobile()) {
-   $(dialogContainer).dialog('option', 'position', { my: 
'left top', at: 'let top', of: window });
-   offsetY = 0;
-   }
-
var state = {
startX: offsetX,
startY: offsetY,
@@ -564,6 +561,14 @@ L.Control.LokDialog = L.Control.extend({
rz: 0
};
 
+   // on mobile, force the positioning to the top, so that it is 
not
+   // covered by the virtual keyboard
+   if (window.mode.isMobile()) {
+   $(dialogContainer).dialog('option', 'position', { my: 
'left top', at: 'let top', of: '#document-container' });
+   transformation.origin = 'center top';
+   transformation.translate.y = 0;
+   }
+
if (findZoomTarget(targetId) != null) {
removeZoomTarget(targetId);
}
diff --git a/loleaflet/src/dom/DomUtil.js b/loleaflet/src/dom/DomUtil.js
index 4e53f2394..26a05a89e 100644
--- a/loleaflet/src/dom/DomUtil.js
+++ b/loleaflet/src/dom/DomUtil.js
@@ -192,6 +192,8 @@ L.DomUtil = {
L.DomUtil.TRANSFORM = L.DomUtil.testProp(
['transform', 'WebkitTransform', 'OTransform', 
'MozTransform', 'msTransform']);
 
+   L.DomUtil.TRANSFORM_ORIGIN = L.DomUtil.testProp(
+   ['transformOrigin', 'msTransformOrigin', 
'WebkitTransformOrigin']);
 
// webkitTransition comes first because some browser versions that drop 
vendor prefix don't do
// the same for the transitionend event, in particular the Android 4.1 
stock browser
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit bb6c0f15fecd53a388e5ba8884446e74b201e13a
Author: Henry Castro 
AuthorDate: Thu Jul 4 00:03:19 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 17:11:28 2019 +0200

loeaflet: mobile: adjust the dialog position to top center

Change-Id: Ie53ff4702a1559e4e3387adb8f12a70907b43117
Reviewed-on: https://gerrit.libreoffice.org/77838
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index f655a79c3..00c957de5 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -453,7 +453,7 @@ L.Control.LokDialog = L.Control.extend({
this._createDialogCursor(strId);
var dlgInput = this._createDialogInput(strId);
this._setupWindowEvents(id, dialogCanvas, dlgInput);
-   this._setupGestures(id, dialogCanvas);
+   this._setupGestures(dialogContainer, id, dialogCanvas);
 
this._currentId = id;
this._sendPaintWindow(id, this._createRectStr(id));
@@ -525,7 +525,7 @@ L.Control.LokDialog = L.Control.extend({
});
},
 
-   _setupGestures: function(id, canvas) {
+   _setupGestures: function(dialogContainer, id, canvas) {
var self = this;
var dialogID = id;
var targetId = toZoomTargetId(canvas.id);
@@ -543,6 +543,12 @@ L.Control.LokDialog = L.Control.extend({
offsetY = -(height - window.screen.height) / 2;
}
 
+   // FIXME. window.mode.isMobile() return false
+   if (L.Browser.mobile() && screen.width < 768 && height < 
window.screen.height) {
+   $(dialogContainer).dialog('option', 'position', { my: 
'left top', at: 'let top', of: window });
+   offsetY = 0;
+   }
+
var state = {
startX: offsetX,
startY: offsetY,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 27ad4cd17bce93dee059ed4accf5b60c8f1516c1
Author: Jan Holesovsky 
AuthorDate: Thu Jul 4 15:10:22 2019 +0200
Commit: Henry Castro 
CommitDate: Tue Aug 20 17:11:49 2019 +0200

Fix TypeError.

No idea why window.mode.isMobile() did not work here - it does for me.
The previous code was causing a TypeError exception on the desktop.

Change-Id: I0108e2e4ac5d3ba487ac94b6459ea3f78032c606
Reviewed-on: https://gerrit.libreoffice.org/77839
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 00c957de5..cb4a68e5b 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -543,8 +543,9 @@ L.Control.LokDialog = L.Control.extend({
offsetY = -(height - window.screen.height) / 2;
}
 
-   // FIXME. window.mode.isMobile() return false
-   if (L.Browser.mobile() && screen.width < 768 && height < 
window.screen.height) {
+   // on mobile, force the positioning to the top, so that it is 
not
+   // covered by the virtual keyboard
+   if (window.mode.isMobile()) {
$(dialogContainer).dialog('option', 'position', { my: 
'left top', at: 'let top', of: window });
offsetY = 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmloff/source xmlscript/source

[Noel Grandin (via logerrit)]

 xmloff/source/chart/SchXMLSeries2Context.cxx |4 ++--
 xmloff/source/draw/sdxmlexp.cxx  |4 ++--
 xmloff/source/draw/shapeimport.cxx   |2 +-
 xmloff/source/draw/ximpcustomshape.cxx   |2 +-
 xmloff/source/forms/layerimport.cxx  |6 +++---
 xmloff/source/style/prhdlfac.cxx |2 +-
 xmloff/source/text/XMLPropertyBackpatcher.cxx|2 +-
 xmloff/source/text/XMLSectionExport.cxx  |6 +++---
 xmloff/source/text/XMLSectionExport.hxx  |2 +-
 xmloff/source/transform/ChartPlotAreaOOoTContext.cxx |2 +-
 xmlscript/source/xml_helper/xml_element.cxx  |2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 7ae43f63aad28c2cabb7cde6ea308055133fbde8
Author: Noel Grandin 
AuthorDate: Tue Aug 20 15:55:10 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 16:57:05 2019 +0200

loplugin:constvars in writerfilter..xmlscript

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

diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx 
b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 51d49b12067a..b7ca64652410 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -738,7 +738,7 @@ void SchXMLSeries2Context::setDefaultsToSeries( 
SeriesDefaultsAndStyles& rSeries
 // iterate over series
 // call initSeriesPropertySets first
 
-for (auto & seriesStyle : rSeriesDefaultsAndStyles.maSeriesStyleVector)
+for (const auto & seriesStyle : 
rSeriesDefaultsAndStyles.maSeriesStyleVector)
 {
 if( seriesStyle.meType != DataRowPointStyle::DATA_SERIES )
 continue;
@@ -790,7 +790,7 @@ void SchXMLSeries2Context::setStylesToSeries( 
SeriesDefaultsAndStyles& rSeriesDe
 , tSchXMLLSequencesPerIndex & rInOutLSequencesPerIndex )
 {
 // iterate over series
-for (auto & seriesStyle : rSeriesDefaultsAndStyles.maSeriesStyleVector)
+for (const auto & seriesStyle : 
rSeriesDefaultsAndStyles.maSeriesStyleVector)
 {
 if( seriesStyle.meType == DataRowPointStyle::DATA_SERIES )
 {
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 9e75edacafaa..8f4e09d431a0 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -716,7 +716,7 @@ bool SdXMLExport::ImpPrepAutoLayoutInfo(const 
Reference& xPage, OUStr
 
 void SdXMLExport::ImpWriteAutoLayoutInfos()
 {
-for(auto & pInfo : mvAutoLayoutInfoList)
+for(const auto & pInfo : mvAutoLayoutInfoList)
 {
 if(pInfo)
 {
@@ -1289,7 +1289,7 @@ ImpXMLEXPPageMasterInfo* 
SdXMLExport::ImpGetPageMasterInfoByName(const OUString&
 {
 if(!rName.isEmpty())
 {
-for(auto & pInfo : mvPageMasterInfoList)
+for(const auto & pInfo : mvPageMasterInfoList)
 {
 if(pInfo)
 {
diff --git a/xmloff/source/draw/shapeimport.cxx 
b/xmloff/source/draw/shapeimport.cxx
index bc7851676f6a..423327c8b0b9 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -803,7 +803,7 @@ void ShapeSortContext::popGroupAndSort()
 // this is the current index, all shapes before that
 // index are finished
 sal_Int32 nIndex = 0;
-for (ZOrderHint& rHint : maZOrderList)
+for (const ZOrderHint& rHint : maZOrderList)
 {
 for (vector::iterator aIt = maUnsortedList.begin(); aIt != 
maUnsortedList.end() && nIndex < rHint.nShould; )
 {
diff --git a/xmloff/source/draw/ximpcustomshape.cxx 
b/xmloff/source/draw/ximpcustomshape.cxx
index 19539ab5b2a8..f484ac7b6664 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -1227,7 +1227,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
 }
 
 // Path
-for ( beans::PropertyValue& rPathItem : maPath )
+for ( const beans::PropertyValue& rPathItem : maPath )
 {
 switch( EASGet( rPathItem.Name ) )
 {
diff --git a/xmloff/source/forms/layerimport.cxx 
b/xmloff/source/forms/layerimport.cxx
index ce19c3eb657d..da569c8e29b0 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -548,13 +548,13 @@ void OFormLayerXMLImport_Impl::documentDone( )
 }
 
 // process XForms-bindings; call registerXFormsValueBinding for each
-for (auto& aXFormsValueBinding : m_aXFormsValueBindings)
+for (const auto& aXFormsValueBinding : m_aXFormsValueBindings)
 bindXFormsValueBinding(rImport.GetModel(), aXFormsValueBinding);
 // same for list bindings
-for (auto& aXFormsListBindings : m_aXFormsListBindings)
+for (const auto& aXFormsListBindings : m_aXFormsListBindings)
 bindXFormsListBinding(rImport.GetModel(), aXFo

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

[Henry Castro (via logerrit)]

 loleaflet/src/core/Socket.js |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 115a6d69be6f320b16303b4ee0f552244348eab3
Author: Henry Castro 
AuthorDate: Wed Jul 3 00:04:29 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 16:44:18 2019 +0200

loleaflet: deselect graphic marker when socket closed

Change-Id: Ib9c48614a4a1a252cc0497b95739dd0725fe
Reviewed-on: https://gerrit.libreoffice.org/77837
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 1b4ba67ca..c4ba559d1 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -847,6 +847,8 @@ L.Socket = L.Class.extend({
if (this._map._docLayer) {
this._map._docLayer.removeAllViews();
this._map._docLayer._resetClientVisArea();
+   this._map._docLayer._graphicSelection = null;
+   this._map._docLayer._onUpdateGraphicSelection();
}
 
if (isActive && this._reconnecting) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/dom/Draggable.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e860732e829d4e3d21a2eba3a26c59ad080f
Author: Henry Castro 
AuthorDate: Sun Jun 30 17:15:10 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 16:42:41 2019 +0200

loleaflet: mobile: ensure startPoint is undefined after dragging the element

Change-Id: I7f261e4558ceb0082f0c1ab1015a90bd212733e9
Reviewed-on: https://gerrit.libreoffice.org/77836
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/dom/Draggable.js b/loleaflet/src/dom/Draggable.js
index d9f5485a8..16f48235f 100644
--- a/loleaflet/src/dom/Draggable.js
+++ b/loleaflet/src/dom/Draggable.js
@@ -199,5 +199,6 @@ L.Draggable = L.Evented.extend({
}
 
this._moving = false;
+   this._startPoint = undefined;
}
 });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4727c4c22b27d336152d31bf4d44849dbeeeda76
Author: Henry Castro 
AuthorDate: Sun Jun 30 16:07:10 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 16:41:06 2019 +0200

loleaflet: mobile: fix e.srcEvent that it does not have clientX and

clientY properties in Safari

Change-Id: I02531bc370a9768317e7e40480d589a82db7ab89
Reviewed-on: https://gerrit.libreoffice.org/77835
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 9398c9f81..a48a316b6 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -273,9 +273,9 @@ L.Map.TouchGesture = L.Handler.extend({
}
 
if (this._state === L.Map.TouchGesture.MARKER) {
-   this._map._fireDOMEvent(this._marker, e.srcEvent, 
'mousedown');
+   this._map._fireDOMEvent(this._marker, point, 
'mousedown');
} else if (this._state === L.Map.TouchGesture.GRAPHIC) {
-   
this._map._docLayer._graphicMarker._onDragStart(e.srcEvent);
+   this._map._docLayer._graphicMarker._onDragStart(point);
} else if (this._state === L.Map.TouchGesture.CURSOR) {
this._map._docLayer._postMouseEvent('buttondown', 
mousePos.x, mousePos.y, 1, 1, 0);
} else {
@@ -291,9 +291,9 @@ L.Map.TouchGesture = L.Handler.extend({
mousePos = this._map._docLayer._latLngToTwips(latlng);
 
if (this._state === L.Map.TouchGesture.MARKER) {
-   this._map._fireDOMEvent(this._map, e.srcEvent, 
'mousemove');
+   this._map._fireDOMEvent(this._map, point, 'mousemove');
} else if (this._state === L.Map.TouchGesture.GRAPHIC) {
-   this._map._docLayer._graphicMarker._onDrag(e.srcEvent);
+   this._map._docLayer._graphicMarker._onDrag(point);
} else if (this._state === L.Map.TouchGesture.CURSOR) {
this._map._docLayer._postMouseEvent('move', mousePos.x, 
mousePos.y, 1, 1, 0);
} else {
@@ -309,9 +309,9 @@ L.Map.TouchGesture = L.Handler.extend({
mousePos = this._map._docLayer._latLngToTwips(latlng);
 
if (this._state === L.Map.TouchGesture.MARKER) {
-   this._map._fireDOMEvent(this._map, e.srcEvent, 
'mouseup');
+   this._map._fireDOMEvent(this._map, point, 'mouseup');
} else if (this._state === L.Map.TouchGesture.GRAPHIC) {
-   
this._map._docLayer._graphicMarker._onDragEnd(e.srcEvent);
+   this._map._docLayer._graphicMarker._onDragEnd(point);
} else if (this._state === L.Map.TouchGesture.CURSOR) {
this._map._docLayer._postMouseEvent('buttonup', 
mousePos.x, mousePos.y, 1, 1, 0);
} else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03b7d14e57ebf01b91b3b483455b5dd6a0f379f1
Author: Henry Castro 
AuthorDate: Sun Jun 30 16:06:14 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 16:39:28 2019 +0200

loleaflet: mobile: safari: disable scrolling and bounce effect

Change-Id: If00289febd753cbbcf38e197255644eb4ad216f3
Reviewed-on: https://gerrit.libreoffice.org/77834
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index cc81fc319..9398c9f81 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -57,7 +57,7 @@ L.Map.TouchGesture = L.Handler.extend({
}
 
L.DomEvent.on(this._map._mapPane, 'mousedown mousemove 
mouseup', L.DomEvent.preventDefault);
-   L.DomEvent.on(document, 'contextmenu', 
L.DomEvent.preventDefault);
+   L.DomEvent.on(document, 'contextmenu touchmove', 
L.DomEvent.preventDefault);
}
 
for (var events in L.Draggable.MOVE) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit e8e1516df128b489e421b196335a24d8c152200b
Author: Henry Castro 
AuthorDate: Sat Jun 29 10:07:48 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 16:36:54 2019 +0200

loleaflet: fix flickering when zoom in and out

Change-Id: Ib39e5fc8df06ec420f0c3ee78ce6616bb4eafda8
Reviewed-on: https://gerrit.libreoffice.org/77833
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index e5d954f5f..cc81fc319 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -323,7 +323,11 @@ L.Map.TouchGesture = L.Handler.extend({
if (this._map.getDocType() !== 'spreadsheet') {
this._center = this._map.mouseEventToLatLng({clientX: 
e.center.x, clientY: e.center.y});
this._zoom = this._map.getScaleZoom(e.scale);
-   this._map._animateZoom(this._center, this._zoom, false, 
true);
+
+   L.Util.cancelAnimFrame(this._animRequest);
+   this._animRequest = L.Util.requestAnimFrame(function () 
{
+   this._map._animateZoom(this._center, 
this._zoom, false, true);
+   }, this, true, this._map._container);
}
},
 
@@ -333,6 +337,7 @@ L.Map.TouchGesture = L.Handler.extend({
zoomDelta = this._zoom - oldZoom,
finalZoom = this._map._limitZoom(zoomDelta > 0 ? 
Math.ceil(this._zoom) : Math.floor(this._zoom));
 
+   L.Util.cancelAnimFrame(this._animRequest);
this._map._animateZoom(this._center, finalZoom, true, 
true);
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/control/Control.ContextMenu.js  |7 ++-
 loleaflet/src/control/Control.LokDialog.js|9 +
 loleaflet/src/map/handler/Map.TouchGesture.js |4 
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit b0b11b6e7a036b84e5271fa64c9b7ae8b55a8c93
Author: Henry Castro 
AuthorDate: Fri Jun 28 13:31:02 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 16:34:56 2019 +0200

loleaflet: mobile: ensure to close any popups in long press event

Change-Id: I64d438e3667a92f16d5bc39490ba31fdd83691fb
Reviewed-on: https://gerrit.libreoffice.org/77832
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index e418bfc2a..e5d954f5f 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -167,6 +167,8 @@ L.Map.TouchGesture = L.Handler.extend({
return;
}
 
+   this._map.fire('closepopups');
+
if (window.ThisIsTheiOSApp) {
// console.log('==> ' + e.timeStamp);
if (!this._toolbar._map && 
this._map._docLayer.containsSelection(latlng)) {
commit 4f0c62898cb9ac909a125b81f998bf515769bb5a
Author: Henry Castro 
AuthorDate: Mon Jun 17 14:30:08 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 16:34:40 2019 +0200

loeaflet: mobile: close popup dialog on tap event

Change-Id: Iad64295db4d9d135b4ce1f68bb62948e7be8e92e
Reviewed-on: https://gerrit.libreoffice.org/77831
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/control/Control.ContextMenu.js 
b/loleaflet/src/control/Control.ContextMenu.js
index 652971f8f..4d67b67c3 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -55,12 +55,17 @@ L.Control.ContextMenu = L.Control.extend({
map.on('locontextmenu', this._onContextMenu, this);
map.on('mousedown', this._onMouseDown, this);
map.on('keydown', this._onKeyDown, this);
+   map.on('closepopups', this._onClosePopup, this);
+   },
+
+   _onClosePopup: function () {
+   $.contextMenu('destroy', '.leaflet-layer');
},
 
_onMouseDown: function(e) {
this._prevMousePos = {x: e.originalEvent.pageX, y: 
e.originalEvent.pageY};
 
-   $.contextMenu('destroy', '.leaflet-layer');
+   this._onClosePopup();
},
 
_onKeyDown: function(e) {
diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 391f61490..f655a79c3 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -119,6 +119,7 @@ L.Control.LokDialog = L.Control.extend({
map.on('opendialog', this._openDialog, this);
map.on('docloaded', this._docLoaded, this);
map.on('closepopup', this.onCloseCurrentPopUp, this);
+   map.on('closepopups', this._onClosePopups, this);
map.on('editorgotfocus', this._onEditorGotFocus, this);
L.DomEvent.on(document, 'mouseup', this.onCloseCurrentPopUp, 
this);
},
@@ -618,6 +619,14 @@ L.Control.LokDialog = L.Control.extend({
removeZoomTarget(this._toStrId(dialogId));
},
 
+   _onClosePopups: function() {
+   for (var dialog in this._dialogs) {
+   if (this._dialogs[dialog].isSidebar != true) {
+   this._onDialogClose(this._dialogs[dialog].id, 
true);
+   }
+   }
+   },
+
onCloseCurrentPopUp: function() {
// for title-less dialog only (context menu, pop-up)
if (!this._currentId || !this._isOpen(this._currentId) || 
this._dialogs[this._currentId].title)
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 899cd6c2d..e418bfc2a 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -201,6 +201,8 @@ L.Map.TouchGesture = L.Handler.extend({
 
if (window.ThisIsTheiOSApp)
this._toolbar.remove();
+
+   this._map.fire('closepopups');
this._map._contextMenu._onMouseDown({originalEvent: 
e.srcEvent});
this._map._docLayer._postMouseEvent('buttondown', mousePos.x, 
mousePos.y, 1, 1, 0);
this._map._docLayer._postMouseEvent('buttonup', mousePos.x, 
mousePos.y, 1, 1, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 vcl/ios/iosinst.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit e84c42ee32d1a23729c65b534c4418e2043f706d
Author: Tor Lillqvist 
AuthorDate: Tue Aug 20 16:10:51 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 20 16:31:43 2019 +0200

tdf#126964: Set background colours to white in IosSalFrame::UpdateSettings()

Change-Id: I92110a7a501571d7fd707dc33502ff553f02ae5e
Reviewed-on: https://gerrit.libreoffice.org/77823
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 938fb1a4c199..7c87210fa022 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -122,6 +122,12 @@ public:
 aStyleSet.SetTabFont( aFont );
 aStyleSet.SetGroupFont( aFont );
 
+Color aBackgroundColor( 0xff, 0xff, 0xff );
+aStyleSet.BatchSetBackgrounds( aBackgroundColor, false );
+aStyleSet.SetMenuColor( aBackgroundColor );
+aStyleSet.SetMenuBarColor( aBackgroundColor );
+aStyleSet.SetDialogColor( aBackgroundColor );
+
 rSettings.SetStyleSettings( aStyleSet );
 }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e9f376132244efc2823293339dd86817f467067b
Author: Henry Castro 
AuthorDate: Fri Jun 28 13:22:49 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 16:18:51 2019 +0200

loleaflet: mobile: avoid long press in graphic handler markers

Change-Id: I4d526beb0114fae3298906aaf1a774d8915bf6eb
Reviewed-on: https://gerrit.libreoffice.org/77830
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index db4f433aa..899cd6c2d 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -64,8 +64,6 @@ L.Map.TouchGesture = L.Handler.extend({
L.DomEvent.on(document, L.Draggable.END[events], 
this._onDocUp, this);
}
 
-   L.DomEvent.on(document, 'contextmenu', 
L.DomEvent.preventDefault);
-
/// $.contextMenu does not support touch events so,
/// attach 'touchend' menu clicks event handler
if (this._hammer.input instanceof Hammer.TouchInput) {
@@ -165,6 +163,10 @@ L.Map.TouchGesture = L.Handler.extend({
latlng = this._map.layerPointToLatLng(layerPoint),
mousePos = this._map._docLayer._latLngToTwips(latlng);
 
+   if (this._state === L.Map.TouchGesture.MARKER) {
+   return;
+   }
+
if (window.ThisIsTheiOSApp) {
// console.log('==> ' + e.timeStamp);
if (!this._toolbar._map && 
this._map._docLayer.containsSelection(latlng)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/layer/vector/Path.Transform.js  |   40 +++
 loleaflet/src/layer/vector/SVGGroup.js|   69 ++
 loleaflet/src/map/handler/Map.TouchGesture.js |   24 +++--
 3 files changed, 77 insertions(+), 56 deletions(-)

New commits:
commit fe6a955d7dd1fd369b4d4b887ffeea4b8aaff235
Author: Henry Castro 
AuthorDate: Fri Jun 28 11:50:37 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 10:09:21 2019 -0400

loleaflet: mobile: enable the option to scale and rotate graphics

Change-Id: I66e082ae7bf7551de90002164a87d2a267ea1523

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index ff5d61d61..db4f433aa 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -12,7 +12,8 @@ L.Map.TouchGesture = L.Handler.extend({
statics: {
MAP: 1,
CURSOR: 2,
-   GRAPHIC: 4
+   GRAPHIC: 4,
+   MARKER: 8
},
 
initialize: function (map) {
@@ -125,7 +126,13 @@ L.Map.TouchGesture = L.Handler.extend({
layerPoint = 
this._map.containerPointToLayerPoint(containerPoint),
latlng = this._map.layerPointToLatLng(layerPoint);
 
-   if (this._map._docLayer._graphicMarker && 
this._map._docLayer._graphicMarker.getBounds().contains(latlng)) {
+   if (this._map._docLayer._graphicMarker) {
+   this._marker = 
this._map._docLayer._graphicMarker.transform.getMarker(layerPoint);
+   }
+
+   if (this._marker) {
+   this._state = L.Map.TouchGesture.MARKER;
+   } else if (this._map._docLayer._graphicMarker && 
this._map._docLayer._graphicMarker.getBounds().contains(latlng)) {
this._state = L.Map.TouchGesture.GRAPHIC;
} else if (this._map._docLayer._cellCursor && 
this._map._docLayer._cellCursor.contains(latlng)) {
this._state = L.Map.TouchGesture.CURSOR;
@@ -136,6 +143,7 @@ L.Map.TouchGesture = L.Handler.extend({
 
if (e.isLast && this._state !== L.Map.TouchGesture.MAP) {
this._state = L.Map.TouchGesture.hitTest.MAP;
+   this._marker = undefined;
}
 
if ($(e.srcEvent.target).has(this._map._mapPane)) {
@@ -258,7 +266,9 @@ L.Map.TouchGesture = L.Handler.extend({
}
}
 
-   if (this._state === L.Map.TouchGesture.GRAPHIC) {
+   if (this._state === L.Map.TouchGesture.MARKER) {
+   this._map._fireDOMEvent(this._marker, e.srcEvent, 
'mousedown');
+   } else if (this._state === L.Map.TouchGesture.GRAPHIC) {

this._map._docLayer._graphicMarker._onDragStart(e.srcEvent);
} else if (this._state === L.Map.TouchGesture.CURSOR) {
this._map._docLayer._postMouseEvent('buttondown', 
mousePos.x, mousePos.y, 1, 1, 0);
@@ -274,7 +284,9 @@ L.Map.TouchGesture = L.Handler.extend({
latlng = this._map.layerPointToLatLng(layerPoint),
mousePos = this._map._docLayer._latLngToTwips(latlng);
 
-   if (this._state === L.Map.TouchGesture.GRAPHIC) {
+   if (this._state === L.Map.TouchGesture.MARKER) {
+   this._map._fireDOMEvent(this._map, e.srcEvent, 
'mousemove');
+   } else if (this._state === L.Map.TouchGesture.GRAPHIC) {
this._map._docLayer._graphicMarker._onDrag(e.srcEvent);
} else if (this._state === L.Map.TouchGesture.CURSOR) {
this._map._docLayer._postMouseEvent('move', mousePos.x, 
mousePos.y, 1, 1, 0);
@@ -290,7 +302,9 @@ L.Map.TouchGesture = L.Handler.extend({
latlng = this._map.layerPointToLatLng(layerPoint),
mousePos = this._map._docLayer._latLngToTwips(latlng);
 
-   if (this._state === L.Map.TouchGesture.GRAPHIC) {
+   if (this._state === L.Map.TouchGesture.MARKER) {
+   this._map._fireDOMEvent(this._map, e.srcEvent, 
'mouseup');
+   } else if (this._state === L.Map.TouchGesture.GRAPHIC) {

this._map._docLayer._graphicMarker._onDragEnd(e.srcEvent);
} else if (this._state === L.Map.TouchGesture.CURSOR) {
this._map._docLayer._postMouseEvent('buttonup', 
mousePos.x, mousePos.y, 1, 1, 0);
commit bd9da52e63ba13608341c2dd30ce670835a87843
Author: Henry Castro 
AuthorDate: Fri Jun 28 11:49:50 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 20 10:09:21 2019 -0400

loleaflet: mobile: prepare manual dragging for scale and rotate of gra

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

[Mike Kaganski (via logerrit)]

 xmloff/source/style/XMLFontAutoStylePool.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 3e52f67c49b5cde7661d0cca2ea72ff10d55a12c
Author: Mike Kaganski 
AuthorDate: Tue Aug 20 14:32:46 2019 +0200
Commit: Mike Kaganski 
CommitDate: Tue Aug 20 15:56:03 2019 +0200

Simplify iteration over XMLFontAutoStylePool_Impl

... which has begin() and end().

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

diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx 
b/xmloff/source/style/XMLFontAutoStylePool.cxx
index af44e28525d7..d8e9462f965c 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -394,16 +394,13 @@ void XMLFontAutoStylePool::exportXML()
 const SvXMLUnitConverter& rUnitConv = GetExport().GetMM100UnitConverter();
 
 std::map fontFilesMap; // our url to document url
-sal_uInt32 nCount = m_pFontAutoStylePool->size();
 
 std::unordered_set aUsedFontNames;
 if (m_bEmbedUsedOnly)
 aUsedFontNames = getUsedFontList();
 
-for (sal_uInt32 i = 0; i < nCount; i++)
+for (const auto& pEntry : *m_pFontAutoStylePool)
 {
-const XMLFontAutoStylePoolEntry_Impl* pEntry = 
(*m_pFontAutoStylePool)[i].get();
-
 GetExport().AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, 
pEntry->GetName());
 
 aAny <<= pEntry->GetFamilyName();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 svx/source/customshapes/EnhancedCustomShape2d.cxx |   16 
 svx/source/engine3d/helperhittest3d.cxx   |2 +-
 svx/source/form/filtnav.cxx   |2 +-
 svx/source/gallery2/galtheme.cxx  |2 +-
 svx/source/sdr/contact/objectcontact.cxx  |2 +-
 svx/source/sdr/contact/viewcontact.cxx|2 +-
 svx/source/styles/ColorSets.cxx   |2 +-
 svx/source/svdraw/svdlayer.cxx|2 +-
 svx/source/svdraw/svdobj.cxx  |2 +-
 svx/source/svdraw/svdxcgv.cxx |2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 008382650edf51d1561c7cdf8b1e0d43f0426c02
Author: Noel Grandin 
AuthorDate: Tue Aug 20 14:02:21 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 15:55:19 2019 +0200

loplugin:constvars in svx

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

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index c5b296941ebb..9ff539f43e16 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -2644,7 +2644,7 @@ static void CorrectCalloutArrows(
 {
 sal_uInt32 nLine = 0;
 
-for ( std::pair< SdrPathObj*, double >& rCandidate : vObjectList )
+for ( const std::pair< SdrPathObj*, double >& rCandidate : 
vObjectList )
 {
 SdrPathObj* pObj(rCandidate.first);
 
@@ -2671,7 +2671,7 @@ static void CorrectCalloutArrows(
 {
 sal_uInt32 nLine = 0;
 
-for ( std::pair< SdrPathObj*, double >& rCandidate : vObjectList )
+for ( const std::pair< SdrPathObj*, double >& rCandidate : 
vObjectList )
 {
 SdrPathObj* pObj(rCandidate.first);
 
@@ -2699,7 +2699,7 @@ static void CorrectCalloutArrows(
 {
 sal_uInt32 nLine = 0;
 
-for ( std::pair< SdrPathObj*, double >& rCandidate : vObjectList )
+for ( const std::pair< SdrPathObj*, double >& rCandidate : 
vObjectList )
 {
 SdrPathObj* pObj(rCandidate.first);
 
@@ -2842,7 +2842,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool 
bLineGeometryNeededOnly )
 // #i37011# remove invisible objects
 std::vector< std::pair< SdrPathObj*, double> > vNewList;
 
-for ( std::pair< SdrPathObj*, double >& rCandidate : vObjectList )
+for ( const std::pair< SdrPathObj*, double >& rCandidate : vObjectList 
)
 {
 SdrPathObj* pObj(rCandidate.first);
 const drawing::LineStyle 
eLineStyle(pObj->GetMergedItem(XATTR_LINESTYLE).GetValue());
@@ -2878,7 +2878,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool 
bLineGeometryNeededOnly )
 sal_Int32 nLineObjectCount(0);
 
 // correct some values and collect content data
-for ( std::pair< SdrPathObj*, double >& rCandidate : vObjectList )
+for ( const std::pair< SdrPathObj*, double >& rCandidate : 
vObjectList )
 {
 SdrPathObj* pObj(rCandidate.first);
 
@@ -2920,7 +2920,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool 
bLineGeometryNeededOnly )
 std::vector< std::pair< SdrPathObj*, double> > vTempList;
 vTempList.reserve(vObjectList.size());
 
-for ( std::pair< SdrPathObj*, double >& rCandidate : 
vObjectList )
+for ( const std::pair< SdrPathObj*, double >& rCandidate : 
vObjectList )
 {
 SdrPathObj* pObj(rCandidate.first);
 
@@ -2930,7 +2930,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool 
bLineGeometryNeededOnly )
 }
 }
 
-for ( std::pair< SdrPathObj*, double >& rCandidate : 
vObjectList )
+for ( const std::pair< SdrPathObj*, double >& rCandidate : 
vObjectList )
 {
 SdrPathObj* pObj(rCandidate.first);
 
@@ -2953,7 +2953,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool 
bLineGeometryNeededOnly )
 {
 pRet = new 
SdrObjGroup(mrSdrObjCustomShape.getSdrModelFromSdrObject());
 
-for ( std::pair< SdrPathObj*, double >& rCandidate : vObjectList )
+for ( const std::pair< SdrPathObj*, double >& rCandidate : 
vObjectList )
 {
 SdrPathObj* pObj(rCandidate.first);
 
diff --git a/svx/source/engine3d/helperhittest3d.cxx 
b/svx/source/engine3d/helperhittest3d.cxx
index 39b2ec2fe05a..7d644192a3ae 100644
--- a/svx/source/engine3d/helperhittest3d.cxx
+++ b/svx/source/engine3d/helperhittest3d.cxx
@@ -200,7 +200,7 @@ void getAllHit3DObjectsSortedFrontToBack(
 :

[Libreoffice-commits] core.git: solenv/gbuildtojson sot/source starmath/source stoc/source svl/source svtools/source

[Noel Grandin (via logerrit)]

 solenv/gbuildtojson/gbuildtojson.cxx|4 ++--
 sot/source/sdstor/ucbstorage.cxx|2 +-
 starmath/source/ElementsDockingWindow.cxx   |2 +-
 starmath/source/cursor.cxx  |4 ++--
 starmath/source/document.cxx|2 +-
 stoc/source/uriproc/UriReferenceFactory.cxx |2 +-
 svl/source/items/IndexedStyleSheets.cxx |2 +-
 svl/source/items/poolcach.cxx   |4 ++--
 svtools/source/brwbox/datwin.cxx|2 +-
 svtools/source/contnr/foldertree.cxx|2 +-
 svtools/source/control/ruler.cxx|4 ++--
 svtools/source/control/tabbar.cxx   |6 +++---
 svtools/source/control/valueset.cxx |4 ++--
 13 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 95dd183c41c52aa0ed9b5223ae7584f486103a78
Author: Noel Grandin 
AuthorDate: Tue Aug 20 14:02:06 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 15:35:37 2019 +0200

loplugin:constvars in solenv..svtools

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

diff --git a/solenv/gbuildtojson/gbuildtojson.cxx 
b/solenv/gbuildtojson/gbuildtojson.cxx
index 00bc6ee8abb8..8061b801cd76 100644
--- a/solenv/gbuildtojson/gbuildtojson.cxx
+++ b/solenv/gbuildtojson/gbuildtojson.cxx
@@ -41,7 +41,7 @@ int main(int argc, char** argv)
 }
 cout << "{";
 bool first(true);
-for(auto& varandfile : vartofile)
+for(const auto& varandfile : vartofile)
 {
 if(first)
 first =false;
@@ -57,7 +57,7 @@ int main(int argc, char** argv)
 filestream.close();
 (void)remove(varandfile.second.c_str());
 string escapedcontents;
-for(auto& c : contents.str())
+for(const auto& c : contents.str())
 {
 if(c=='\\')
 escapedcontents += "";
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 1b3bd3381e8a..96c593c1aea8 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2445,7 +2445,7 @@ bool UCBStorage::CopyStorageElement_Impl( 
UCBStorageElement_Impl const & rElemen
 UCBStorageElement_Impl* UCBStorage::FindElement_Impl( const OUString& rName ) 
const
 {
 DBG_ASSERT( !rName.isEmpty(), "Name is empty!" );
-for (auto& pElement : pImp->GetChildrenList())
+for (const auto& pElement : pImp->GetChildrenList())
 {
 if ( pElement->m_aName == rName && !pElement->m_bIsRemoved )
 return pElement.get();
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index bee538346307..daef8f190e2b 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -363,7 +363,7 @@ void 
SmElementsControl::LayoutOrPaintContents(vcl::RenderContext *pContext)
 boxX = nControlWidth / perLine;
 
 const SmElement* pCurrentElement = current();
-for (std::unique_ptr & i : maElementList)
+for (const std::unique_ptr & i : maElementList)
 {
 SmElement* element = i.get();
 if (element->isSeparator())
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index f7d127bd25e9..b6575b8655b3 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -129,7 +129,7 @@ void SmCursor::BuildGraph(){
 
 //Restore anchor and position pointers
 if(_anchor.IsValid() || _position.IsValid()){
-for(auto &pEntry : *mpGraph)
+for(const auto &pEntry : *mpGraph)
 {
 if(_anchor == pEntry->CaretPos)
 mpAnchor = pEntry.get();
@@ -152,7 +152,7 @@ void SmCursor::BuildGraph(){
 }
 
 bool SmCursor::SetCaretPosition(SmCaretPos pos){
-for(auto &pEntry : *mpGraph)
+for(const auto &pEntry : *mpGraph)
 {
 if(pEntry->CaretPos == pos)
 {
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index c3373f5968c9..bd0c67081f51 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -304,7 +304,7 @@ void SmDocShell::UpdateEditEngineDefaultFonts(const Color& 
aTextColor)
 aTable[1].nLang = maLinguOptions.nDefaultLanguage_CJK;
 aTable[2].nLang = maLinguOptions.nDefaultLanguage_CTL;
 
-for (FontDta & rFntDta : aTable)
+for (const FontDta & rFntDta : aTable)
 {
 LanguageType nLang = (LANGUAGE_NONE == rFntDta.nLang) ?
 rFntDta.nFallbackLang : rFntDta.nLang;
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx 
b/stoc/source/uriproc/UriReferenceFactory.cxx
index d27d617074a3..779bb36b627b 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -417,7 +417,7 @@ css::uno::Reference< css::uri::XUriReference > 
Factory::makeAbsolute(
 if (slash) {
 abs.append('/');
  

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

[Noel Grandin (via logerrit)]

 sdext/source/pdfimport/tree/drawtreevisiting.cxx   |2 -
 sdext/source/pdfimport/tree/genericelements.cxx|2 -
 sdext/source/pdfimport/tree/writertreevisiting.cxx |6 ++---
 sfx2/source/appl/appserv.cxx   |4 +--
 sfx2/source/appl/linkmgr2.cxx  |2 -
 sfx2/source/appl/newhelp.cxx   |4 +--
 sfx2/source/appl/workwin.cxx   |   10 -
 sfx2/source/bastyp/fltfnc.cxx  |   22 ++---
 sfx2/source/control/templatelocalview.cxx  |4 +--
 sfx2/source/dialog/dinfdlg.cxx |   10 -
 sfx2/source/doc/Metadatable.cxx|2 -
 sfx2/source/doc/doctemplates.cxx   |4 +--
 sfx2/source/doc/templatedlg.cxx|2 -
 sfx2/source/sidebar/Deck.cxx   |2 -
 sfx2/source/sidebar/ResourceManager.cxx|4 +--
 15 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit 8d54827762e2a6702a16b67724a6a5f393d72598
Author: Noel Grandin 
AuthorDate: Tue Aug 20 14:01:10 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 15:32:08 2019 +0200

loplugin:constvars in sdext..sfx2

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

diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx 
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 07e615f693b1..3985d07fdeb8 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -490,7 +490,7 @@ void DrawXmlOptimizer::visit( PageElement& elem, const 
std::list< std::unique_pt
 // adjust line height and text items
 fCurLineHeight = 0.0;
 nCurLineElements = 0;
-for( auto& rxChild : pCurPara->Children )
+for( const auto& rxChild : pCurPara->Children )
 {
 TextElement* pTestText = 
dynamic_cast(rxChild.get());
 if( pTestText )
diff --git a/sdext/source/pdfimport/tree/genericelements.cxx 
b/sdext/source/pdfimport/tree/genericelements.cxx
index 152366d6b4bf..c26f0f816222 100644
--- a/sdext/source/pdfimport/tree/genericelements.cxx
+++ b/sdext/source/pdfimport/tree/genericelements.cxx
@@ -375,7 +375,7 @@ void PageElement::resolveUnderlines( PDFIProcessor const & 
rProc )
 u_y = r_x; r_x = l_x; l_x = u_y;
 }
 u_y = aPoly.getB2DPoint(0).getY();
-for( auto& rxChild : Children )
+for( const auto& rxChild : Children )
 {
 Element* pEle = rxChild.get();
 if( pEle->y <= u_y && pEle->y + pEle->h*1.1 >= u_y )
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx 
b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index 1025d3fb74c0..4d089b3d3230 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -321,7 +321,7 @@ void WriterXmlEmitter::visit( DocumentElement& elem, const 
std::list< std::uniqu
 m_rEmitContext.rEmitter.beginTag( "office:body", PropertyMap() );
 m_rEmitContext.rEmitter.beginTag( "office:text", PropertyMap() );
 
-for( auto& rxChild : elem.Children )
+for( const auto& rxChild : elem.Children )
 {
 PageElement* pPage = dynamic_cast(rxChild.get());
 if( pPage )
@@ -505,7 +505,7 @@ void WriterXmlOptimizer::visit( PageElement& elem, const 
std::list< std::unique_
 // adjust line height and text items
 fCurLineHeight = 0.0;
 nCurLineElements = 0;
-for( auto& rxChild : pCurPara->Children )
+for( const auto& rxChild : pCurPara->Children )
 {
 TextElement* pTestText = 
dynamic_cast(rxChild.get());
 if( pTestText )
@@ -1085,7 +1085,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const 
std::list< std::unique_
 elem.RightMargin = 0;
 // first element should be a paragraph
 ParagraphElement* pFirstPara = nullptr;
-for( auto& rxChild : elem.Children )
+for( const auto& rxChild : elem.Children )
 {
 if( dynamic_cast( rxChild.get() ) )
 {
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index fc936519f8a5..423518605fee 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -925,13 +925,13 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 }
 
 // Show toolbars
-for ( OUString& rName : aMandatoryToolbars )
+for ( const OUString& rName : 
std::as_const(aMandatoryToolbars) )
 {
 xLayoutManager->createElement( rName );
 xLayoutManager->showElement( rName );
 }
 
-   

Reviewer for tdf#99497 CircleKind ARC, CUT, SECTION to OOXML arc, chord, pie

[Regina Henschel]

Hi all,

I'm looking for review for
https://gerrit.libreoffice.org/#/c/77785/

I think, it is correct. But you are the experts.

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

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

[Franklin Weng (via logerrit)]

 xmlsecurity/source/dialogs/certificatechooser.cxx |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 648990692c8253e3843c4c5954940e8b893d5f3e
Author: Franklin Weng 
AuthorDate: Sun Aug 18 21:30:05 2019 +0800
Commit: Katarina Behrens 
CommitDate: Tue Aug 20 15:14:48 2019 +0200

tdf#116862 do not encrypt to self when encryption key is not set

When "always encrypt to self" is checked but no encryption key is set,
encrypting a file with GPG key would cause error.  So check if
msPreferredKey is empty or not before comparing with sIssuer.

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

diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx 
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 32c688f2a257..795e9bf3ae07 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -220,13 +220,15 @@ void CertificateChooser::ImplInitialize()
 
 #if HAVE_FEATURE_GPGME
 // only GPG has preferred keys
-if ( sIssuer == msPreferredKey )
-{
-if ( meAction == UserAction::Sign || meAction == 
UserAction::SelectSign )
-m_xCertLB->select(nRow);
-else if ( meAction == UserAction::Encrypt &&
-  aUserOpts.GetEncryptToSelf() )
-mxEncryptToSelf = xCert;
+if ( !sIssuer.isEmpty() && !msPreferredKey.isEmpty() ) {
+if ( sIssuer == msPreferredKey )
+{
+if ( meAction == UserAction::Sign || meAction == 
UserAction::SelectSign )
+m_xCertLB->select(nRow);
+else if ( meAction == UserAction::Encrypt &&
+  aUserOpts.GetEncryptToSelf() )
+mxEncryptToSelf = xCert;
+}
 }
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About putting back Firebird experimental

[Alexander Thurgood]

Le 20/08/2019 à 10:28, Julien a écrit :

Hi Julien,

+1 from me.

As a QA triager, I can but agree with Julien given the current stage of
development. The migration code still fails to handle multiple, basic
elements of embedded hsqldb ODB files found in actual use. If it can't
even do the basics of migration properly, what hope do we have of
convincing users to switch ?

Forcing users to be the unwitting testers (as is currently perceived to
be the case - indeed, I saw such a recrimination in a migration bug
report I dealt with today) of such a system is bound to provoke at best
apathy or resignation, at worst anger, frustration and searching for
another tool that won't trash your data.


Clearly, the work required for the tender by TDF was underestimated. I
see this currently as a kind of unwanted offspring, neither here, nor
there, and certainly not fit for purpose, despite all of the very good
work put in.

Anyway, my 2c as usual.

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

Re: We'd like to continue the production of the 32-bit deb packages

[Stephan Bergmann]

On 16/08/2019 20:43, dreamn...@gmail.com wrote:
What we did if after a ‘make’ with errors, we had to ran ‘make 
build-nocheck’ to be able to bypass those errors on a Debian 10 schroot 
environment. This time, the required debs files were produced. However, 
when installing those debs and trying to run LibreOffice on Escuelas 
Linux (the main target distribution) it does not work, as it complains 
about a glibc mismatch version. So, it seems that the generated deb 
files are not distribution-independent as the ones that were previously 
released by The Document Foundation.


Note that producing builds that are compatible with our baseline (as 
spelled out in README.md) is a non-trivial endeavour.  You typically do 
such builds on a baseline machine to make sure you do not link against 
functionality in e.g. libc.so.6 that is only available in newer versions 
of that library.  However, a baseline machine typically has a C++ 
compiler that is too old for our needs, so you need a newer compiler but 
which generates code that only links against functionality that is 
already available in the baseline libstdc++.so.6 (e.g., by using Red Hat 
Developer Toolset).

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

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann (via logerrit)]

 odk/settings/platform.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit af7ce81494df6c1f23af1ee14adf4aa55132b5bb
Author: Stephan Bergmann 
AuthorDate: Tue Aug 20 13:15:03 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 20 14:19:27 2019 +0200

Fix EXTENSION_PLATFORM for Windows x86_64

Change-Id: I7fbe1963aff666205dbc9405e94d6093fb9a5a48
Reviewed-on: https://gerrit.libreoffice.org/77804
Reviewed-by: Vasily Melenchuk 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/odk/settings/platform.mk b/odk/settings/platform.mk
index 7e3b86c62a2c..6980a72715d0 100644
--- a/odk/settings/platform.mk
+++ b/odk/settings/platform.mk
@@ -54,7 +54,11 @@ else
 EXTENSION_PLATFORM=solaris_x86
 else
 ifeq "$(UNOPKG_PLATFORM)" "Windows"
-EXTENSION_PLATFORM=windows_x86
+ifeq "$(PROCTYPE)" "x86_64"
+EXTENSION_PLATFORM=windows_x86_64
+else
+EXTENSION_PLATFORM=windows_x86
+endif
 endif
 endif
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung (via logerrit)]

 sw/source/core/text/itrform2.cxx |   26 --
 sw/source/core/text/itrform2.hxx |2 +-
 2 files changed, 9 insertions(+), 19 deletions(-)

New commits:
commit 56e95f8e20b20680d025f3ecbeb4cc5306085b1e
Author: Mark Hung 
AuthorDate: Sat Aug 10 13:28:45 2019 +0800
Commit: Mark Hung 
CommitDate: Tue Aug 20 14:16:55 2019 +0200

tdf#126353 merge character borders on layout portions.

Layout portions / para portions may have portion length.
So merging them is valid and there's no need to check
them at all. Invoke MergeCharacterBorder in InsertPortion
to handle border merging consistently.

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

diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 8047c2565906..72d3363e800b 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -298,14 +298,16 @@ SwLinePortion *SwTextFormatter::Underflow( 
SwTextFormatInfo &rInf )
 }
 
 void SwTextFormatter::InsertPortion( SwTextFormatInfo &rInf,
-SwLinePortion *pPor ) const
+SwLinePortion *pPor )
 {
+SwLinePortion *pLast = nullptr;
 // The new portion is inserted, but everything's different for
 // LineLayout...
 if( pPor == m_pCurr )
 {
 if ( m_pCurr->GetNextPortion() )
 {
+pLast = pPor;
 pPor = m_pCurr->GetNextPortion();
 }
 
@@ -315,7 +317,7 @@ void SwTextFormatter::InsertPortion( SwTextFormatInfo &rInf,
 }
 else
 {
-SwLinePortion *pLast = rInf.GetLast();
+pLast = rInf.GetLast();
 if( pLast->GetNextPortion() )
 {
 while( pLast->GetNextPortion() )
@@ -337,8 +339,12 @@ void SwTextFormatter::InsertPortion( SwTextFormatInfo 
&rInf,
 rInf.SetLast( pPor );
 while( pPor )
 {
+if (!pPor->IsDropPortion())
+MergeCharacterBorder(*pPor, pLast, rInf);
+
 pPor->Move( rInf );
 rInf.SetLast( pPor );
+pLast = pPor;
 pPor = pPor->GetNextPortion();
 }
 }
@@ -479,7 +485,6 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo &rInf 
)
 new SwKernPortion( *rInf.GetLast(), nLstHeight,
pLast->InFieldGrp() && 
pPor->InFieldGrp() );
 rInf.GetLast()->SetNextPortion( nullptr );
-MergeCharacterBorder(*pKrn, 
rInf.GetLast()->FindLastPortion(), rInf);
 InsertPortion( rInf, pKrn );
 }
 }
@@ -523,11 +528,7 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo 
&rInf )
 }
 
 if ( pGridKernPortion != pPor )
-{
-SwLinePortion *pLast = rInf.GetLast()? 
rInf.GetLast()->FindLastPortion():nullptr ;
-MergeCharacterBorder(*pGridKernPortion, pLast , rInf);
 InsertPortion( rInf, pGridKernPortion );
-}
 }
 
 if( pPor->IsDropPortion() )
@@ -688,17 +689,6 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo 
&rInf )
 
 rInf.SetFull( bFull );
 
-if( !pPor->IsDropPortion() )
-{
-SwLinePortion *pPrev = rInf.GetLast() ? 
rInf.GetLast()->FindLastPortion() : nullptr;
-for ( SwLinePortion *pNext = pPor ; pNext!= nullptr ; 
pNext=pNext->GetNextPortion())
-{
-if ( !pNext->IsParaPortion() )
-MergeCharacterBorder(*pNext, pPrev, rInf);
-pPrev = pNext ;
-}
-}
-
 // Restportions from fields with multiple lines don't yet have the 
right ascent
 if ( !pPor->GetLen() && !pPor->IsFlyPortion()
 && !pPor->IsGrfNumPortion() && ! pPor->InNumberGrp()
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index 64fc52e80cd6..ff9af549ccd7 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -129,7 +129,7 @@ class SwTextFormatter : public SwTextPainter
 bool ChkFlyUnderflow( SwTextFormatInfo &rInf ) const;
 
 // Insert portion
-void InsertPortion( SwTextFormatInfo &rInf, SwLinePortion *pPor ) const;
+void InsertPortion( SwTextFormatInfo &rInf, SwLinePortion *pPor );
 
 // Guess height for the DropPortion
 void GuessDropHeight( const sal_uInt16 nLines );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 package/source/xstor/xstorage.cxx  |   16 
 sax/source/tools/fastattribs.cxx   |2 +-
 sc/qa/unit/ucalc_formula.cxx   |6 +++---
 sc/source/core/data/bcaslot.cxx|2 +-
 sc/source/core/data/documen3.cxx   |2 +-
 sc/source/core/data/documen7.cxx   |2 +-
 sc/source/core/data/documen8.cxx   |2 +-
 sc/source/core/data/document10.cxx |2 +-
 sc/source/core/data/formulacell.cxx|2 +-
 sc/source/core/data/table2.cxx |4 ++--
 sc/source/core/data/table3.cxx |2 +-
 sc/source/core/opencl/op_math.cxx  |2 +-
 sc/source/core/opencl/op_statistical.cxx   |4 ++--
 sc/source/core/tool/chgtrack.cxx   |2 +-
 sc/source/core/tool/dbdata.cxx |2 +-
 sc/source/core/tool/jumpmatrix.cxx |2 +-
 sc/source/core/tool/parclass.cxx   |2 +-
 sc/source/core/tool/rangelst.cxx   |   10 +-
 sc/source/filter/excel/xestyle.cxx |6 +++---
 sc/source/filter/html/htmlpars.cxx |2 +-
 sc/source/filter/oox/condformatbuffer.cxx  |4 ++--
 sc/source/filter/oox/formulaparser.cxx |2 +-
 sc/source/filter/rtf/eeimpars.cxx  |4 ++--
 sc/source/filter/rtf/rtfparse.cxx  |2 +-
 sc/source/filter/xml/xmlexprt.cxx  |2 +-
 sc/source/ui/dataprovider/csvdataprovider.cxx  |2 +-
 sc/source/ui/dbgui/PivotLayoutTreeList.cxx |2 +-
 sc/source/ui/dbgui/PivotLayoutTreeListData.cxx |2 +-
 sc/source/ui/miscdlgs/conflictsdlg.cxx |6 +++---
 sc/source/ui/miscdlgs/dataproviderdlg.cxx  |   20 ++--
 sc/source/ui/undo/undocell.cxx |6 +++---
 sc/source/ui/unoobj/cellsuno.cxx   |2 +-
 sc/source/ui/unoobj/chart2uno.cxx  |2 +-
 sc/source/ui/unoobj/dapiuno.cxx|2 +-
 sc/source/ui/unoobj/unoreflist.cxx |2 +-
 sc/source/ui/vba/vbafiledialog.cxx |3 ++-
 sc/source/ui/view/viewfunc.cxx |2 +-
 37 files changed, 70 insertions(+), 69 deletions(-)

New commits:
commit 316b07d0af06948c69c1375c67c01903b8eeb134
Author: Noel Grandin 
AuthorDate: Tue Aug 20 11:15:17 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 13:59:25 2019 +0200

loplugin:constvars in package..sc

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

diff --git a/package/source/xstor/xstorage.cxx 
b/package/source/xstor/xstorage.cxx
index fb5ad128dd41..16ae4a9331e0 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -322,7 +322,7 @@ OStorage_Impl::~OStorage_Impl()
 m_pParent = nullptr;
 }
 
-for (auto & pair : m_aChildrenMap)
+for (const auto & pair : m_aChildrenMap)
 for (auto pElement : pair.second)
 delete pElement;
 m_aChildrenMap.clear();
@@ -654,7 +654,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< 
embed::XStorage >& xDes
 if ( !m_xPackageFolder.is() )
 throw embed::InvalidStorageException( THROW_WHERE );
 
-for ( auto& pair : m_aChildrenMap )
+for ( const auto& pair : m_aChildrenMap )
 for (auto pElement : pair.second)
 {
 if ( !pElement->m_bIsRemoved )
@@ -1054,7 +1054,7 @@ void OStorage_Impl::Commit()
 
 
 // there should be no more deleted elements
-for ( auto& pair : m_aChildrenMap )
+for ( const auto& pair : m_aChildrenMap )
 for (auto pElement : pair.second)
 {
 // if it is a 'duplicate commit' inserted elements must be really 
inserted to package later
@@ -1127,7 +1127,7 @@ void OStorage_Impl::Commit()
 }
 }
 
-for ( auto& pair : m_aChildrenMap )
+for ( const auto& pair : m_aChildrenMap )
 for (auto pElement : pair.second)
 {
 // now inserted elements can be inserted to the package
@@ -1228,7 +1228,7 @@ void OStorage_Impl::Revert()
 std::unordered_map> oldMap;
 std::swap(oldMap, m_aChildrenMap);
 
-for (auto & rPair : oldMap)
+for (const auto & rPair : oldMap)
 for (auto pElement : rPair.second)
 {
 if ( pElement->m_bIsInserted )
@@ -1855,7 +1855,7 @@ void OStorage::InternalDispose( bool bNotifyImpl )
 // deregister m_pData->m_pSubElDispListener and dispose all of them
 if ( !m_pData->m_aOpenSubComponentsVector.empty() )
 {
-for ( auto& pComp : m_pData->m_aOpenSubComponentsVector )
+for ( const auto& pComp : m_pData->m_aOpenSubComponentsVector )
 {
 uno::Reference< lang::XComponent > xTmp = pComp;
 if ( xTmp.is() )

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - framework/inc framework/Library_fwk.mk framework/source

[Noel Grandin (via logerrit)]

 framework/Library_fwk.mk   |1 
 framework/inc/helper/statusindicatorfactory.hxx|7 --
 framework/inc/helper/wakeupthread.hxx  |   57 +++
 framework/source/helper/statusindicatorfactory.cxx |   25 
 framework/source/helper/wakeupthread.cxx   |   60 +
 5 files changed, 132 insertions(+), 18 deletions(-)

New commits:
commit ff3cfee4ebfcb412f54f17ffccc95512fdc15c8e
Author: Noel Grandin 
AuthorDate: Tue Aug 20 10:14:19 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Aug 20 13:42:22 2019 +0200

tdf#125869 LibreOffice UI freezes (shows not responding) while exporting a 
pdf

Revert "use vcl::Timer in StatusIndicatorFactory"
This reverts commit 848058625c7fad21e2469c95c2a2078678925a5a,
which seems to have been a bad idea

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

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 3957a5ace0ff..9057aaa6048a 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/helper/uiconfigelementwrapperbase \
 framework/source/helper/uielementwrapperbase \
 framework/source/helper/vclstatusindicator \
+framework/source/helper/wakeupthread \
 framework/source/interaction/quietinteraction \
 framework/source/jobs/job \
 framework/source/jobs/jobdata \
diff --git a/framework/inc/helper/statusindicatorfactory.hxx 
b/framework/inc/helper/statusindicatorfactory.hxx
index 1ad060516313..d343fe35395e 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -25,6 +25,7 @@
 #include 
 
 // include files of own module
+#include 
 #include 
 
 // include uno interfaces
@@ -44,9 +45,7 @@
 #include 
 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 
@@ -166,7 +165,7 @@ class StatusIndicatorFactory : public  
::cppu::WeakImplHelper<
 
 /** Notify us if a fix time is over. We use it to implement an
 intelligent "Reschedule" ... */
-boost::optional m_xWakeUpTimer;
+rtl::Reference m_pWakeUp;
 
 /** Our WakeUpThread calls us in our interface method 
"XUpdatable::update().
 There we set this member m_bAllowReschedule to sal_True. Next time 
if our impl_reschedule()
@@ -183,8 +182,6 @@ class StatusIndicatorFactory : public  
::cppu::WeakImplHelper<
 /** prevent recursive calling of Application::Reschedule(). */
 static sal_Int32 m_nInReschedule;
 
-DECL_LINK( WakeupTimerHdl, Timer*, void );
-
 // interface
 
 public:
diff --git a/framework/inc/helper/wakeupthread.hxx 
b/framework/inc/helper/wakeupthread.hxx
new file mode 100644
index ..50e234f23713
--- /dev/null
+++ b/framework/inc/helper/wakeupthread.hxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+namespace com { namespace sun { namespace star { namespace util {
+class XUpdatable;
+} } } }
+
+namespace framework{
+
+class WakeUpThread: public salhelper::Thread {
+css::uno::WeakReference updatable_;
+osl::Condition condition_;
+
+osl::Mutex mutex_;
+bool terminate_;
+
+void execute() override;
+
+public:
+WakeUpThread(css::uno::Reference const & updatable);
+
+void stop();
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/statusindicatorfactory.cxx 
b/framework/source/helper/statusindicatorfactory.cxx
index ee33a646cadd..5e4ba3adf4e3 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -537,27 +537,26 @@ void StatusIndicatorFactory::impl_startWakeUpThread()
 if

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

[Tamás Zolnai (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit d1477ca9851bcee527c8c50f8a839bec7e050938
Author: Tamás Zolnai 
AuthorDate: Tue Aug 20 12:44:57 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Aug 20 13:38:39 2019 +0200

Dialogs: controls without cursor should not pop-up keyboard

when selected on mobile.

Change-Id: Iee34ad4a878bacea1e11e754b41bf86734796b27
Reviewed-on: https://gerrit.libreoffice.org/77803
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 3c29f3437..391f61490 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -361,7 +361,10 @@ L.Control.LokDialog = L.Control.extend({
if (!this._isOpen(dlgId) || !this._dialogs[dlgId].input)
return;
 
-   this._dialogs[dlgId].input.focus();
+   if (this._dialogs[dlgId].cursorVisible)
+   this._dialogs[dlgId].input.focus();
+   else
+   this._dialogs[dlgId].input.blur();
},
 
_setCanvasWidthHeight: function(canvas, width, height) {
@@ -474,7 +477,7 @@ L.Control.LokDialog = L.Control.extend({
// 'mousedown' -> 'buttondown'
var lokEventType = e.type.replace('mouse', 'button');
this._postWindowMouseEvent(lokEventType, id, e.offsetX, 
e.offsetY, 1, buttons, 0);
-   dlgInput.focus();
+   this.focus(id);
}, this);
L.DomEvent.on(dlgInput,
  'keyup keypress keydown compositionstart 
compositionupdate compositionend textInput',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sccomp/source scripting/source sd/qa sd/source

[Noel Grandin (via logerrit)]

 sccomp/source/solver/SwarmSolver.cxx  |4 +--
 scripting/source/provider/BrowseNodeFactoryImpl.cxx   |2 -
 scripting/source/provider/MasterScriptProvider.cxx|3 +-
 scripting/source/stringresource/stringresource.cxx|6 ++---
 sd/qa/unit/tiledrendering/tiledrendering.cxx  |2 -
 sd/source/core/CustomAnimationEffect.cxx  |2 -
 sd/source/core/EffectMigration.cxx|4 +--
 sd/source/core/sdpage2.cxx|4 +--
 sd/source/filter/eppt/eppt.cxx|4 +--
 sd/source/filter/html/buttonset.cxx   |2 -
 sd/source/filter/pdf/sdpdffilter.cxx  |2 -
 sd/source/ui/animations/CustomAnimationDialog.cxx |4 +--
 sd/source/ui/animations/CustomAnimationList.cxx   |2 -
 sd/source/ui/animations/CustomAnimationPane.cxx   |   12 +-
 sd/source/ui/dlg/BulletAndPositionDlg.cxx |2 -
 sd/source/ui/dlg/tpaction.cxx |2 -
 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx |2 -
 sd/source/ui/func/unmovss.cxx |4 +--
 sd/source/ui/presenter/PresenterTextView.cxx  |2 -
 sd/source/ui/sidebar/MasterPageContainer.cxx  |4 +--
 sd/source/ui/sidebar/MasterPageObserver.cxx   |6 ++---
 sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx  |2 -
 sd/source/ui/slidesorter/controller/SlsFocusManager.cxx   |2 -
 sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx   |2 -
 sd/source/ui/tools/EventMultiplexer.cxx   |2 -
 sd/source/ui/view/ToolBarManager.cxx  |6 ++---
 sd/source/ui/view/ViewTabBar.cxx  |2 -
 sd/source/ui/view/sdview3.cxx |2 -
 28 files changed, 47 insertions(+), 46 deletions(-)

New commits:
commit ff6e8c73adef7c86db12287948025954a4fc7746
Author: Noel Grandin 
AuthorDate: Tue Aug 20 11:16:20 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 13:05:02 2019 +0200

loplugin:constvars in sccomp..sd

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

diff --git a/sccomp/source/solver/SwarmSolver.cxx 
b/sccomp/source/solver/SwarmSolver.cxx
index 25bccc57970b..6652127dc9b2 100644
--- a/sccomp/source/solver/SwarmSolver.cxx
+++ b/sccomp/source/solver/SwarmSolver.cxx
@@ -400,7 +400,7 @@ size_t SwarmSolver::getDimensionality() { return 
maVariables.getLength(); }
 
 bool SwarmSolver::doesViolateConstraints()
 {
-for (sheet::SolverConstraint& rConstraint : maNonBoundedConstraints)
+for (const sheet::SolverConstraint& rConstraint : maNonBoundedConstraints)
 {
 double fLeftValue = getValue(rConstraint.Left);
 double fRightValue = 0.0;
@@ -520,7 +520,7 @@ void SAL_CALL SwarmSolver::solve()
 
 size_t index = 0;
 bool bFoundVariable = false;
-for (table::CellAddress& rVariableCell : maVariables)
+for (const table::CellAddress& rVariableCell : 
std::as_const(maVariables))
 {
 if (aLeftCellAddress == rVariableCell)
 {
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx 
b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 92ce1be6c273..83d3cbec80aa 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -190,7 +190,7 @@ public:
 Sequence<  Reference< browse::XBrowseNode > > children( m_hBNA->size() 
);
 sal_Int32 index = 0;
 
-for ( auto& str : m_vStr )
+for ( const auto& str : m_vStr )
 {
 children[ index ].set( m_hBNA->find( str )->second );
 ++index;
diff --git a/scripting/source/provider/MasterScriptProvider.cxx 
b/scripting/source/provider/MasterScriptProvider.cxx
index 8fb19dc8ac09..7a5475541179 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -456,7 +456,8 @@ template  bool 
FindProviderAndApply(ProviderCache& rCache, Proc p
 auto pass = [&rCache, &p]() -> bool
 {
 bool bResult = false;
-for (auto& rProv : rCache.getAllProviders())
+const Sequence> aAllProviders = 
rCache.getAllProviders();
+for (const auto& rProv : aAllProviders)
 {
 Reference xCont(rProv, UNO_QUERY);
 if (!xCont.is())
diff --git a/scripting/source/stringresource/stringresource.cxx 
b/scripting/source/stringresource/stringresource.cxx
index b74f76c23906..2da2fe5be1e1 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scrip

[Libreoffice-commits] core.git: drawinglayer/source editeng/source extensions/source filter/source framework/source

[Noel Grandin (via logerrit)]

 drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx   |2 +-
 drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx   |2 +-
 editeng/source/editeng/impedit2.cxx   |4 ++--
 editeng/source/editeng/impedit4.cxx   |2 +-
 editeng/source/items/legacyitem.cxx   |2 +-
 extensions/source/bibliography/datman.cxx |3 ++-
 extensions/source/propctrlr/formcomponenthandler.cxx  |4 ++--
 filter/source/graphicfilter/icgm/chart.cxx|2 +-
 filter/source/msfilter/svdfppt.cxx|6 +++---
 filter/source/svg/svgexport.cxx   |8 

 filter/source/svg/svgfilter.cxx   |2 +-
 framework/source/jobs/jobdispatch.cxx |2 +-
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |4 ++--
 framework/source/uiconfiguration/uiconfigurationmanager.cxx   |6 +++---
 14 files changed, 25 insertions(+), 24 deletions(-)

New commits:
commit b2423a480785db6f4883d6314690b22b69d55c22
Author: Noel Grandin 
AuthorDate: Tue Aug 20 09:31:26 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 12:40:57 2019 +0200

loplugin:constvars in drawinglayer..framework

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

diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx 
b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index f27a8cfe4f62..0289a3788ee1 100644
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
@@ -185,7 +185,7 @@ namespace drawinglayer
 
a2DUnitLine.append(basegfx::B2DPoint(0.0, 0.0));
 
a2DUnitLine.append(basegfx::B2DPoint(1.0, 0.0));
 
-for(basegfx::B2DHomMatrix & 
rMatrix : aMatrices)
+for(const basegfx::B2DHomMatrix & 
rMatrix : aMatrices)
 {
 basegfx::B2DPolygon 
aNewLine(a2DUnitLine);
 aNewLine.transform(rMatrix);
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx 
b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
index cbcbfda8b649..c54976a998cb 100644
--- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
@@ -49,7 +49,7 @@ namespace drawinglayer
 {
 basegfx::B3DRange aRetval;
 
-for(basegfx::B3DPolyPolygon & a : rFill)
+for(const basegfx::B3DPolyPolygon & a : rFill)
 {
 aRetval.expand(basegfx::utils::getRange(a));
 }
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index b81fa54d3e18..b66c4fa7638f 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1720,7 +1720,7 @@ void ImpEditEngine::InitScriptTypes( sal_Int32 nPara )
 
 // i89825: Use CTL font for numbers embedded into an RTL run:
 WritingDirectionInfos& rDirInfos = 
pParaPortion->aWritingDirectionInfos;
-for (WritingDirectionInfo & rDirInfo : rDirInfos)
+for (const WritingDirectionInfo & rDirInfo : rDirInfos)
 {
 const sal_Int32 nStart = rDirInfo.nStartPos;
 const sal_Int32 nEnd   = rDirInfo.nEndPos;
@@ -3371,7 +3371,7 @@ void ImpEditEngine::UpdateSelections()
 {
 EditSelection aCurSel( pView->pImpEditView->GetEditSelection() );
 bool bChanged = false;
-for (std::unique_ptr & aDeletedNode : aDeletedNodes)
+for (const std::unique_ptr & aDeletedNode : 
aDeletedNodes)
 {
 const DeletedNodeInfo& rInf = *aDeletedNode;
 if ( ( aCurSel.Min().GetNode() == rInf.GetNode() ) ||
diff --git a/editeng/source/editeng/impedit4.cxx 
b/editeng/source/editeng/impedit4.cxx
index e254ca4c7ad8..367eb250f0a3 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2894,7 +2894,7 @@ EditSelection ImpEditEngine::TransliterateText( const 
EditSelection& rSelection,
 if ( !pUndo && IsUndoEnabled() && !IsInUndo() )
 {
 // adjust selection to include all changes
-for (eeTransliterationChgData & aChange : aChanges)
+for (const eeTransliterationChgData & aChange : aChanges)
 {
 const EditSelection &rSel = aChange.aSelection;
 if (aSel.Min().Get

[Libreoffice-commits] core.git: i18npool/source libreofficekit/qa libreofficekit/source linguistic/source oox/source opencl/inc opencl/source

[Noel Grandin (via logerrit)]

 i18npool/source/breakiterator/breakiteratorImpl.cxx |4 
+--
 i18npool/source/breakiterator/xdictionary.cxx   |4 
+--
 i18npool/source/characterclassification/characterclassificationImpl.cxx |2 
-
 i18npool/source/collator/collatorImpl.cxx   |2 
-
 i18npool/source/inputchecker/inputsequencechecker.cxx   |2 
-
 i18npool/source/localedata/localedata.cxx   |4 
+--
 libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx|2 
-
 libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx   |2 
-
 libreofficekit/source/gtk/lokdocview.cxx|   12 
+-
 linguistic/source/dicimp.cxx|2 
-
 linguistic/source/dlistimp.cxx  |2 
-
 oox/source/drawingml/diagram/diagram.cxx|2 
-
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |8 
+++---
 oox/source/drawingml/shape.cxx  |2 
-
 oox/source/vml/vmldrawing.cxx   |2 
-
 opencl/inc/opencl_device_selection.h|2 
-
 opencl/source/opencl_device.cxx |2 
-
 17 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 07f9223daae92ac11be2382ecd0095e744f5695f
Author: Noel Grandin 
AuthorDate: Tue Aug 20 09:32:35 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 12:04:41 2019 +0200

loplugin:constvars in i18npool..opencl

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

diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx 
b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index bc52262b1d08..21cdfce9c499 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -531,7 +531,7 @@ sal_Int16  BreakIteratorImpl::getScriptClass(sal_uInt32 
currentChar)
 bool BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& 
aLocaleName)
 {
 // to share service between same Language but different Country code, like 
zh_CN and zh_TW
-for (lookupTableItem& listItem : lookupTable) {
+for (const lookupTableItem& listItem : lookupTable) {
 if (aLocaleName == listItem.aLocale.Language) {
 xBI = listItem.xBI;
 return true;
@@ -576,7 +576,7 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const 
Locale& rLocale)
 else if (m_xContext.is()) {
 aLocale = rLocale;
 
-for (lookupTableItem& listItem : lookupTable) {
+for (const lookupTableItem& listItem : lookupTable) {
 if (rLocale == listItem.aLocale)
 return xBI = listItem.xBI;
 }
diff --git a/i18npool/source/breakiterator/xdictionary.cxx 
b/i18npool/source/breakiterator/xdictionary.cxx
index c905f67d4685..f21e377c68c0 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -127,7 +127,7 @@ xdictionary::xdictionary(const sal_Char *lang) :
 
 xdictionary::~xdictionary()
 {
-for (WordBreakCache & i : cache) {
+for (const WordBreakCache & i : cache) {
 if (i.size > 0) {
 delete [] i.contents;
 delete [] i.wordboundary;
@@ -151,7 +151,7 @@ void xdictionary::initDictionaryData(const sal_Char *pLang)
 static std::vector< datacache > aLoadedCache;
 
 osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
-for(datacache & i : aLoadedCache)
+for(const datacache & i : aLoadedCache)
 {
 if( i.maLang != pLang )
 {
diff --git 
a/i18npool/source/characterclassification/characterclassificationImpl.cxx 
b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index f66a4b26085d..721c82bf9304 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -155,7 +155,7 @@ 
CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca
 if (cachedItem && cachedItem->equals(rLocale))
 return cachedItem->xCI;
 else {
-for (auto & i : lookupTable) {
+for (const auto & i : lookupTable) {
 cachedItem = i.get();
 if (cachedItem->equals(rLocale))
 return cachedItem->xCI;
diff --git a/i18npool/source/collator/collatorImpl.cxx 
b/i18npool/source/collator/collatorImpl.cxx
index f072adbb192a..155b271b1b46 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -164,7 +164,7 @@ CollatorImpl::createCollator(const lang::Locale&

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

[Noel Grandin (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   35 ++-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 +
 writerfilter/source/dmapper/PropertyMap.cxx   |   65 ++
 writerfilter/source/dmapper/PropertyMap.hxx   |7 --
 4 files changed, 55 insertions(+), 57 deletions(-)

New commits:
commit 6fea13e7a10272922ffdf74b65add10ecf8cec38
Author: Noel Grandin 
AuthorDate: Mon Aug 19 15:43:31 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 12:02:55 2019 +0200

tdf#76260 cache next page style number

to speed up loading document with lots of footnotes.
Takes the load time from 29s to 27.3s for me

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7df87958becf..f69073781964 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -303,15 +303,41 @@ DomainMapper_Impl::~DomainMapper_Impl()
 
 uno::Reference< container::XNameContainer > const &  
DomainMapper_Impl::GetPageStyles()
 {
-if(!m_xPageStyles.is())
+if(!m_xPageStyles1.is())
 {
 uno::Reference< style::XStyleFamiliesSupplier > xSupplier( 
m_xTextDocument, uno::UNO_QUERY );
 if (xSupplier.is())
-xSupplier->getStyleFamilies()->getByName("PageStyles") >>= 
m_xPageStyles;
+xSupplier->getStyleFamilies()->getByName("PageStyles") >>= 
m_xPageStyles1;
 }
-return m_xPageStyles;
+return m_xPageStyles1;
 }
 
+OUString DomainMapper_Impl::GetUnusedPageStyleName()
+{
+static const char DEFAULT_STYLE[] = "Converted";
+if (!m_xNextUnusedPageStyleNo)
+{
+const uno::Sequence< OUString > aPageStyleNames = 
GetPageStyles()->getElementNames();
+sal_Int32 nMaxIndex   = 0;
+// find the highest number x in each style with the name 
"DEFAULT_STYLE+x" and
+// return an incremented name
+
+for ( const auto& rStyleName : aPageStyleNames )
+{
+if ( rStyleName.startsWith( DEFAULT_STYLE ) )
+{
+sal_Int32 nIndex = rStyleName.copy( strlen( DEFAULT_STYLE ) 
).toInt32();
+if ( nIndex > nMaxIndex )
+nMaxIndex = nIndex;
+}
+}
+m_xNextUnusedPageStyleNo = nMaxIndex + 1;
+}
+
+OUString sPageStyleName = DEFAULT_STYLE + OUString::number( 
*m_xNextUnusedPageStyleNo );
+*m_xNextUnusedPageStyleNo = *m_xNextUnusedPageStyleNo + 1;
+return sPageStyleName;
+}
 
 uno::Reference< text::XText > const & DomainMapper_Impl::GetBodyText()
 {
@@ -1942,8 +1968,7 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool 
bHeader, SectionPropertyMap::P
 
 uno::Reference< beans::XPropertySet > xPageStyle =
 pSectionContext->GetPageStyle(
-GetPageStyles(),
-m_xTextFactory,
+*this,
 eType == SectionPropertyMap::PAGE_FIRST );
 if (!xPageStyle.is())
 return;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 0d2e5cd17f83..c027faea1d60 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -411,7 +411,9 @@ private:
 css::uno::Reference m_xDocumentSettings;
 css::uno::Reference m_xTextFactory;
 css::uno::Reference m_xComponentContext;
-css::uno::Reference m_xPageStyles;
+css::uno::Reference m_xPageStyles1;
+// cache next available number, expensive to repeatedly compute
+boost::optional m_xNextUnusedPageStyleNo;
 css::uno::Reference m_xBodyText;
 css::uno::Reference m_xEmbedded;
 
@@ -564,6 +566,7 @@ public:
 }
 
 css::uno::Reference const & 
GetPageStyles();
+OUString GetUnusedPageStyleName();
 css::uno::Reference const & GetBodyText();
 const css::uno::Reference& 
GetTextFactory() const
 {
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 1cd31bb56954..395ab2e1be99 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -442,30 +442,11 @@ SectionPropertyMap::SectionPropertyMap( bool 
bIsFirstSection )
 }
 }
 
-static OUString lcl_FindUnusedPageStyleName( const uno::Sequence< OUString >& 
rPageStyleNames )
-{
-static const char DEFAULT_STYLE[] = "Converted";
-sal_Int32 nMaxIndex   = 0;
-// find the highest number x in each style with the name "DEFAULT_STYLE+x" 
and
-// return an incremented name
-
-for ( const auto& rStyleName : rPageStyleNames )
-{
-if ( rStyleName.startsWith( DEFAULT_STYLE ) )
-{
-sal_Int32 nIndex = rSt

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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/access2base/Application.xba   |  117 +++
 wizards/source/access2base/PropertiesGet.xba |   99 --
 wizards/source/access2base/PropertiesSet.xba |   18 
 wizards/source/access2base/Python.xba|   12 +-
 4 files changed, 123 insertions(+), 123 deletions(-)

New commits:
commit fd2a8fc9651037263069aa5f0f97c205d8fc4a1c
Author: Jean-Pierre Ledure 
AuthorDate: Tue Aug 20 11:56:42 2019 +0200
Commit: Jean-Pierre Ledure 
CommitDate: Tue Aug 20 12:01:40 2019 +0200

Access2Base - Move getObject, getValue and setValue

Functions moved from module PropertiesGet to Application
No effect in Basic
Compliant with Python rules where module/class name is mandatory

Change-Id: I970825590cbce86a9178bd750ffdb23ce87ae282

diff --git a/wizards/source/access2base/Application.xba 
b/wizards/source/access2base/Application.xba
index b59ff96b2e30..f821cf270519 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -1071,6 +1071,105 @@ Error_Function:
 End Function   '  Forms   V0.9.0
 
 REM 
---
+Public Function getObject(Optional pvShortcut As Variant) As Variant
+' Return the object described by pvShortcut ignoring its final property
+' Example:"Forms!myForm!myControl.myProperty" 
=> Controls(Forms("myForm"), "myControl"))
+
+Const cstEXCLAMATION = "!"
+Const cstDOT = "."
+
+   If _ErrorHandler() Then On Local Error Goto Error_Function
+Const cstThisSub = "getObject"
+   Utils._SetCalledSub(cstThisSub)
+   If IsMissing(pvShortcut) Then Call _TraceArguments()
+   If Not Utils._CheckArgument(pvShortcut, 1, vbString) Then Goto 
Exit_Function
+
+Dim iCurrentIndex As Integer, vCurrentObject As Variant, sCurrentProperty As 
String
+Dim sComponents() As String, sSubComponents() As String, sDialog As String
+Dim oDoc As Object
+   Set vCurrentObject = Nothing
+   sComponents = Split(Trim(pvShortcut), cstEXCLAMATION)
+   If UBound(sComponents) = 0 Then Goto Trace_Error
+   If Not Utils._InList(UCase(sComponents(0)), Array("FORMS", 
"DIALOGS", "TEMPVARS")) Then Goto Trace_Error
+   If sComponents(1) = "0" Or Left(sComponents(1), 2) = 
"0." Then
+   Set oDoc = _A2B_.CurrentDocument()
+   If oDoc.DbConnect = DBCONNECTFORM Then sComponents(1) = 
oDoc.DbContainers(0).FormName Else Goto Trace_Error
+   End If
+
+   sSubComponents = Split(sComponents(UBound(sComponents)), cstDOT)
+   sComponents(UBound(sComponents)) = sSubComponents(0)
'  Ignore final property, if any
+   
+   Set vCurrentObject = New Collect
+   Set vCurrentObject._This = vCurrentObject
+   Select Case UCase(sComponents(0))
+   Case "FORMS"  :   vCurrentObject._CollType = 
COLLFORMS
+   Case "DIALOGS":   
vCurrentObject._CollType = COLLALLDIALOGS
+   Case "TEMPVARS"   :   
vCurrentObject._CollType = COLLTEMPVARS
+   End Select
+   For iCurrentIndex = 1 To UBound(sComponents)'  Start parsing 
...
+   sSubComponents = Split(sComponents(iCurrentIndex), cstDOT)
+   sComponents(iCurrentIndex) = Utils._Trim(sSubComponents(0))
+   Select Case UBound(sSubComponents)
+   Case 0
+   sCurrentProperty = ""
+   Case 1
+   sCurrentProperty = sSubComponents(1)
+   Case Else
+   Goto Trace_Error
+   End Select
+   Select Case vCurrentObject._Type
+   Case OBJCOLLECTION
+   Select Case vCurrentObject._CollType
+   Case COLLFORMS
+   vCurrentObject = 
Application.AllForms(sComponents(iCurrentIndex))
+   Case COLLALLDIALOGS
+   sDialog = 
UCase(sComponents(iCurrentIndex))
+   vCurrentObject = 
Application.AllDialogs(sDialog)
+   If Not vCurrentObject.IsLoaded 
Then Goto Trace_Error
+   Set vCurrentObject.UnoDialog = 
_A2B_.Dialogs.Item(sDialog)
+   Case COLLTEMPVARS
+   If UBound(sComponents) > 1 
Then Goto Trace_Error
+   vCurrentObject = 
Application.TempVars(sComponents(1))
+   'Case Else
+   End Select
+   Case OBJFORM, OBJSUBFORM, OBJCONTROL, OBJDIALOG
+  

[Libreoffice-commits] core.git: offapi/type_reference

[Stephan Bergmann (via logerrit)]

 offapi/type_reference/offapi.idl |4 
 1 file changed, 4 insertions(+)

New commits:
commit 20c6d7f6e64efa7597fdd5712514a85264bb7215
Author: Stephan Bergmann 
AuthorDate: Tue Aug 20 08:31:42 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 20 11:59:48 2019 +0200

Update the reference rdbs to libreoffice-6.3.0.4

LD_LIBRARY_PATH=.../master/instdir/program \
 .../master/workdir/LinkTarget/Executable/unoidl-read --published \
 .../libreoffice-6.3.0.4/instdir/program/types.rdb \
 >.../master/udkapi/type_reference/udkapi.idl

* no changes

LD_LIBRARY_PATH=.../master/instdir/program \
 .../master/workdir/LinkTarget/Executable/unoidl-read --published \
 .../libreoffice-6.3.0.4/instdir/program/types.rdb \
 .../libreoffice-6.3.0.4/instdir/program/types/offapi.rdb \
 >.../master/offapi/type_reference/offapi.idl

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

diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index 7a3102310d46..e8a192a42bd3 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -14082,6 +14082,7 @@ module com {
  [property] boolean IsProtected;
  [property] short VertOrient;
  [property, optional] ::com::sun::star::graphic::XGraphic BackGraphic;
+ [property, optional, readonly] ::com::sun::star::text::XText ParentText;
 };
 published service CellRange {
  service ::com::sun::star::style::CharacterProperties;
@@ -14121,6 +14122,7 @@ module com {
  [property, optional] short WritingMode;
  [property, optional] boolean IsFollowingTextFlow;
  [property, optional] ::com::sun::star::drawing::TextVerticalAdjust 
TextVerticalAdjust;
+ [property, optional, readonly] ::com::sun::star::text::XText ParentText;
 };
 published service ChainedTextFrame {
  service ::com::sun::star::text::TextFrame;
@@ -15322,6 +15324,7 @@ module com {
  [property, optional] boolean UseHeaderFooterMenu;
 };
 published constants WritingMode2 {
+ const short BT_LR = 5;
  const short CONTEXT = 4;
  const short LR_TB = 0;
  /** @deprecated */ const short PAGE = 4;
@@ -17140,6 +17143,7 @@ module com {
  const short DATE = 2;
  const short DATETIME = 6;
  const short DEFINED = 1;
+ const short DURATION = 8196;
  const short EMPTY = 4096;
  const short FRACTION = 64;
  const short LOGICAL = 1024;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/unx

[Noel Grandin (via logerrit)]

 vcl/unx/gtk/gtksalmenu.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 97fefe2e0870c7e62d39ba1e82e1c276c8f64ced
Author: Noel Grandin 
AuthorDate: Mon Aug 19 10:35:44 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Aug 20 11:44:48 2019 +0200

tdf#126830 Icons not showing in menus

regression from
commit 9eae42ce01cb289b9e736454abcf835b8394
Date:   Sun Apr 28 09:54:42 2019 +0200
speed up gtk menu construction at startup

Change-Id: I12327c0c62aa283c8b04a03933704082fd13463a
Reviewed-on: https://gerrit.libreoffice.org/77702
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 35b41150e84940e87b9d961b6b402e3e060d6b8b)
Reviewed-on: https://gerrit.libreoffice.org/77783
Reviewed-by: Xisco Faulí 

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 0d149bf4b30c..8dbd8817b1ff 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -1063,7 +1063,7 @@ namespace
 void GtkSalMenu::NativeSetItemIcon( unsigned nSection, unsigned nItemPos, 
const Image& rImage )
 {
 #if GLIB_CHECK_VERSION(2,38,0)
-if (!!rImage && mbHasNullItemIcon)
+if (!rImage && mbHasNullItemIcon)
 return;
 
 SolarMutexGuard aGuard;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 sw/source/core/layout/calcmove.cxx |8 
 sw/source/core/layout/flowfrm.cxx  |4 
 2 files changed, 12 insertions(+)

New commits:
commit 3dd86101182543dcbad4df0c2e746ede26f1cbbb
Author: Tomáš Chvátal 
AuthorDate: Mon Aug 19 13:30:23 2019 +0200
Commit: Caolán McNamara 
CommitDate: Tue Aug 20 11:15:44 2019 +0200

Fix buidling with older boost

Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d
Reviewed-on: https://gerrit.libreoffice.org/77716
Reviewed-by: Tomáš Chvátal 
Tested-by: Tomáš Chvátal 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/layout/calcmove.cxx 
b/sw/source/core/layout/calcmove.cxx
index 1856e6b69d40..ff2befe5d969 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -409,12 +409,20 @@ void SwFrame::PrepareCursor()
 
 if ( bTab )
 {
+#if BOOST_VERSION < 105600
+tabGuard.reset(static_cast(this)); // tdf#125741
+#else
 tabGuard.emplace(static_cast(this)); // tdf#125741
+#endif
 pThis = static_cast(this);
 }
 else if (IsRowFrame())
 {
+#if BOOST_VERSION < 105600
+rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this 
alive
+#else
 rowGuard.emplace(this); // tdf#125741 keep this alive
+#endif
 }
 else if( IsSctFrame() )
 {
diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 6c9e61595f23..dbe7d9c7feec 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2527,7 +2527,11 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
 && pTabFrame->GetFirstNonHeadlineRow() == 
m_rThis.GetUpper()->GetUpper())
 {
 // lock follow-flow-row (similar to sections above)
+#if BOOST_VERSION < 105600
+
g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper()));
+#else
 g.emplace(m_rThis.GetUpper()->GetUpper());
+#endif
 
assert(m_rThis.GetUpper()->GetUpper()->IsDeleteForbidden());
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/inc framework/Library_fwk.mk framework/source

[Noel Grandin (via logerrit)]

 framework/Library_fwk.mk   |1 
 framework/inc/helper/statusindicatorfactory.hxx|7 --
 framework/inc/helper/wakeupthread.hxx  |   57 +++
 framework/source/helper/statusindicatorfactory.cxx |   25 
 framework/source/helper/wakeupthread.cxx   |   60 +
 5 files changed, 132 insertions(+), 18 deletions(-)

New commits:
commit d3b03032b7140a98946bfe8fc475a322e6eb6f9a
Author: Noel Grandin 
AuthorDate: Tue Aug 20 10:14:19 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 11:13:46 2019 +0200

tdf#125869 LibreOffice UI freezes (shows not responding) while exporting a 
pdf

Revert "use vcl::Timer in StatusIndicatorFactory"
This reverts commit 848058625c7fad21e2469c95c2a2078678925a5a,
which seems to have been a bad idea

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

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 7a433735ce43..6d1f124f2f5a 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/helper/uiconfigelementwrapperbase \
 framework/source/helper/uielementwrapperbase \
 framework/source/helper/vclstatusindicator \
+framework/source/helper/wakeupthread \
 framework/source/interaction/quietinteraction \
 framework/source/jobs/job \
 framework/source/jobs/jobdata \
diff --git a/framework/inc/helper/statusindicatorfactory.hxx 
b/framework/inc/helper/statusindicatorfactory.hxx
index a2a073821d8e..4f6e183e8a54 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -25,6 +25,7 @@
 #include 
 
 // include files of own module
+#include 
 #include 
 
 // include uno interfaces
@@ -44,9 +45,7 @@
 #include 
 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 
@@ -166,7 +165,7 @@ class StatusIndicatorFactory : public  
::cppu::WeakImplHelper<
 
 /** Notify us if a fix time is over. We use it to implement an
 intelligent "Reschedule" ... */
-boost::optional m_xWakeUpTimer;
+rtl::Reference m_pWakeUp;
 
 /** Our WakeUpThread calls us in our interface method 
"XUpdatable::update().
 There we set this member m_bAllowReschedule to sal_True. Next time 
if our impl_reschedule()
@@ -183,8 +182,6 @@ class StatusIndicatorFactory : public  
::cppu::WeakImplHelper<
 /** prevent recursive calling of Application::Reschedule(). */
 static sal_Int32 m_nInReschedule;
 
-DECL_LINK( WakeupTimerHdl, Timer*, void );
-
 // interface
 
 public:
diff --git a/framework/inc/helper/wakeupthread.hxx 
b/framework/inc/helper/wakeupthread.hxx
new file mode 100644
index ..50e234f23713
--- /dev/null
+++ b/framework/inc/helper/wakeupthread.hxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+namespace com { namespace sun { namespace star { namespace util {
+class XUpdatable;
+} } } }
+
+namespace framework{
+
+class WakeUpThread: public salhelper::Thread {
+css::uno::WeakReference updatable_;
+osl::Condition condition_;
+
+osl::Mutex mutex_;
+bool terminate_;
+
+void execute() override;
+
+public:
+WakeUpThread(css::uno::Reference const & updatable);
+
+void stop();
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/statusindicatorfactory.cxx 
b/framework/source/helper/statusindicatorfactory.cxx
index ee33a646cadd..5e4ba3adf4e3 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -537,27 +537,26 @@ void StatusIndicatorFactory::impl_startWakeUpThread()
 

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

[Caolán McNamara (via logerrit)]

 sc/uiconfig/scalc/ui/conditionalentry.ui |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 16eaea5fe8c3e9942b36f6d9969886191f25620c
Author: Caolán McNamara 
AuthorDate: Mon Aug 19 21:34:24 2019 +0100
Commit: Xisco Faulí 
CommitDate: Tue Aug 20 11:03:03 2019 +0200

Resolves: tdf#126781 don't let width grow to fit condition text

make the label have no part of the width calc by giving it a small
width request and force it to live with with the rest of the dialog
ends up as

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

diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui 
b/sc/uiconfig/scalc/ui/conditionalentry.ui
index 717f9a252048..85134870d0b0 100644
--- a/sc/uiconfig/scalc/ui/conditionalentry.ui
+++ b/sc/uiconfig/scalc/ui/conditionalentry.ui
@@ -40,8 +40,11 @@
 
 
   
+10
 True
 False
+True
+end
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

[Tor Lillqvist (via logerrit)]

 wsd/LOOLWSD.cpp |2 ++
 wsd/LOOLWSD.hpp |   10 ++
 2 files changed, 12 insertions(+)

New commits:
commit 1d3ac69ffd5e4024878d87409ccb87c83cbd37c3
Author: Tor Lillqvist 
AuthorDate: Tue Aug 20 11:20:22 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 20 10:55:32 2019 +0200

Avoid some "RuntimeConstant instance read before being initialized" issues

(In the !ENABLE_SSL case.)

Possibly the SSL or not ifdeffery could be cleaned up a bit more.

Change-Id: I0c9b4e956dcd317d6622a7394044fed0c4f2d976
Reviewed-on: https://gerrit.libreoffice.org/77780
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index dd62d2929..e0518479d 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -710,8 +710,10 @@ std::string LOOLWSD::ConfigDir = LOOLWSD_CONFIGDIR 
"/conf.d";
 std::string LOOLWSD::LogLevel = "trace";
 bool LOOLWSD::AnonymizeUserData = false;
 std::uint64_t LOOLWSD::AnonymizationSalt = 82589933;
+#if ENABLE_SSL
 Util::RuntimeConstant LOOLWSD::SSLEnabled;
 Util::RuntimeConstant LOOLWSD::SSLTermination;
+#endif
 unsigned LOOLWSD::MaxConnections;
 unsigned LOOLWSD::MaxDocuments;
 std::string LOOLWSD::OverrideWatermark;
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 2e6c68e70..7c4103e3b 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -92,12 +92,20 @@ public:
 
 static bool isSSLEnabled()
 {
+#if ENABLE_SSL
 return LOOLWSD::SSLEnabled.get();
+#else
+return false;
+#endif
 }
 
 static bool isSSLTermination()
 {
+#if ENABLE_SSL
 return LOOLWSD::SSLTermination.get();
+#else
+return false;
+#endif
 }
 
 /// Return true iff extension is marked as view action in discovery.xml.
@@ -182,8 +190,10 @@ protected:
 void cleanup();
 
 private:
+#if ENABLE_SSL
 static Util::RuntimeConstant SSLEnabled;
 static Util::RuntimeConstant SSLTermination;
+#endif
 
 void initializeSSL();
 void displayHelp();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5d4f845aec0cbe2f4037a3d25cd592007d1604d3
Author: Tor Lillqvist 
AuthorDate: Fri Aug 16 13:40:03 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 20 10:54:44 2019 +0200

tdf#122572: Make the context toolbar show up more reliably

It seems that the _onPress function is sometimes called multiple times
in succession and then the toolbar got first added but immediately
removed again. Ugly hack to fix that.

But note that in this branch, copy/paste seems to be broken in the iOS
app at the moment anyway. Apparently the code that makes it use the
system pasteboard is missing, or does not get called.

Reviewed-on: https://gerrit.libreoffice.org/77574
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit c2956383b9f353ffa98ae4a3c8e21769d3f334db)

Change-Id: Id4f1569670e599a2b37afc9ae5d91f31661f72e2
Reviewed-on: https://gerrit.libreoffice.org/77789
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index f51da0286..ff5d61d61 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -21,6 +21,7 @@ L.Map.TouchGesture = L.Handler.extend({
 
if (window.ThisIsTheiOSApp && !this._toolbar) {
this._toolbar = L.control.contextToolbar();
+   this._toolbarAdded = 0;
}
 
if (!this._hammer) {
@@ -157,10 +158,14 @@ L.Map.TouchGesture = L.Handler.extend({
mousePos = this._map._docLayer._latLngToTwips(latlng);
 
if (window.ThisIsTheiOSApp) {
+   // console.log('==> ' + e.timeStamp);
if (!this._toolbar._map && 
this._map._docLayer.containsSelection(latlng)) {
this._toolbar._pos = containerPoint;
+   // console.log('==> Adding context toolbar ' + 
e.timeStamp);
this._toolbar.addTo(this._map);
-   } else {
+   this._toolbarAdded = e.timeStamp;
+   } else if (this._toolbarAdded && e.timeStamp - 
this._toolbarAdded >= 1000) {
+   // console.log('==> Removing context toolbar ' 
+ e.timeStamp);
this._toolbar.remove();

this._map._contextMenu._onMouseDown({originalEvent: e.srcEvent});
// send right click to trigger context menus
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |2 +-
 loleaflet/src/control/Control.Toolbar.js |9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 232fdf5dcbc0c8f5b46a52353796f44cb34eca4b
Author: Tor Lillqvist 
AuthorDate: Mon Aug 19 18:41:55 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 20 10:54:29 2019 +0200

tdf#126972: The "file icon" button in the menubar is useless in the iOS app

In "real" Online, in a WOPI environment, it does something useful. But
not in the iOS app. So no need to have it at all.

Change-Id: I87a6b7badcba2899f850a1e15eae591e9ed8895c
Reviewed-on: https://gerrit.libreoffice.org/77742
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit c5d6c7dd402da6987cd01f3c0759b28b3503d85c)
Reviewed-on: https://gerrit.libreoffice.org/77788

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 3a845f926..41120cfc2 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -560,7 +560,7 @@ L.Control.Menubar = L.Control.extend({
});
$('#main-menu').attr('tabindex', 0);
 
-   if (this._map._permission !== 'readonly') {
+   if (!window.ThisIsTheiOSApp && this._map._permission !== 
'readonly') {
this._createFileIcon();
}
},
commit a91025e998e1835947b6bc2da5b26350c6dc886b
Author: Tor Lillqvist 
AuthorDate: Mon Aug 19 18:35:29 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 20 10:54:14 2019 +0200

tdf#126972: Don't fold the menubar in the iOS app on a tablet

As the menubar is now then always visible in that case, no need to
have the hamburger button in the toolbar either.

Change-Id: Iec1ae28858ad994d008c294e5fa4069c5e9bc7ed
Reviewed-on: https://gerrit.libreoffice.org/77740
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/77787

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 1e302892b..29e5c2590 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -47,7 +47,10 @@ function _updateVisibilityForToolbar(toolbar) {
var toHide = [];
 
toolbar.items.forEach(function(item) {
-   if (((isMobile && item.mobile === false) || (isTablet && 
item.tablet === false) || (isDesktop && item.desktop === false) || 
(!window.ThisIsAMobileApp && item.mobilebrowser === false)) && !item.hidden) {
+   if (window.ThisIsTheiOSApp && isTablet && item.iosapptablet === 
false) {
+   toHide.push(item.id);
+   }
+   else if (((isMobile && item.mobile === false) || (isTablet && 
item.tablet === false) || (isDesktop && item.desktop === false) || 
(!window.ThisIsAMobileApp && item.mobilebrowser === false)) && !item.hidden) {
toHide.push(item.id);
}
else if (((isMobile && item.mobile === true) || (isTablet && 
item.tablet === true) || (isDesktop && item.desktop === true) || 
(window.ThisIsAMobileApp && item.mobilebrowser === true)) && item.hidden) {
@@ -822,7 +825,7 @@ function initNormalToolbar() {
{type: 'spacer'},
{type: 'button',  id: 'edit',  img: 'edit'},
{type: 'button',  id: 'fold',  img: 'fold', desktop: true, 
mobile: false, hidden: true},
-   {type: 'button',  id: 'hamburger-tablet',  img: 'hamburger', 
desktop: false, mobile: false, tablet: true, hidden: true}
+   {type: 'button',  id: 'hamburger-tablet',  img: 'hamburger', 
desktop: false, mobile: false, tablet: true, iosapptablet: false, hidden: true}
];
 
var toolbar = $('#toolbar-up');
@@ -1498,7 +1501,7 @@ function onDocLayerInit() {
toolbarUp.refresh();
statusbar.refresh();
 
-   if (window.mode.isTablet()) {
+   if (!window.ThisIsTheiOSApp && window.mode.isTablet()) {
map.hideMenubar();
 
$('#document-container').addClass('tablet');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/layer/vector/SVGGroup.js |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit f287b599bcd7497e4be65967ae2efa4db5e2253b
Author: Tor Lillqvist 
AuthorDate: Wed Jul 31 18:54:04 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 20 10:53:43 2019 +0200

Guard against uncaught exception

Change-Id: I0ebae5f7dbf07e81d7b09f5c98506e85a6a52e93
Reviewed-on: https://gerrit.libreoffice.org/76761
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
(cherry picked from commit 40285fa45d1019613bfc86d9aa5ca7702e9ba14f)
Reviewed-on: https://gerrit.libreoffice.org/77786
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/src/layer/vector/SVGGroup.js 
b/loleaflet/src/layer/vector/SVGGroup.js
index 48a1e5967..7f0f8678a 100644
--- a/loleaflet/src/layer/vector/SVGGroup.js
+++ b/loleaflet/src/layer/vector/SVGGroup.js
@@ -59,6 +59,10 @@ L.SVGGroup = L.Layer.extend({
 
if (!this._dragShape || !this.dragging)
return;
+
+   if (!this._map)
+   return;
+
this._moved = false;
 
L.DomEvent.on(this._dragShape, 'mousemove', this._onDrag, this);
@@ -87,6 +91,9 @@ L.SVGGroup = L.Layer.extend({
if (!this._dragShape || !this.dragging)
return;
 
+   if (!this._map)
+   return;
+
if (!this._moved) {
this._moved = true;
this._showEmbeddedSVG();
@@ -114,8 +121,11 @@ L.SVGGroup = L.Layer.extend({
 
this._moved = false;
this._hideEmbeddedSVG();
-   var pos = this._map.mouseEventToLatLng(evt);
-   this.fire('graphicmoveend', {pos: pos});
+
+   if (this._map) {
+   var pos = this._map.mouseEventToLatLng(evt);
+   this.fire('graphicmoveend', {pos: pos});
+   }
 
if (evt.type === 'mouseup')
this.dragging._onDragEnd(evt);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |   36 +++---
 1 file changed, 32 insertions(+), 4 deletions(-)

New commits:
commit c7b1159f36dea4ee3524a0ed71885388b721d520
Author: Tor Lillqvist 
AuthorDate: Tue Jul 23 16:44:41 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 20 10:53:05 2019 +0200

tdf#122572: Temporarily resurrect the context toolbar, for the iOS app only

It will be superseded by the context menu, but that doesn't work even
in normal Online in this branch currently. Once it works, I can then
try to use the same styling for it in the iOS app as for the context
toolbar, to make it look like the native iOS "edit menu".

This reverts a3d9cf8999ac25bb2b2a5d6332d7ac6e2f7c7350, but for the iOS
app only.

Note that there are other problems related to copy and paste in this
branch in the iOS app. The copy/paste changes for normal Online have
caused regressions in the app.

Reviewed-on: https://gerrit.libreoffice.org/76192
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 5448916f98c1480cfbc64f58e6d4f1cdb3fd133f)

Change-Id: I5c13cd0a5ece9038aba774b229dd86ec9c6678fc
Reviewed-on: https://gerrit.libreoffice.org/77781
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index c5735c670..f51da0286 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -19,6 +19,10 @@ L.Map.TouchGesture = L.Handler.extend({
L.Handler.prototype.initialize.call(this, map);
this._state = L.Map.TouchGesture.MAP;
 
+   if (window.ThisIsTheiOSApp && !this._toolbar) {
+   this._toolbar = L.control.contextToolbar();
+   }
+
if (!this._hammer) {
this._hammer = new Hammer(this._map._mapPane);
this._hammer.get('swipe').set({
@@ -83,6 +87,8 @@ L.Map.TouchGesture = L.Handler.extend({
this._hammer.on('pinchstart pinchmove', L.bind(this._onPinch, 
this));
this._hammer.on('pinchend', L.bind(this._onPinchEnd, this));
this._hammer.on('tripletap', L.bind(this._onTripleTap, this));
+   if (window.ThisIsTheiOSApp)
+   this._map.on('input.press', this._onInputPressiOSOnly, 
this);
this._map.on('updatepermission', this._onPermission, this);
this._onPermission({perm: this._map._permission});
},
@@ -150,10 +156,23 @@ L.Map.TouchGesture = L.Handler.extend({
latlng = this._map.layerPointToLatLng(layerPoint),
mousePos = this._map._docLayer._latLngToTwips(latlng);
 
-   this._map._contextMenu._onMouseDown({originalEvent: 
e.srcEvent});
-   // send right click to trigger context menus
-   this._map._docLayer._postMouseEvent('buttondown', mousePos.x, 
mousePos.y, 1, 4, 0);
-   this._map._docLayer._postMouseEvent('buttonup', mousePos.x, 
mousePos.y, 1, 4, 0);
+   if (window.ThisIsTheiOSApp) {
+   if (!this._toolbar._map && 
this._map._docLayer.containsSelection(latlng)) {
+   this._toolbar._pos = containerPoint;
+   this._toolbar.addTo(this._map);
+   } else {
+   this._toolbar.remove();
+   
this._map._contextMenu._onMouseDown({originalEvent: e.srcEvent});
+   // send right click to trigger context menus
+   
this._map._docLayer._postMouseEvent('buttondown', mousePos.x, mousePos.y, 1, 4, 
0);
+   this._map._docLayer._postMouseEvent('buttonup', 
mousePos.x, mousePos.y, 1, 4, 0);
+   }
+   } else {
+   this._map._contextMenu._onMouseDown({originalEvent: 
e.srcEvent});
+   // send right click to trigger context menus
+   this._map._docLayer._postMouseEvent('buttondown', 
mousePos.x, mousePos.y, 1, 4, 0);
+   this._map._docLayer._postMouseEvent('buttonup', 
mousePos.x, mousePos.y, 1, 4, 0);
+   }
 
e.preventDefault();
},
@@ -165,6 +184,8 @@ L.Map.TouchGesture = L.Handler.extend({
latlng = this._map.layerPointToLatLng(layerPoint),
mousePos = this._map._docLayer._latLngToTwips(latlng);
 
+   if (window.ThisIsTheiOSApp)
+   this._toolbar.remove();
this._map._contextMenu._onMouseDown({originalEvent: 
e.srcEvent});
this._map._docLayer._postMouseEvent('buttondown', mou

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |   29 +
 1 file changed, 21 insertions(+), 8 deletions(-)

New commits:
commit f8bb16d4716de4d14e4f859bd1dbb7da0947ee8b
Author: Szymon Kłos 
AuthorDate: Wed Jun 12 10:05:13 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Aug 20 10:52:36 2019 +0200

Fix not working clicks in dialogs on mobile devices

Sometimes input event was not sent and dialog was not working.
Eg. spreadsheet -> menu -> Data -> Validation

Change-Id: I8d864fdd73866080df5dc0b9b84e8e39054f65e3
Reviewed-on: https://gerrit.libreoffice.org/75943
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
(cherry picked from commit 03ed7b6e6f109ace1e566c15ff09cb4e5158)
Reviewed-on: https://gerrit.libreoffice.org/7
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 8f3c7091c..3c29f3437 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -464,9 +464,13 @@ L.Control.LokDialog = L.Control.extend({
L.DomEvent.on(canvas, 'mousedown mouseup', function(e) {
L.DomEvent.stopPropagation(e);
var buttons = 0;
-   buttons |= e.button === 
this._map['mouse'].JSButtons.left ? this._map['mouse'].LOButtons.left : 0;
-   buttons |= e.button === 
this._map['mouse'].JSButtons.middle ? this._map['mouse'].LOButtons.middle : 0;
-   buttons |= e.button === 
this._map['mouse'].JSButtons.right ? this._map['mouse'].LOButtons.right : 0;
+   if (this._map['mouse']) {
+   buttons |= e.button === 
this._map['mouse'].JSButtons.left ? this._map['mouse'].LOButtons.left : 0;
+   buttons |= e.button === 
this._map['mouse'].JSButtons.middle ? this._map['mouse'].LOButtons.middle : 0;
+   buttons |= e.button === 
this._map['mouse'].JSButtons.right ? this._map['mouse'].LOButtons.right : 0;
+   } else {
+   buttons = 1;
+   }
// 'mousedown' -> 'buttondown'
var lokEventType = e.type.replace('mouse', 'button');
this._postWindowMouseEvent(lokEventType, id, e.offsetX, 
e.offsetY, 1, buttons, 0);
@@ -771,9 +775,13 @@ L.Control.LokDialog = L.Control.extend({
 
L.DomEvent.on(canvas, 'mousedown mouseup', function(e) {
var buttons = 0;
-   buttons |= e.button === 
this._map['mouse'].JSButtons.left ? this._map['mouse'].LOButtons.left : 0;
-   buttons |= e.button === 
this._map['mouse'].JSButtons.middle ? this._map['mouse'].LOButtons.middle : 0;
-   buttons |= e.button === 
this._map['mouse'].JSButtons.right ? this._map['mouse'].LOButtons.right : 0;
+   if (this._map['mouse']) {
+   buttons |= e.button === 
this._map['mouse'].JSButtons.left ? this._map['mouse'].LOButtons.left : 0;
+   buttons |= e.button === 
this._map['mouse'].JSButtons.middle ? this._map['mouse'].LOButtons.middle : 0;
+   buttons |= e.button === 
this._map['mouse'].JSButtons.right ? this._map['mouse'].LOButtons.right : 0;
+   } else {
+   buttons = 1;
+   }
var lokEventType = e.type.replace('mouse', 'button');
this._postWindowMouseEvent(lokEventType, childId, 
e.offsetX, e.offsetY, 1, buttons, 0);
}, this);
commit 8c19a0adbd2d7bbe55eb17f0fc04f738db70de04
Author: Tor Lillqvist 
AuthorDate: Fri Jul 19 14:44:50 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 20 10:52:23 2019 +0200

Guard against this._map['mouse'] being undefined

This changes makes combo boxes in the iOS app work again. Unclear
what the situation for normal Online on a touch device is.

Change-Id: If84124d46ea015722e8079566fc04914ee2bc542
Reviewed-on: https://gerrit.libreoffice.org/75953
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 9e611b9398035ddb89a0dbc68f40388c2ec5cc4e)
Reviewed-on: https://gerrit.libreoffice.org/6

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 35d7fe74c..8f3c7091c 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -750,8 +750,13 @@ L.Control.LokDialog = L.Control.extend({
this._postWindowGestureEvent(childId, 'panEnd', 
firstTouchPositionX, firstTouchPositionY, firstTouchPositionY - touchY);
if (pr

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/pagedlg/tphfedit.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4e123492d8d63d04a1c215c17981f0149df2f634
Author: Caolán McNamara 
AuthorDate: Mon Aug 19 10:34:56 2019 +0100
Commit: Xisco Faulí 
CommitDate: Tue Aug 20 10:43:00 2019 +0200

Resolves: tdf#127003 explicit grab focus needs explicit link callback

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

diff --git a/sc/source/ui/pagedlg/tphfedit.cxx 
b/sc/source/ui/pagedlg/tphfedit.cxx
index 60af30694826..ff01ce68e606 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -279,8 +279,11 @@ bool ScEditWindow::MouseMove( const MouseEvent& rMEvt )
 
 bool ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
-if ( !HasFocus() )
+if (!HasFocus())
+{
 GrabFocus();
+GetFocus();
+}
 
 return pEdView->MouseButtonDown( rMEvt );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

About putting back Firebird experimental

[Julien]

Hello,

Considering the number of bugs about Firebird migration (see 
https://bugs.documentfoundation.org/show_bug.cgi?id=116968) and the fact that 
these bugs may not be trivial to fix (see 
https://wastack.wordpress.com/2018/07/25/database-migration-in-libreoffice-bug-fixes-and-more/),
 thought it could be relevant to put Firebird back to experimental or at least 
stop to propose Firebird migration when opening an odb file with hsqldb 
embedded.

Remark: don't misunderstand me, I'd enjoy to replace HSQLDB to help to remove 
Java dependency. Also, I know that HSQLDB upgrade has been delayed/cancelled 
because we had plan to replace it by Firebird but let's face it, I don't think 
we're ready to propose Firebird widely.
Let's not forget there are too few dev experts working on Base part (Lionel + 
Tamás + Jean-Pierre Ledure for specific Access part).
(I'm trying sometimes to work on Base part but most of bugs are too difficult 
for me and require a good understanding of Base mechanisms).

Now perhaps I'm too pessimistic here, so would like your opinion.

Any thoughts?

Regards,

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

[Libreoffice-commits] core.git: connectivity/source dbaccess/source desktop/source desktop/test dtrans/source dtrans/test extensions/source extensions/test include/osl udkapi/com

[Andrea Gelmini (via logerrit)]

 connectivity/source/drivers/mork/MResultSet.cxx |2 +-
 dbaccess/source/ui/dlg/DbAdminImpl.cxx  |6 +++---
 desktop/source/app/app.cxx  |2 +-
 desktop/test/deployment/update/publisher/readme.txt |4 ++--
 dtrans/source/win32/clipb/MtaOleClipb.cxx   |2 +-
 dtrans/source/win32/dnd/source.cxx  |2 +-
 dtrans/source/win32/dtobj/APNDataObject.cxx |2 +-
 dtrans/test/win32/dnd/atlwindow.cxx |2 +-
 extensions/source/config/ldap/ldapuserprofilebe.hxx |2 +-
 extensions/source/ole/unoconversionutilities.hxx|8 
 extensions/test/ole/callUnoToJava.htm   |2 +-
 include/osl/file.h  |2 +-
 udkapi/com/sun/star/uno/Uik.idl |2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 1618a3cee763fe9c3393e0511244547674bdd264
Author: Andrea Gelmini 
AuthorDate: Mon Aug 19 20:34:57 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 09:50:59 2019 +0200

Fix typos

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

diff --git a/connectivity/source/drivers/mork/MResultSet.cxx 
b/connectivity/source/drivers/mork/MResultSet.cxx
index 1ff055143f09..2275472c5a4a 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -884,7 +884,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*   
  parseT
 }
 else
 {
-// Most Complex, need to use an RE
+// Most Complex, need to use a RE
 sal_Int32 pos;
 while ( (pos = matchString.indexOf ( WILDCARD )) != -1 )
 {
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx 
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 2d12a18ad546..63588ed93c2a 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -183,15 +183,15 @@ 
ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer
 m_aIndirectPropTranslator.emplace( DSID_RESPECTRESULTSETTYPE, 
OUString("RespectDriverResultSetType") );
 m_aIndirectPropTranslator.emplace( DSID_MAX_ROW_SCAN, 
OUString("MaxRowScan") );
 
-// extra settings for odbc
+// extra settings for ODBC
 m_aIndirectPropTranslator.emplace( DSID_USECATALOG, INFO_USECATALOG );
-// extra settings for a ldap address book
+// extra settings for an LDAP address book
 m_aIndirectPropTranslator.emplace( DSID_CONN_LDAP_BASEDN, 
INFO_CONN_LDAP_BASEDN );
 m_aIndirectPropTranslator.emplace( DSID_CONN_LDAP_ROWCOUNT, 
INFO_CONN_LDAP_ROWCOUNT );
 m_aIndirectPropTranslator.emplace( DSID_CONN_LDAP_USESSL, 
OUString("UseSSL") );
 m_aIndirectPropTranslator.emplace( DSID_DOCUMENT_URL, PROPERTY_URL );
 
-// oracle
+// Oracle
 m_aIndirectPropTranslator.emplace( DSID_IGNORECURRENCY, 
OUString("IgnoreCurrency") );
 
 try
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index bd203f943739..13f66a9697b9 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -812,7 +812,7 @@ void Desktop::HandleBootstrapErrors(
 }
 else if ( aBootstrapError == BE_UNO_SERVICEMANAGER || aBootstrapError == 
BE_UNO_SERVICE_CONFIG_MISSING )
 {
-// Uno service manager is not available. VCL needs a uno service 
manager to display a message box!!!
+// UNO service manager is not available. VCL needs a UNO service 
manager to display a message box!!!
 // Currently we are not able to display a message box with a service 
manager due to this limitations inside VCL.
 
 // When UNO is not properly initialized, all kinds of things can fail
diff --git a/desktop/test/deployment/update/publisher/readme.txt 
b/desktop/test/deployment/update/publisher/readme.txt
index 17d51dce307f..148dab776ce6 100644
--- a/desktop/test/deployment/update/publisher/readme.txt
+++ b/desktop/test/deployment/update/publisher/readme.txt
@@ -147,7 +147,7 @@ Test
 Repository:
 
 -Create the new extension in the repository. 
--Provide a company name and a URL to the company website. They should then be 
in the update 
+-Provide a company name and a URL to the company website. They should then be 
in the update
  feed. 
   
 -Create a new release for the extension. Upload the version 2.0 
(update/pub10.oxt). 
@@ -190,7 +190,7 @@ Test
 Repository:
 
 -Create the new extension in the repository. 
--Provide a company name and a URL to the company website. They should then be 
in the update 
+-Provide a company name and a URL to the company website. They should then be 
in the update
  feed. 
   
 -Create a new release for the extension. Upload the version 2.0 
(update/pub11.oxt). 
diff --git a/dtrans/source/win32/clipb/

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

[Andrea Gelmini (via logerrit)]

 sw/inc/unostyle.hxx |4 ++--
 sw/source/core/doc/docnew.cxx   |2 +-
 sw/source/filter/ww8/writerhelper.hxx   |2 +-
 testtools/source/performance/pseudo.cxx |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f3b3ccb8cc66aca992bb1cccf8ea29b879547701
Author: Andrea Gelmini 
AuthorDate: Tue Aug 20 09:20:46 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 09:45:45 2019 +0200

Fix typos

Split from:
https://gerrit.libreoffice.org/#/c/77765/

Change-Id: I76fcad2405ba1a938a26b69b47737cf896b8
Reviewed-on: https://gerrit.libreoffice.org/3
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 3eb8a3a1f62c..5a2e66195c72 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -228,7 +228,7 @@ public:
 
 typedef std::map CellStyleNameMap;
 
-/// A text table style is a uno api wrapper for a SwTableAutoFormat
+/// A text table style is a UNO API wrapper for a SwTableAutoFormat
 class SwXTextTableStyle : public cppu::WeakImplHelper
 <
 css::style::XStyle,
@@ -321,7 +321,7 @@ public:
 static css::uno::Reference 
CreateXTextTableStyle(SwDocShell* pDocShell, const OUString& 
rTableAutoFormatName);
 };
 
-/// A text cell style is a uno api wrapper for a SwBoxAutoFormat core class
+/// A text cell style is a UNO API wrapper for a SwBoxAutoFormat core class
 class SwXTextCellStyle : public cppu::WeakImplHelper
 <
 css::style::XStyle,
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 613c0b50aa48..96ce88160f7e 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -163,7 +163,7 @@ bool SwDoc::StartGrammarChecking( bool bSkipStart )
 //!! only documents with visible views need to be checked
 //!! (E.g. don't check temporary documents created for printing, see 
printing of notes and selections.
 //!! Those get created on the fly and get hard deleted a bit later as 
well, and no one should have
-//!! a uno reference to them)
+//!! a UNO reference to them)
 if (bVisible)
 {
 uno::Reference< linguistic2::XProofreadingIterator > xGCIterator( 
GetGCIterator() );
diff --git a/sw/source/filter/ww8/writerhelper.hxx 
b/sw/source/filter/ww8/writerhelper.hxx
index 4f6f67e49b8d..9049b37f4616 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -232,7 +232,7 @@ namespace sw
 /** Provide a dynamic_cast style cast for SfxPoolItems
 
 A SfxPoolItem generally need to be cast back to its original type
-to be useful, which is both tedious and errorprone. So item_cast is
+to be useful, which is both tedious and error prone. So item_cast 
is
 a helper template to aid the process and test if the cast is
 correct.
 
diff --git a/testtools/source/performance/pseudo.cxx 
b/testtools/source/performance/pseudo.cxx
index bff6e998e092..8417a0aa9226 100644
--- a/testtools/source/performance/pseudo.cxx
+++ b/testtools/source/performance/pseudo.cxx
@@ -42,7 +42,7 @@ struct pseudo_Mapping : public uno_Mapping
 ~pseudo_Mapping();
 };
 
-// a uno pseudo proxy 
=
+// a UNO pseudo proxy 
=
 struct pseudo_unoInterfaceProxy : public uno_Interface
 {
 oslInterlockedCount nRef;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: udkapi/com vcl/inc vcl/ios vcl/qt5

[Andrea Gelmini (via logerrit)]

 udkapi/com/sun/star/reflection/XPublished.idl|2 +-
 udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl |2 +-
 vcl/inc/qt5/Qt5Transferable.hxx  |2 +-
 vcl/ios/DataFlavorMapping.hxx|2 +-
 vcl/qt5/Qt5Transferable.cxx  |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 11907c04bf74701293555b568d2c38641177886c
Author: Andrea Gelmini 
AuthorDate: Mon Aug 19 21:44:48 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 09:44:23 2019 +0200

Fix typos

Change-Id: Iae76994e275517d7a1e7b9e2959f1ec93e2d
Reviewed-on: https://gerrit.libreoffice.org/77766
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/udkapi/com/sun/star/reflection/XPublished.idl 
b/udkapi/com/sun/star/reflection/XPublished.idl
index b7d8f13c39a0..880438f6cd63 100644
--- a/udkapi/com/sun/star/reflection/XPublished.idl
+++ b/udkapi/com/sun/star/reflection/XPublished.idl
@@ -88,7 +88,7 @@ module com {  module sun {  module star {  module reflection {
 */
 interface XPublished {
 /**
-   Returns the “published” status of an UNOIDL entity.
+   Returns the “published” status of a UNOIDL entity.
 
@return `TRUE` if the UNOIDL entity represented by this object is
published
diff --git a/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl 
b/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl
index 75f19bd017f9..0bcfe32a5458 100644
--- a/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl
+++ b/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module uri {
These URLs are of the form
   vnd-sun-star-expand-url =
"VND.SUN.STAR.EXPAND:" opaque_part
-   where the opaque_part is an UTF-8 string as described in
+   where the opaque_part is a UTF-8 string as described in
http://udk.openoffice.org/common/man/concept/micro_deployment.html";>
Bootstrap Arguments and Micro Deployment.  See
http://www.ietf.org/rfc/rfc2396.txt";>RFC 2396,
diff --git a/vcl/inc/qt5/Qt5Transferable.hxx b/vcl/inc/qt5/Qt5Transferable.hxx
index f36216eed121..df06661bb9fd 100644
--- a/vcl/inc/qt5/Qt5Transferable.hxx
+++ b/vcl/inc/qt5/Qt5Transferable.hxx
@@ -94,7 +94,7 @@ typedef Qt5Transferable Qt5DnDTransferable;
  * container for mime data. There is no need to ever set any of its data.
  *
  * LO will offer at least UTF-16, if there is a viable text representation.
- * If LO misses to offer an UTF-8 or a locale encoded string, these objects
+ * If LO misses to offer a UTF-8 or a locale encoded string, these objects
  * will offer them themselves and convert from UTF-16 on demand.
  *
  * It's the "mirror" interface of the Qt5Transferable.
diff --git a/vcl/ios/DataFlavorMapping.hxx b/vcl/ios/DataFlavorMapping.hxx
index 936d7fc2f48b..7e527dc09c34 100644
--- a/vcl/ios/DataFlavorMapping.hxx
+++ b/vcl/ios/DataFlavorMapping.hxx
@@ -64,7 +64,7 @@ public:
 
 /* Map a system data flavor to an OpenOffice data flavor.
  Return an empty string if there is not suitable
- mapping from a system data flavor to a OpenOffice data
+ mapping from a system data flavor to an OpenOffice data
  flavor.
   */
 css::datatransfer::DataFlavor systemToOpenOfficeFlavor(const NSString* 
systemDataFlavor) const;
diff --git a/vcl/qt5/Qt5Transferable.cxx b/vcl/qt5/Qt5Transferable.cxx
index e3c5bfa42a1a..81a47871f411 100644
--- a/vcl/qt5/Qt5Transferable.cxx
+++ b/vcl/qt5/Qt5Transferable.cxx
@@ -260,7 +260,7 @@ QStringList Qt5MimeData::formats() const
 lcl_textMimeInfo(rFlavor.MimeType, m_bHaveNoCharset, bHaveUTF16, 
m_bHaveUTF8);
 }
 
-// we provide a locale encoded and an UTF-8 variant, if missing
+// we provide a locale encoded and a UTF-8 variant, if missing
 if (m_bHaveNoCharset || bHaveUTF16 || m_bHaveUTF8)
 {
 // if there is a text representation from LO point of view, it'll be 
UTF-16
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/uiconfig/scalc/ui/conditionalentry.ui |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1a78436290b7dd22df81d6491b656182604d38fd
Author: Caolán McNamara 
AuthorDate: Mon Aug 19 21:34:24 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 20 09:22:45 2019 +0200

Resolves: tdf#126781 don't let width grow to fit condition text

make the label have no part of the width calc by giving it a small
width request and force it to live with with the rest of the dialog
ends up as

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

diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui 
b/sc/uiconfig/scalc/ui/conditionalentry.ui
index 717f9a252048..85134870d0b0 100644
--- a/sc/uiconfig/scalc/ui/conditionalentry.ui
+++ b/sc/uiconfig/scalc/ui/conditionalentry.ui
@@ -40,8 +40,11 @@
 
 
   
+10
 True
 False
+True
+end
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/fldui/fldvar.cxx |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 0576911eec4f5fab4d4dd4f0cd46744b9a567899
Author: Caolán McNamara 
AuthorDate: Mon Aug 19 20:57:39 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 20 09:22:17 2019 +0200

Resolves: tdf#127021 not all formatting options shown for set variable

because we need to call SwNumFormatTreeView::clear to flag we
want them added

following that we then need to insert the extra entries before those
now inserted stock ones

Change-Id: Iccbd3a6b2c9fd48ad823b9dcc7cdfca87d29873c
Reviewed-on: https://gerrit.libreoffice.org/77768
Tested-by: Julien Nabet 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 0f304387ab58..b56f88bd4470 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -680,7 +680,7 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 // fill Format-Listbox
 m_xFormatLB->freeze();
 m_xFormatLB->clear();
-rWidget.clear();
+m_xNumFormatLB->clear(); // flags list as dirty and needing refilling with 
stock entries
 bool bSpecialFormat = false;
 
 if( TYP_GETREFPAGEFLD != nTypeId )
@@ -714,8 +714,9 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 {
 if (!IsFieldEdit() || bSpecialFormat)
 {
-rWidget.append(OUString::number(NUMBERFORMAT_ENTRY_NOT_FOUND), 
SwResId(FMT_MARK_TEXT));
-rWidget.append(OUString::number(NUMBERFORMAT_ENTRY_NOT_FOUND), 
SwResId(FMT_USERVAR_CMD));
+OUString sId(OUString::number(NUMBERFORMAT_ENTRY_NOT_FOUND));
+rWidget.insert(0, SwResId(FMT_MARK_TEXT), &sId, nullptr, 
nullptr);
+rWidget.insert(1, SwResId(FMT_USERVAR_CMD), &sId, nullptr, 
nullptr);
 }
 }
 break;
@@ -724,20 +725,23 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 {
 if (!IsFieldEdit() || bSpecialFormat)
 {
-rWidget.append(OUString::number(NUMBERFORMAT_ENTRY_NOT_FOUND), 
SwResId(FMT_SETVAR_TEXT));
+OUString sId(OUString::number(NUMBERFORMAT_ENTRY_NOT_FOUND));
+rWidget.insert(0, SwResId(FMT_SETVAR_TEXT), &sId, nullptr, 
nullptr);
 }
 }
 break;
 
 case TYP_FORMELFLD:
 {
-rWidget.append(OUString::number(NUMBERFORMAT_ENTRY_NOT_FOUND), 
SwResId(FMT_GETVAR_NAME));
+OUString sId(OUString::number(NUMBERFORMAT_ENTRY_NOT_FOUND));
+rWidget.insert(0, SwResId(FMT_GETVAR_NAME), &sId, nullptr, 
nullptr);
 }
 break;
 
 case TYP_GETFLD:
 {
-rWidget.append(OUString::number(NUMBERFORMAT_ENTRY_NOT_FOUND), 
SwResId(FMT_GETVAR_NAME));
+OUString sId(OUString::number(NUMBERFORMAT_ENTRY_NOT_FOUND));
+rWidget.insert(0, SwResId(FMT_GETVAR_NAME), &sId, nullptr, 
nullptr);
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/test forms/source fpicker/source include/LibreOfficeKit

[Andrea Gelmini (via logerrit)]

 extensions/test/ole/cpnt/readme.txt   |2 +-
 forms/source/component/DatabaseForm.cxx   |2 +-
 fpicker/source/office/commonpicker.cxx|2 +-
 include/LibreOfficeKit/LibreOfficeKit.hxx |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 41e6f0fd99b2e68dfe32d9be3defe60ff36ba8f1
Author: Andrea Gelmini 
AuthorDate: Mon Aug 19 21:44:39 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 09:14:43 2019 +0200

Fix typos

Change-Id: Iab3756a0e27af8a87e4012decdf706d19d0f3e82
Reviewed-on: https://gerrit.libreoffice.org/77757
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/extensions/test/ole/cpnt/readme.txt 
b/extensions/test/ole/cpnt/readme.txt
index b615093069ae..ccac8066a17c 100644
--- a/extensions/test/ole/cpnt/readme.txt
+++ b/extensions/test/ole/cpnt/readme.txt
@@ -1,4 +1,4 @@
-cpnt.cxx contains a uno component that is uses to test the olebridge within a
+cpnt.cxx contains a UNO component that is uses to test the olebridge within a
 JavaScript context.  In particular it has functions using out, in/out and
 sequence parameter that have to be specifically treated in JScript because they
 are represented by IDispatch objects.  Other clients, such as VBScript, VB and
diff --git a/forms/source/component/DatabaseForm.cxx 
b/forms/source/component/DatabaseForm.cxx
index 41e94e519762..9eef1270633e 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -3730,7 +3730,7 @@ Sequence< OUString > SAL_CALL 
ODatabaseForm::getSupportedServiceNames()
 if (query_aggregation(m_xAggregate, xInfo))
 aServices = xInfo->getSupportedServiceNames();
 
-// concat with out own services
+// concat without own services
 return ::comphelper::concatSequences(
 css::uno::Sequence {
 FRM_SUN_FORMCOMPONENT, "com.sun.star.form.FormComponents",
diff --git a/fpicker/source/office/commonpicker.cxx 
b/fpicker/source/office/commonpicker.cxx
index e87d58fb739d..7751cf25316b 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -205,7 +205,7 @@ namespace svt
 
 if ( m_pDlg )
 {
-// synchronize the help id of the dialog with out help URL 
property
+// synchronize the help id of the dialog without help URL 
property
 if ( !m_sHelpURL.isEmpty() )
 {   // somebody already set the help URL while we had no 
dialog yet
 OControlAccess::setHelpURL( m_pDlg, m_sHelpURL, false );
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 517a38a50527..3c81e4a03ae2 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -303,7 +303,7 @@ public:
 }
 
 /**
- * Posts an UNO command to the document.
+ * Posts a UNO command to the document.
  *
  * Example argument string:
  *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/LibreOfficeLight jurt/com offapi/com officecfg/registry

[Andrea Gelmini (via logerrit)]

 ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift  |2 +-
 jurt/com/sun/star/uno/AnyConverter.java |2 +-
 offapi/com/sun/star/security/ExtAltNameType.idl |4 ++--
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |8 
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b6fd78a9fa4bb6e53da8b8216f00bb887e1fd917
Author: Andrea Gelmini 
AuthorDate: Mon Aug 19 21:44:41 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 09:10:12 2019 +0200

Fix typos

Change-Id: Ic987eeb9d99f64611a981282ec5691e4d1cb023d
Reviewed-on: https://gerrit.libreoffice.org/77759
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift 
b/ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift
index 3f94fb470a6e..4e3b4b20e409 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift
+++ b/ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift
@@ -378,7 +378,7 @@ open class Document
 /**
  * Returns a json mapping of the possible values for the given command
  * e.g. {commandName: ".uno:StyleApply", commandValues: {"familyName1" : 
["list of style names in the family1"], etc.}}
- * @param pCommand a uno command for which the possible values are 
requested
+ * @param pCommand a UNO command for which the possible values are 
requested
  * @return {commandName: unoCmd, commandValues: {possible_values}}
  */
 public func getCommandValues(command: String) -> String?
diff --git a/jurt/com/sun/star/uno/AnyConverter.java 
b/jurt/com/sun/star/uno/AnyConverter.java
index a54e7c3a8efe..d36542e1a67a 100644
--- a/jurt/com/sun/star/uno/AnyConverter.java
+++ b/jurt/com/sun/star/uno/AnyConverter.java
@@ -33,7 +33,7 @@ package com.sun.star.uno;
 public class AnyConverter
 {
 /**
- * Determines the type of an any object.
+ * Determines the type of an Any object.
  *
  * @param object any object.
  * @return type object.
diff --git a/offapi/com/sun/star/security/ExtAltNameType.idl 
b/offapi/com/sun/star/security/ExtAltNameType.idl
index 661ac7606289..e87308273695 100644
--- a/offapi/com/sun/star/security/ExtAltNameType.idl
+++ b/offapi/com/sun/star/security/ExtAltNameType.idl
@@ -59,7 +59,7 @@ enum ExtAltNameType
 DIRECTORY_NAME,
 
 /**
- * The entry contains a url.
+ * The entry contains a URL.
  * The value of CertAltNameEntry contains a OUString.
  *
  * @see com::sun::star::security::CertAltNameEntry
@@ -67,7 +67,7 @@ enum ExtAltNameType
 URL,
 
 /**
- * The entry contains a ip address.
+ * The entry contains an IP address.
  * The value of CertAltNameEntry contains a Sequence of sal_Int8.
  *
  * @see com::sun::star::security::CertAltNameEntry
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 14027704ba49..8004747ba92f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -1600,7 +1600,7 @@
   
 
   
-Time in milli seconds to wait between processing
+Time in milliseconds to wait between processing
 preview creation requests with high priority.
   
   Time Between High Priority Requests
@@ -1610,7 +1610,7 @@
   
 
   
-Time in milli seconds to wait between processing
+Time in milliseconds to wait between processing
 preview creation requests with low priority.
   
   Time Between Low Priority Requests
@@ -1620,8 +1620,8 @@
   
 
   
-Time in milli seconds to wait between processing
-preview creation requestsest when show is running.
+Time in milliseconds to wait between processing
+preview creation requests when show is running.
   
   Time Between Requests During Show
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sal/qa/osl/file/osl_File.cxx   |6 +++---
 sal/qa/rtl/ostring/rtl_str.cxx |   12 ++--
 sal/qa/rtl/oustring/rtl_ustr.cxx   |   12 ++--
 sax/source/expatwrap/saxwriter.cxx |2 +-
 sc/source/core/data/validat.cxx|2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 0f689f80e9bd3a0f90422df70426be5b50972871
Author: Andrea Gelmini 
AuthorDate: Mon Aug 19 21:44:43 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 09:07:41 2019 +0200

Fix typos

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

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index fa49b5d967b4..1b32320803e9 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -1870,7 +1870,7 @@ namespace osl_FileStatus
 free(pTV_current);
 free(pTV_access);
 
-CPPUNIT_ASSERT_MESSAGE("test for getAccessTime function: This test 
turns out that UNX pricision is no more than 1 sec, don't know how to test this 
function, in Windows test, it lost hour min sec, only have date time. ",
+CPPUNIT_ASSERT_MESSAGE("test for getAccessTime function: This test 
turns out that UNX precision is no more than 1 sec, don't know how to test this 
function, in Windows test, it lost hour min sec, only have date time. ",
 bOK);
 }
 
@@ -1924,7 +1924,7 @@ namespace osl_FileStatus
 free(pTV_current);
 free(pTV_modify);
 
-CPPUNIT_ASSERT_MESSAGE("test for getModifyTime function: This test 
turns out that UNX pricision is no more than 1 sec, don't know how to improve 
this function.  ",
+CPPUNIT_ASSERT_MESSAGE("test for getModifyTime function: This test 
turns out that UNX precision is no more than 1 sec, don't know how to improve 
this function.  ",
 bOK);
 }
 
@@ -3767,7 +3767,7 @@ namespace osl_DirectoryItem
 nError1 = copyItem.getFileStatus(rFileStatus);
 CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
 
-CPPUNIT_ASSERT_MESSAGE("test for copy_assin_Ctors function: test 
assinment operator here since it is same as copy constructor in test way.",
+CPPUNIT_ASSERT_MESSAGE("test for copy_assin_Ctors function: test 
assignment operator here since it is same as copy constructor in test way.",
 compareFileName(rFileStatus.getFileName(), 
aTmpName2));
 }
 
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index e2d79d812d77..5a7d1a11ef38 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -290,7 +290,7 @@ namespace rtl_str
 
 void indexOfChar_001()
 {
-OString aStr1 = "Line for a indexOfChar.";
+OString aStr1 = "Line for an indexOfChar.";
 
 sal_Int32 nIndex = rtl_str_indexOfChar( aStr1.getStr(), 'L' );
 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
@@ -307,7 +307,7 @@ namespace rtl_str
 
 void indexOfChar_002()
 {
-OString aStr1 = "Line for a indexOfChar.";
+OString aStr1 = "Line for an indexOfChar.";
 sal_Int32 nIndex = rtl_str_indexOfChar( aStr1.getStr(), 'y' );
 
 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -380,13 +380,13 @@ namespace rtl_str
 
 void indexOfStr_000_1()
 {
-OString aStr1 = "Line for a indexOfStr.";
+OString aStr1 = "Line for an indexOfStr.";
 rtl_str_indexOfStr( aStr1.getStr(), 0 );
 }
 
 void indexOfStr_001()
 {
-OString aStr1 = "Line for a indexOfStr.";
+OString aStr1 = "Line for an indexOfStr.";
 
 sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "Line" 
);
 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
@@ -397,13 +397,13 @@ namespace rtl_str
 /* sal_Int32 */ nIndex = rtl_str_indexOfStr( aStr1.getStr(), 
"a" );
 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 9);
 
-/* sal_Int32 */ nIndex = rtl_str_indexOfStr( aStr1.getStr(), 
"a index" );
+/* sal_Int32 */ nIndex = rtl_str_indexOfStr( aStr1.getStr(), 
"an index" );
 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex ==9);
 }
 
 void indexOfStr_002()
 {
-OString aStr1 = "Line for a indexOfStr.";
+OString aStr1 = "Line for an indexOfStr.";
 sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "not 
exist" );
 
 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
diff --git a/sal/qa/rtl/oustri

[Libreoffice-commits] core.git: officecfg/registry pyuno/demo qadevOOo/tests sal/osl sal/qa

[Andrea Gelmini (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs |2 +-
 pyuno/demo/ooextract.py   |2 +-
 qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java|2 +-
 sal/osl/w32/file_url.cxx  |2 +-
 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx|2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 65ae1e182de7ac46e2062dcef0f28a2c1f36b3d2
Author: Andrea Gelmini 
AuthorDate: Mon Aug 19 21:44:42 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 09:06:45 2019 +0200

Fix typos

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs 
b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index 917751492689..83c364838c0f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -930,7 +930,7 @@
 
 
   
-Specifies whether the Image Object Bar or the Text Object 
Bar/Web is the visible toolbar when a image is selected.
+Specifies whether the Image Object Bar or the Text Object 
Bar/Web is the visible toolbar when an image is selected.
   
   -1
 
diff --git a/pyuno/demo/ooextract.py b/pyuno/demo/ooextract.py
index 8a364cd4ed62..d6cce94e80d5 100644
--- a/pyuno/demo/ooextract.py
+++ b/pyuno/demo/ooextract.py
@@ -117,7 +117,7 @@ def usage():
   "by the same system path.\n"
   "\n"+
   "-c  | 
--connection-string=\n" +
-  "The connection-string part of a uno url to where 
the\n" +
+  "The connection-string part of a UNO URL to where 
the\n" +
   "the script should connect to in order to do the 
conversion.\n" +
   "The strings defaults to 
socket,host=localhost,port=2002\n"
   "--html \n"
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java 
b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
index d3dd3160e65e..5765c87d1770 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
@@ -119,7 +119,7 @@ public class AccessibleOutlineView extends TestCase {
 SOfficeFactory SOF = SOfficeFactory.getFactory(
 Param.getMSF());
 
-log.println( "creating a impress document" );
+log.println( "creating an impress document" );
 xImpressDoc = SOF.createImpressDoc(null);
 util.utils.waitForEventIdle(Param.getMSF());
 
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index bed0e734d7c3..e44a17a4d472 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -540,7 +540,7 @@ static bool osl_decodeURL_( rtl_String* strUTF8, 
rtl_uString** pstrDecodedURL )
 pSrc = rtl_string_getStr(strUTF8);
 pSrcEnd = pSrc + nSrcLen;
 
-/* Now decode the URL what should result in an UTF8 string */
+/* Now decode the URL what should result in a UTF-8 string */
 while ( bValidEncoded && pSrc < pSrcEnd )
 {
 switch ( *pSrc )
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx 
b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 6d6d2034d188..63841f6456ef 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -242,7 +242,7 @@ namespace rtl_OStringBuffer
 
 CPPUNIT_ASSERT_MESSAGE
 (
-"two empty strings(with a argu)",
+"two empty strings(with an argu)",
 lastRes && ( aStrBuf2.getCapacity() == 0 ) &&
 ( *(aStrBuf2.getStr()) == '\0' )
 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/framework include/rtl include/svx include/xmloff

[Andrea Gelmini (via logerrit)]

 include/framework/menuconfiguration.hxx |2 +-
 include/rtl/ustring.h   |2 +-
 include/svx/svdlayer.hxx|2 +-
 include/svx/svdsob.hxx  |2 +-
 include/xmloff/unointerfacetouniqueidentifiermapper.hxx |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d44d5af546e52679ee85103329f2a2fdc1cf01be
Author: Andrea Gelmini 
AuthorDate: Mon Aug 19 21:44:40 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 09:06:03 2019 +0200

Fix typos

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

diff --git a/include/framework/menuconfiguration.hxx 
b/include/framework/menuconfiguration.hxx
index 191b0e723713..b1a49249061b 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -82,7 +82,7 @@ class FWE_DLLPUBLIC MenuConfiguration final
 {
 public:
 MenuConfiguration(
-// use const when giving a uno reference by reference
+// use const when giving a UNO reference by reference
 const css::uno::Reference< css::uno::XComponentContext >& 
rxContext );
 
 ~MenuConfiguration();
diff --git a/include/rtl/ustring.h b/include/rtl/ustring.h
index cd6f75e889db..90aff10dd169 100644
--- a/include/rtl/ustring.h
+++ b/include/rtl/ustring.h
@@ -1485,7 +1485,7 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uString_newConcatUtf16L(
 
 The new string results from replacing a number of characters (count),
 starting at the specified position (index) in the original string (str),
-with some new substring (subStr).  If subStr is null, than only a number
+with some new substring (subStr).  If subStr is null, then only a number
 of characters is deleted.
 
 The new string does not necessarily have a reference count of 1, so it
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index eb8e3672aa5c..2289efb32975 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -157,7 +157,7 @@ public:
 void   getLockedLayersODF( SdrLayerIDSet& rOutSet) const;
 
 // Generates a bitfield for settings.xml from the SdrLayerIDSet.
-// Output is a uno sequence of BYTE (which is 'short' in API).
+// Output is a UNO sequence of BYTE (which is 'short' in API).
 void   QueryValue(const SdrLayerIDSet& rViewLayerSet, 
css::uno::Any& rAny);
 };
 
diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx
index 3d3f8c03488d..e67c467cae38 100644
--- a/include/svx/svdsob.hxx
+++ b/include/svx/svdsob.hxx
@@ -82,7 +82,7 @@ public:
 
 void operator&=(const SdrLayerIDSet& r2ndSet);
 
-// initialize this set with a uno sequence of sal_Int8 (e.g. as stored in 
settings.xml)
+// initialize this set with a UNO sequence of sal_Int8 (e.g. as stored in 
settings.xml)
 void PutValue(const css::uno::Any & rAny);
 
 };
diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx 
b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 6489feedd717..a78713f85d13 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -38,7 +38,7 @@ class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper
 public:
 UnoInterfaceToUniqueIdentifierMapper();
 
-/** returns a unique identifier for the given uno object. IF a uno object 
is
+/** returns a unique identifier for the given uno object. If a UNO object 
is
 registered more than once, the returned identifier is always the same.
 */
 const OUString& registerReference( const css::uno::Reference< 
css::uno::XInterface >& rInterface );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sfx2/source/inc/statcach.hxx  |2 +-
 starmath/source/mathmlimport.cxx  |2 +-
 svx/source/svdraw/svdlayer.cxx|4 ++--
 svx/source/unodraw/UnoGraphicExporter.cxx |6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 91d9d09cc04e5d130f4606ad28298f651f8937eb
Author: Andrea Gelmini 
AuthorDate: Mon Aug 19 21:44:46 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 09:05:32 2019 +0200

Fix typos

Change-Id: I77393d6329ef6f2cfc38825791b44d23e8c3af3e
Reviewed-on: https://gerrit.libreoffice.org/77764
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index c61ec60b2774..5b218b9ae9dd 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -120,7 +120,7 @@ inline void SfxStateCache::ClearCache()
 }
 
 
-// registers a item representing this function
+// registers an item representing this function
 
 inline SfxControllerItem* SfxStateCache::ChangeItemLink( SfxControllerItem* 
pNewBinding )
 {
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 48de32c3e0bd..28b3800f9a7f 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -503,7 +503,7 @@ void SmXMLImport::endDocument()
 
 pDocShell->SetText( aText );
 }
-OSL_ENSURE(pModel,"So there *was* a uno problem after all");
+OSL_ENSURE(pModel,"So there *was* a UNO problem after all");
 
 bSuccess = true;
 }
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 625969265092..7085145ff24d 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -43,7 +43,7 @@ void SdrLayerIDSet::operator&=(const SdrLayerIDSet& r2ndSet)
 }
 }
 
-/** initialize this set with a uno sequence of sal_Int8 (e.g. as stored in 
settings.xml)
+/** initialize this set with a UNO sequence of sal_Int8 (e.g. as stored in 
settings.xml)
 */
 void SdrLayerIDSet::PutValue( const css::uno::Any & rAny )
 {
@@ -312,7 +312,7 @@ void SdrLayerAdmin::getLockedLayersODF( SdrLayerIDSet& 
rOutSet) const
 }
 
 // Generates a bitfield for settings.xml from the SdrLayerIDSet.
-// Output is a uno sequence of BYTE (which is 'short' in API).
+// Output is a UNO sequence of BYTE (which is 'short' in API).
 void SdrLayerAdmin::QueryValue(const SdrLayerIDSet& rViewLayerSet, 
css::uno::Any& rAny)
 {
 // tdf#119392 The SdrLayerIDSet in a view is ordered according LayerID, 
but in file
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index da22962311df..6ecd15af5d7c 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -377,7 +377,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, 
EditFieldInfo*, pInfo, void)
 pInfo->SetSdrPage( nullptr );
 }
 
-/** creates an virtual device for the given page
+/** creates a virtual device for the given page
 
 @return the returned VirtualDevice is owned by the caller
 */
@@ -767,7 +767,7 @@ bool GraphicExporter::GetGraphic( ExportSettings const & 
rSettings, Graphic& aGr
 // from the metafile. I asked some other developers why this 
was done, but no
 // one knew a direct reason. Since it's in for long time, it 
may be an old
 // piece of code. MetaFiles save and load ClipRegions with 
polygons with preserving
-// the polygons, so a resolution-indepent roundtrip is 
supported. Removed this
+// the polygons, so a resolution-independent roundtrip is 
supported. Removed this
 // code since it destroys some MetaFiles where ClipRegions are 
used. Anyways,
 // just filtering them out is a hack, at least the 
encapsulated content would need
 // to be clipped geometrically.
@@ -1109,7 +1109,7 @@ void SAL_CALL GraphicExporter::setSourceDocument( const 
Reference< lang::XCompon
 
 try
 {
-// any break inside this one loop while will throw a 
IllegalArgumentException
+// any break inside this one loop while will throw an 
IllegalArgumentException
 do
 {
 mxPage.set( xComponent, UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sfx2/classification/xNL.xsd   |2 +-
 sfx2/qa/complex/sfx2/UndoManager.java |2 +-
 sfx2/source/doc/objstor.cxx   |4 ++--
 sfx2/source/doc/printhelper.cxx   |8 
 sfx2/source/doc/sfxbasemodel.cxx  |   12 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit e0acc90f3748a0973198cc2eb23ef1779ef84d3b
Author: Andrea Gelmini 
AuthorDate: Mon Aug 19 21:44:45 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 09:03:09 2019 +0200

Fix typos

Change-Id: I2b21ba71cd555a88e015871e4f6f5a7747615520
Reviewed-on: https://gerrit.libreoffice.org/77763
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sfx2/classification/xNL.xsd b/sfx2/classification/xNL.xsd
index 1e5cafe16bc8..d82c6ab7bec0 100644
--- a/sfx2/classification/xNL.xsd
+++ b/sfx2/classification/xNL.xsd
@@ -52,7 +52,7 @@



-   A container for 
organisation name details. Same organisaion with many types of names can be 
used by this container
+   A container for 
organisation name details. Same organisation with many types of names can be 
used by this container



diff --git a/sfx2/qa/complex/sfx2/UndoManager.java 
b/sfx2/qa/complex/sfx2/UndoManager.java
index 838958fc1ebf..7e438e852e71 100644
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -654,7 +654,7 @@ public class UndoManager
 m_currentTestCase.verifySingleModificationDocumentState();
 
 // undo the modification, ensure the listener got the proper 
notifications
-assertEquals( "We did not yet do a undo!", 0, 
m_undoListener.getUndoActionCount() );
+assertEquals( "We did not yet do an undo!", 0, 
m_undoListener.getUndoActionCount() );
 i_undoManager.undo();
 assertEquals( "A simple undo does not result in the proper Undo 
count.",
 1, m_undoListener.getUndoActionCount() );
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 6a659b5242a8..b703f0ffdfeb 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1662,7 +1662,7 @@ bool SfxObjectShell::SaveTo_Impl
 {
 SAL_WARN( "sfx.doc", "Storing has failed." );
 
-// in case the document storage was connected to backup 
temporarely it must be disconnected now
+// in case the document storage was connected to backup 
temporarily it must be disconnected now
 if ( bNeedsDisconnectionOnFail )
 ConnectTmpStorage_Impl( pImpl->m_xDocStorage, nullptr );
 }
@@ -3049,7 +3049,7 @@ bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium )
 {
 sal_Int32 nVersion = rMedium.GetFilter()->GetVersion();
 
-// OASIS templates have own mediatypes ( SO7 also actually, but it is 
to late to use them here )
+// OASIS templates have own mediatypes (SO7 also actually, but it is 
to late to use them here)
 const bool bTemplate = rMedium.GetFilter()->IsOwnTemplateFormat()
 && nVersion > SOFFICE_FILEFORMAT_60;
 
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 928196f5fbce..661074a9a102 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -421,7 +421,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< 
beans::PropertyValue >
 }
 
 // The PaperSize may be set only when actually PAPER_USER
-// applies, otherwise the driver could choose a invalid format.
+// applies, otherwise the driver could choose an invalid format.
 if(nPaperFormat == view::PaperFormat_USER && aSetPaperSize.Width())
 {
 // Bug 56929 - MapMode of 100mm which recalculated when
@@ -626,7 +626,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< 
beans::PropertyValue >&
 {
 // OK - it's not a valid URL. But may it's a simple
 // system path directly. It will be supported for historical
-// reasons. Otherwise we break to much external code ...
+// reasons. Otherwise we break too much external code...
 // We try to convert it to a file URL. If its possible
 // we put the system path to the item set and let vcl work 
with it.
 // No ucb or thread will be necessary then. In case it 
couldn't be
@@ -750,7 +750,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< 
beans::PropertyValue >&
 
 // Ok - may be execution before has finished (or started!) printing.
 // And may it was a printing to a file.
-// Now we have to check if we can move the file (if necessary) via ucb to 
his right location.
+// Now we have to che