[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - dictionaries

[Aron Budea (via logerrit)]

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

New commits:
commit ea179bb6f914cb426d1282f2556a72cb3732ebc8
Author: Aron Budea 
AuthorDate: Sun Aug 28 06:21:06 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Aug 28 06:21:06 2022 +0200

Update git submodules

* Update dictionaries from branch 'libreoffice-7-4'
  to 7b1ade6e7803cc6c96a08889ed97a0695f82b09c
  - tdf#149980 updated Ukrainian dictionaries to 5.8.0

Change-Id: I7f71818a3055dd46f5d2cb572f940455fe21b586
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138914
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 
(cherry picked from commit 0e829e3b7a46a4206927a0f3d3c1c7c51836469e)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138900
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index 6ce073a2403b..7b1ade6e7803 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 6ce073a2403b0c381e06d5de89d6e909facffe10
+Subproject commit 7b1ade6e7803cc6c96a08889ed97a0695f82b09c

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

[Thorsten Wagner (via logerrit)]

 vcl/osx/salframe.cxx |   26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)

New commits:
commit 87318da781b429abd8261a8b64bb8d72c79b9da2
Author: Thorsten Wagner 
AuthorDate: Thu Aug 25 10:16:50 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Aug 28 06:20:28 2022 +0200

Adjust button text colors for macOS Big Sur

Change-Id: I1bbdcc97d65afbebce0b2d2e7530f156aa037315
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138799
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 574122a1a91d..2685705287c8 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1288,13 +1288,17 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 aStyleSettings.SetListBoxWindowHighlightColor( aMenuHighlightColor );
 aStyleSettings.SetListBoxWindowHighlightTextColor( aMenuHighlightTextColor 
);
 
+// FIXME: Starting with macOS Big Sur, coloring has changed. Currently 
there is no documentation which system color should be
+// used for some button states and for selected tab text. As a workaround 
the current OS version has to be considered. This code
+// has to be reviewed once issue is covered by documentation.
+
 // Set text colors for buttons and their different status according to OS 
settings, typically white for selected buttons,
 // black otherwise
 
+NSOperatingSystemVersion aOSVersion = { .majorVersion = 10, .minorVersion 
= 16, .patchVersion = 0 };
 Color aControlTextColor(getColor([NSColor controlTextColor], COL_BLACK, 
mpNSWindow));
 Color aSelectedControlTextColor(getColor([NSColor 
selectedControlTextColor], COL_BLACK, mpNSWindow));
 Color aAlternateSelectedControlTextColor(getColor([NSColor 
alternateSelectedControlTextColor], COL_WHITE, mpNSWindow));
-
aStyleSettings.SetDefaultButtonTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetButtonTextColor(aControlTextColor);
 
aStyleSettings.SetDefaultActionButtonTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetActionButtonTextColor(aControlTextColor);
@@ -1305,20 +1309,24 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 aStyleSettings.SetActionButtonRolloverTextColor(aControlTextColor);
 aStyleSettings.SetFlatButtonRolloverTextColor(aControlTextColor);
 
aStyleSettings.SetDefaultButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
-
aStyleSettings.SetButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
 
aStyleSettings.SetDefaultActionButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
-
aStyleSettings.SetActionButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetFlatButtonPressedRolloverTextColor(aControlTextColor);
+if ([NSProcessInfo.processInfo isOperatingSystemAtLeastVersion: 
aOSVersion])
+{
+
aStyleSettings.SetDefaultButtonTextColor(aAlternateSelectedControlTextColor);
+
aStyleSettings.SetButtonPressedRolloverTextColor(aSelectedControlTextColor);
+
aStyleSettings.SetActionButtonPressedRolloverTextColor(aSelectedControlTextColor);
+}
+else
+{
+
aStyleSettings.SetButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
+
aStyleSettings.SetActionButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
+aStyleSettings.SetDefaultButtonTextColor(aSelectedControlTextColor);
+}
 
 // Set text colors for tabs according to OS settings
 
 aStyleSettings.SetTabTextColor(aControlTextColor);
-
-// FIXME: Starting with macOS Big Sur, coloring has changed. Currently 
there is no documentation which system color should be
-// used for selected tab text. As a workaround the current OS version has 
to be considered. This code has to be reviewed once
-// issue is covered by documentation.
-
-NSOperatingSystemVersion aOSVersion = { .majorVersion = 10, .minorVersion 
= 16, .patchVersion = 0 };
 if ([NSProcessInfo.processInfo isOperatingSystemAtLeastVersion: 
aOSVersion])
 aStyleSettings.SetTabHighlightTextColor(aSelectedControlTextColor);
 else

[Libreoffice-commits] core.git: dictionaries

[Aron Budea (via logerrit)]

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

New commits:
commit e3224c23f55f9fa489838bdf3b30b88a798ec33a
Author: Aron Budea 
AuthorDate: Sun Aug 28 03:23:25 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Aug 28 03:23:25 2022 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to 97a0bfd2eda30586e70a090a8ffc1c83f49e1295
  - tdf#149980 updated Ukrainian dictionaries to 5.8.0

Change-Id: I7f71818a3055dd46f5d2cb572f940455fe21b586
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138914
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 

diff --git a/dictionaries b/dictionaries
index 1bee012fc52a..97a0bfd2eda3 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 1bee012fc52a625fe0e0abec071ed1b002fac918
+Subproject commit 97a0bfd2eda30586e70a090a8ffc1c83f49e1295

Amar Cutura license statement

[Amar Cutura]

   All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - dictionaries

[Aron Budea (via logerrit)]

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

New commits:
commit 5135c153abd0a7a108978d66996fce8c8ba8220e
Author: Aron Budea 
AuthorDate: Sat Aug 27 23:42:13 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Aug 27 23:42:13 2022 +0200

Update git submodules

* Update dictionaries from branch 'libreoffice-7-4'
  to 6ce073a2403b0c381e06d5de89d6e909facffe10
  - tdf#142152 replace keywords in Spanish dictionary description

Change-Id: I806c1d8acdacd450454dde13fc507d15edd19e58
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138915
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 
(cherry picked from commit 53a0fe4fc6751fdfd0ad17222aa3c13eb8f2c8d0)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138899
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index ee83d9c5d987..6ce073a2403b 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit ee83d9c5d9879bd203d74300b482fbb8137e2229
+Subproject commit 6ce073a2403b0c381e06d5de89d6e909facffe10

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-7-4' - es/description.xml es/package-description.txt

[Aron Budea (via logerrit)]

 es/description.xml |2 +-
 es/package-description.txt |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6ce073a2403b0c381e06d5de89d6e909facffe10
Author: Aron Budea 
AuthorDate: Sat Aug 27 04:36:41 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 27 23:42:12 2022 +0200

tdf#142152 replace keywords in Spanish dictionary description

Change-Id: I806c1d8acdacd450454dde13fc507d15edd19e58
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138915
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 
(cherry picked from commit 53a0fe4fc6751fdfd0ad17222aa3c13eb8f2c8d0)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138899
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/es/description.xml b/es/description.xml
index e6d0238..b605717 100644
--- a/es/description.xml
+++ b/es/description.xml
@@ -1,7 +1,7 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
 
-  
+  
   
 
   
diff --git a/es/package-description.txt b/es/package-description.txt
index 4d88c35..b5a1c63 100644
--- a/es/package-description.txt
+++ b/es/package-description.txt
@@ -1,8 +1,8 @@
-Ortografía: __CORRECTOR__
-Separación: __SEPARACION__
-Sinónimos: __SINONIMOS__
+Ortografía: 2.6
+Separación: 0.2
+Sinónimos: 24/02/2013
 
-Puede notifcar fallos o mejoras a través de 
https://github.com/sbosio/rla-es/issues
+Puede notificar fallos o mejoras a través de 
https://github.com/sbosio/rla-es/issues
 
 Esta extensión provee de herramientas de asistencia a la escritura (revisión
 ortográfica, separación silábica y sinónimos) para es_AR es_BO es_CL es_CO

GSoC status report - Week 14

[Paris Oplopoios]

Some code cleanup (patch )
https://gerrit.libreoffice.org/c/core/+/138847 (PBM/PVM/PGM)
https://gerrit.libreoffice.org/c/core/+/138740 (SVM)
https://gerrit.libreoffice.org/c/core/+/138730 (TIF)

Next:
Final week! PCX is left, JPG will probably not change as it is 2 functions
in GraphicDescriptor.

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

[Noel Grandin (via logerrit)]

 sw/source/core/doc/docbm.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d152455237f548ed3f3d87689b1f558aa1c057c1
Author: Noel Grandin 
AuthorDate: Sat Aug 27 18:30:08 2022 +0200
Commit: Noel Grandin 
CommitDate: Sat Aug 27 19:19:26 2022 +0200

crashtesting ooo117844-1.docx

regression from
commit 59785c0237f2bc5eaf9e9742bdf30136f3b3d2ba
Author: Noel Grandin 
Date:   Mon Aug 15 15:24:32 2022 +0200
pass SwNode and sal_Int32 to delBookmarks

Change-Id: I2d552cf1bc70850e09b354e11644d59013061377
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138935
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 8e2f0868c560..e3ab61505da6 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1927,9 +1927,9 @@ void DelBookmarks(
 
 if( lcl_Greater( *pRStt, rStt, oStartContentIdx ) && lcl_Lower( 
*pRStt, rEnd, oEndContentIdx ))
 {
-pRStt->nNode = rEnd;
+pRStt->Assign( rEnd );
 if( oEndContentIdx )
-pRStt->nContent = *oEndContentIdx;
+pRStt->SetContent( *oEndContentIdx );
 else
 {
 bool bStt = true;
@@ -1953,9 +1953,9 @@ void DelBookmarks(
 }
 if( lcl_Greater( *pREnd, rStt, oStartContentIdx ) && lcl_Lower( 
*pREnd, rEnd, oEndContentIdx ))
 {
-pREnd->nNode = rStt;
+pREnd->Assign( rStt );
 if( oStartContentIdx )
-pREnd->nContent = *oStartContentIdx;
+pREnd->SetContent( *oStartContentIdx );
 else
 {
 bool bStt = false;

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

[Noel Grandin (via logerrit)]

 svx/source/unodraw/unoshape.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 2824cb9511265876694db8255aa56942a9911e7e
Author: Noel Grandin 
AuthorDate: Thu Aug 25 14:23:59 2022 +0200
Commit: Noel Grandin 
CommitDate: Sat Aug 27 18:08:18 2022 +0200

regression in SvxShape::Notify

from
commit 526f0fce45fb014b09057403ae37c125e5a18655
Author: Noel Grandin 
Date:   Fri Apr 9 12:05:16 2021 +0200
tdf#130326 speed up opening XLSX

which resulted in things staying alive too long, affecting an upcoming
patch of mine

Change-Id: I52a0b35c9be55a554885a39d9e0710379304766b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138811
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 4dd4b8c6535340eec1e94bca9d9635243cdf51d8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138819

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 1f7db69b180d..a0c81180dffe 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -971,14 +971,13 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& 
rHint ) noexcept
 // do cheap checks first, this method is hot
 if (rHint.GetId() != SfxHintId::ThisIsAnSdrHint)
 return;
-const SdrHint* pSdrHint = static_cast(&rHint);
-if (pSdrHint->GetKind() != SdrHintKind::ModelCleared &&
-pSdrHint->GetKind() != SdrHintKind::ObjectChange)
+SdrObject* pSdrObject(mpSdrObjectWeakReference.get());
+if( !pSdrObject )
 return;
-
+const SdrHint* pSdrHint = static_cast(&rHint);
 // #i55919# SdrHintKind::ObjectChange is only interesting if it's for this 
object
-SdrObject* pSdrObject(GetSdrObject());
-if ( !pSdrObject || pSdrHint->GetObject() != pSdrObject )
+if ((pSdrHint->GetKind() != SdrHintKind::ModelCleared) &&
+ (pSdrHint->GetKind() != SdrHintKind::ObjectChange || 
pSdrHint->GetObject() != pSdrObject ))
 return;
 
 uno::Reference< uno::XInterface > xSelf( pSdrObject->getWeakUnoShape() );

[Libreoffice-commits] core.git: 2 commits - dictionaries readlicense_oo/license scp2/source setup_native/source

[Aron Budea (via logerrit)]

 dictionaries|2 +-
 readlicense_oo/license/license.xml  |9 +
 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 7 files changed, 52 insertions(+), 1 deletion(-)

New commits:
commit 7bc61569e25fe0c32063896eced72219cc4fb3f5
Author: Aron Budea 
AuthorDate: Fri Aug 26 04:14:39 2022 +0200
Commit: Andras Timar 
CommitDate: Sat Aug 27 17:55:44 2022 +0200

Add Persian (fa-IR) dictionary to installset

Change-Id: I7abf38be5c8d8c8bfb7eb3a756695054b4275f9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138892
Reviewed-by: Andras Timar 
Tested-by: Jenkins

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index d1dec6ad962f..1fbcd05554fc 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -3733,6 +3733,15 @@
 Public License as published by the Free Software Foundation; either 
version 2 of the License, or (at your
 option) any later version.
 Jump to GPL Version 2
+Persian (Farsi)
+Spelling dictionary
+The following software may be included in this product: Persian 
(Farsi) spelling dictionary. Use of any of this
+software is governed by the terms of the license below:
+Lilak, Persian Spell Checking Dictionary
+Copyright (C) 2015 Mostafa Sedaghat Joo
+Lilak is an open source project for generating Persian dictionary 
for hunspell spell checker based on Persian
+Morphology. This dictionary is free and the source is available under 
Apache License Version 2.0.
+Jump to Apache License 
Version 2.0
 Polish
 Spelling dictionary
 The following software may be included in this product: Polish 
spelling dictionary. Use of any of this
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 3561a2e2ddc8..dc85a8b0154c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -437,6 +437,15 @@ File gid_File_Extension_Dictionary_Et
 End
 #endif
 
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Fa
+   Dir = FILELIST_DIR;
+   Name = "Dictionary/dict-fa.filelist";
+   Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+   TXT_FILE_BODY;
+End
+#endif
+
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Fr
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 7538d02f6a01..582c5e1e1dae 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -335,6 +335,17 @@ Module gid_Module_Root_Extension_Dictionary_Et
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Fa
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FA );
+Files = (gid_File_Extension_Dictionary_Fa);
+InstallOrder = "2000";
+Sortkey = "658";
+Spellcheckerlanguage = "fa";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Fr
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FR );
 Files = (gid_File_Extension_Dictionary_Fr);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 9fcbda9fec88..f6b94dd637e3 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -154,6 +154,12 @@ en-US = "Estonian"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_ET]
 en-US = "Estonian spelling dictionary, and hyphenation rules"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_FA]
+en-US = "Persian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_FA]
+en-US = "Persian Spell Checking Dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_FR]
 en-US = "French"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 6aed60aea7e7..a9c6d01bef30 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -642,6 +642,21 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
+Start
+module = "gid_Module_Root_Extension_Dictionary_Fa"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-fa"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-fa"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVER

[Libreoffice-commits] dictionaries.git: Dictionary_fa.mk fa_IR/description.xml fa_IR/dictionaries.xcu fa_IR/fa-IR.aff fa_IR/fa-IR.dic fa_IR/icon.png fa_IR/LICENSE fa_IR/META-INF fa_IR/package-descript

[Aron Budea (via logerrit)]

 Dictionary_fa.mk  |   21 
 Module_dictionaries.mk|1 
 fa_IR/LICENSE |   15 
 fa_IR/META-INF/manifest.xml   |6 
 fa_IR/README_fa_IR.txt|   26 
 fa_IR/description.xml |   22 
 fa_IR/dictionaries.xcu|   19 
 fa_IR/fa-IR.aff   |  217 
 fa_IR/fa-IR.dic   |104025 
++
 fa_IR/icon.png|binary
 fa_IR/package-description.txt |4 
 11 files changed, 104356 insertions(+)

New commits:
commit 1bee012fc52a625fe0e0abec071ed1b002fac918
Author: Aron Budea 
AuthorDate: Fri Aug 26 04:31:19 2022 +0200
Commit: Andras Timar 
CommitDate: Sat Aug 27 17:55:37 2022 +0200

Add Persian (fa-IR) dictionary

Change-Id: I906c924dfe346898f7f5c69d2c1a3e6ae9424651
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138891
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/Dictionary_fa.mk b/Dictionary_fa.mk
new file mode 100644
index 000..3fd4f70
--- /dev/null
+++ b/Dictionary_fa.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Dictionary_Dictionary,dict-fa,dictionaries/fa_IR))
+
+$(eval $(call gb_Dictionary_add_root_files,dict-fa,\
+   dictionaries/fa_IR/fa-IR.aff \
+   dictionaries/fa_IR/fa-IR.dic \
+   dictionaries/fa_IR/LICENSE \
+   dictionaries/fa_IR/README_fa_IR.txt \
+   dictionaries/fa_IR/icon.png \
+   dictionaries/fa_IR/package-description.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/Module_dictionaries.mk b/Module_dictionaries.mk
index 7b1b961..b565e7a 100644
--- a/Module_dictionaries.mk
+++ b/Module_dictionaries.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_l10n_targets,dictionaries,\
Dictionary_eo \
Dictionary_es \
Dictionary_et \
+   Dictionary_fa \
Dictionary_fr \
Dictionary_gd \
Dictionary_gl \
diff --git a/fa_IR/LICENSE b/fa_IR/LICENSE
new file mode 100644
index 000..ec0ca93
--- /dev/null
+++ b/fa_IR/LICENSE
@@ -0,0 +1,15 @@
+Lilak, Persian Spell Checking Dictionary
+
+Copyright 2015
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/fa_IR/META-INF/manifest.xml b/fa_IR/META-INF/manifest.xml
new file mode 100644
index 000..0383ca4
--- /dev/null
+++ b/fa_IR/META-INF/manifest.xml
@@ -0,0 +1,6 @@
+
+
+http://openoffice.org/2001/manifest";>
+
+
+
diff --git a/fa_IR/README_fa_IR.txt b/fa_IR/README_fa_IR.txt
new file mode 100644
index 000..0da5dca
--- /dev/null
+++ b/fa_IR/README_fa_IR.txt
@@ -0,0 +1,26 @@
+Source
+==
+https://github.com/b00f/lilak
+
+License
+===
+Lilak, Persian Spell Checking Dictionary
+
+Copyright 2015 Mostafa Sedaghat Joo
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+README
+==
+Lilak is an open source project for generating Persian dictionary for hunspell 
spell checker based on Persian Morphology.
+This dictionary is free and the source is available under Apache License 
Version 2.0.
diff --git a/fa_IR/description.xml b/fa_IR/description.xml
new file mode 100644
index 000..3d04cca
--- /dev/null
+++ b/fa_IR/description.xml
@@ -0,0 +1,22 @@
+
+http://openoffice.org/extensions/description/2006";
+xmlns:d="http://openoffice.org/extensions/description/2006";
+xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+
+
+
+
+Lilak, Persian Spell Checking Dictionary
+لیلک، غلط‌ یاب فارسی
+
+
+
+
+
+
+
+
+http://github.com/b00f/lilak"; lang="en">Mostafa 
Sedaghat Joo
+
+
diff --git a/fa_IR/dictionaries.xcu b/fa_IR/dictionaries.xcu
new file mode 100644
index 000..eed43e3
--- /dev/null
+++ b/fa_IR/dictionaries.xcu
@@ -

[Libreoffice-commits] core.git: dictionaries

[Aron Budea (via logerrit)]

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

New commits:
commit 9e1b93e2d586ce6c701c506300f8e51acbfc6168
Author: Aron Budea 
AuthorDate: Sat Aug 27 17:48:38 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Aug 27 17:48:38 2022 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to d201d1180ce044fe49e167d0d5b6d182a0f2850d
  - tdf#142152 replace keywords in Spanish dictionary description

Change-Id: I806c1d8acdacd450454dde13fc507d15edd19e58
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138915
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 

diff --git a/dictionaries b/dictionaries
index b0fa8fc6b50c..d201d1180ce0 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b0fa8fc6b50cb4d528d08ad462b294d2b69e2278
+Subproject commit d201d1180ce044fe49e167d0d5b6d182a0f2850d

[Libreoffice-commits] dictionaries.git: es/description.xml es/package-description.txt

[Aron Budea (via logerrit)]

 es/description.xml |2 +-
 es/package-description.txt |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d201d1180ce044fe49e167d0d5b6d182a0f2850d
Author: Aron Budea 
AuthorDate: Sat Aug 27 04:36:41 2022 +0200
Commit: Aron Budea 
CommitDate: Sat Aug 27 17:48:35 2022 +0200

tdf#142152 replace keywords in Spanish dictionary description

Change-Id: I806c1d8acdacd450454dde13fc507d15edd19e58
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138915
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 

diff --git a/es/description.xml b/es/description.xml
index e6d0238..b605717 100644
--- a/es/description.xml
+++ b/es/description.xml
@@ -1,7 +1,7 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
 
-  
+  
   
 
   
diff --git a/es/package-description.txt b/es/package-description.txt
index 4d88c35..b5a1c63 100644
--- a/es/package-description.txt
+++ b/es/package-description.txt
@@ -1,8 +1,8 @@
-Ortografía: __CORRECTOR__
-Separación: __SEPARACION__
-Sinónimos: __SINONIMOS__
+Ortografía: 2.6
+Separación: 0.2
+Sinónimos: 24/02/2013
 
-Puede notifcar fallos o mejoras a través de 
https://github.com/sbosio/rla-es/issues
+Puede notificar fallos o mejoras a través de 
https://github.com/sbosio/rla-es/issues
 
 Esta extensión provee de herramientas de asistencia a la escritura (revisión
 ortográfica, separación silábica y sinónimos) para es_AR es_BO es_CL es_CO

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

[Caolán McNamara (via logerrit)]

 forms/source/richtext/rtattributes.hxx |2 ++
 sw/source/core/crsr/swcrsr.cxx |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 310a52490749637cd6a6485407fbd1e5e143abe9
Author: Caolán McNamara 
AuthorDate: Sat Aug 27 10:54:17 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 15:30:03 2022 +0200

cid#1500688 silence Dereference after null check

Change-Id: I53ffb3537b2ac5618a9776c946eebf866f725cb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138929
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/forms/source/richtext/rtattributes.hxx 
b/forms/source/richtext/rtattributes.hxx
index b60ac6518562..fa00add450f4 100644
--- a/forms/source/richtext/rtattributes.hxx
+++ b/forms/source/richtext/rtattributes.hxx
@@ -112,6 +112,8 @@ namespace frm
 if ( pItemHandleItem == _rRHS.pItemHandleItem )
 return true;
 
+assert(pItemHandleItem && _rRHS.pItemHandleItem && "otherwise have 
already returned");
+
 return *pItemHandleItem == *_rRHS.pItemHandleItem;
 }
 
commit fdb7e4b97f20e80dadb0c0b24baf5512040cd20d
Author: Andrea Gelmini 
AuthorDate: Sat Aug 27 10:32:54 2022 +0200
Commit: Julien Nabet 
CommitDate: Sat Aug 27 15:29:42 2022 +0200

Fix typo

Change-Id: I70e12e47fd2f72ce68f388861bdbf03cbad3c87f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138918
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 06c73af06b23..d040fcf5cd98 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2090,7 +2090,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 }
 else if (!pFrame->IsInFootnote()) // tdf#150457 Jump to the begin/end
   // of the first/last line only if the
-  // cursor is not inside a footenote
+  // cursor is not inside a footnote
 {
 sal_Int32 nOffset = 0;
 

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

[Andreas Heinisch (via logerrit)]

 sw/source/core/doc/doctxm.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 716f3e73fcedc4c4c107527a49aaec604a7e2c63
Author: Andreas Heinisch 
AuthorDate: Thu Aug 25 21:53:06 2022 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Sat Aug 27 15:13:21 2022 +0200

tdf#150594 - Prevent crash while searching for the next outline node

Change-Id: Ia83968b26f0053815c0da9910aa00f9dde577246
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138850
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 
(cherry picked from commit 33c6dcfaab35a70f8794a67d31fbec636cb485d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138897
Reviewed-by: Julien Nabet 
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 83310172e852..9665c3915714 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -804,8 +804,9 @@ static bool IsHeadingContained(const SwTextNode* pChptrNd, 
const SwNode& rNd)
 else
 {
 // Search for the next outline node which lies not within the 
current chapter node
-while (pChptrNd->GetAttrOutlineLevel()
-   < rONds[nPos]->GetTextNode()->GetAttrOutlineLevel())
+while (nPos > 0
+   && pChptrNd->GetAttrOutlineLevel()
+  < rONds[nPos]->GetTextNode()->GetAttrOutlineLevel())
 nPos--;
 bIsHeadingContained = pChptrNd == rONds[nPos]->GetTextNode();
 }

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

[Andreas Heinisch (via logerrit)]

 sw/source/core/doc/doctxm.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5f03dc914d67725b4d8e949d4e2198c4e9b537ec
Author: Andreas Heinisch 
AuthorDate: Thu Aug 25 21:53:06 2022 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Sat Aug 27 14:24:23 2022 +0200

tdf#150594 - Prevent crash while searching for the next outline node

Change-Id: Ia83968b26f0053815c0da9910aa00f9dde577246
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138850
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 
(cherry picked from commit 33c6dcfaab35a70f8794a67d31fbec636cb485d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138898
Reviewed-by: Ilmari Lauhakangas 

diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 83310172e852..9665c3915714 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -804,8 +804,9 @@ static bool IsHeadingContained(const SwTextNode* pChptrNd, 
const SwNode& rNd)
 else
 {
 // Search for the next outline node which lies not within the 
current chapter node
-while (pChptrNd->GetAttrOutlineLevel()
-   < rONds[nPos]->GetTextNode()->GetAttrOutlineLevel())
+while (nPos > 0
+   && pChptrNd->GetAttrOutlineLevel()
+  < rONds[nPos]->GetTextNode()->GetAttrOutlineLevel())
 nPos--;
 bIsHeadingContained = pChptrNd == rONds[nPos]->GetTextNode();
 }

Chenxiong Qi license statement

[Chenxiong Qi]

All of my past & future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.

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

[Hannah Meeks (via logerrit)]

 vcl/source/window/dialog.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 70c69ba1c48a42b763dd5426bd4f008d950ad967
Author: Hannah Meeks 
AuthorDate: Sat Aug 6 11:50:51 2022 +0100
Commit: Tomaž Vajngerl 
CommitDate: Sat Aug 27 13:17:24 2022 +0200

VBA: make debugging of VBA tests much easier

When basic fails it displays a MessageBox - which is immediately
cancelled. With this we can easily see what it would have said.

Change-Id: Icd0719caa87ede4217fa9731671e36f380cba702
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137897
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 9e766060d9f3..91f5a65b4054 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -945,6 +946,12 @@ bool Dialog::ImplStartExecute()
 SAL_WARN("lok.dialog", "Dialog \"" << 
ImplGetDialogText(this) << "\" is being synchronously executed over an existing 
synchronously executing dialog.");
 }
 
+if (SalInstance::IsRunningUnitTest())
+{ // helps starbasic unit tests show their errors
+std::cerr << "Dialog \"" << ImplGetDialogText(this)
+  << "\"cancelled in silent mode";
+}
+
 SAL_INFO(
 "vcl",
 "Dialog \"" << ImplGetDialogText(this)

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

[Hannah Meeks (via logerrit)]

 sw/qa/core/data/docm/testTables.docm |binary
 sw/qa/core/macros-test.cxx   |8 
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit aa1e77cd1733ba448eaa04fc1853e47a7dc200b3
Author: Hannah Meeks 
AuthorDate: Fri Aug 5 10:54:48 2022 +0100
Commit: Tomaž Vajngerl 
CommitDate: Sat Aug 27 13:16:09 2022 +0200

VBA Add test documents for XTable

Change-Id: Ia12c055addda545574c33a55ba758b3f1d5b0b73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137852
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/sw/qa/core/data/docm/testTables.docm 
b/sw/qa/core/data/docm/testTables.docm
index a3695f667f1e..5d4502ade055 100644
Binary files a/sw/qa/core/data/docm/testTables.docm and 
b/sw/qa/core/data/docm/testTables.docm differ
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 49d5b6ecf586..51b6b4c3cc00 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -113,7 +113,7 @@ void SwMacrosTest::testVba()
 {
 OUString("testDocumentRange.docm"),
 
OUString("vnd.sun.Star.script:Project.Module1.testAll?language=Basic&location=document")
-}
+},
 /*{
 OUString("testSelectionFind.docm"),
 
OUString("vnd.sun.Star.script:Project.Module1.testAll?language=Basic&location=document")
@@ -136,11 +136,11 @@ void SwMacrosTest::testVba()
 {
 OUString("testParagraphFormat.docm"),
 
OUString("vnd.sun.Star.script:Project.ThisDocument.TestAll?language=Basic&location=document")
-},
+},*/
 {
 OUString("testTables.docm"),
-
OUString("vnd.sun.Star.script:Project.ThisDocument.RightPadding?language=Basic&location=document")
-}*/
+
OUString("vnd.sun.Star.script:Project.ThisDocument.TestAll?language=Basic&location=document")
+}
 
 };
 for ( size_t  i=0; i

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

[Caolán McNamara (via logerrit)]

 binaryurp/source/reader.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 341d1462c23214a63293f62c6d5d42a27fd8e6fc
Author: Caolán McNamara 
AuthorDate: Sat Aug 27 10:49:40 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 13:13:29 2022 +0200

cid#1500596 silence Resource leak

Change-Id: I4600c9cd0f7fdea698750ca416fc7f46dcebf23c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138928
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 5f8518742147..393d8312e43a 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -447,6 +447,7 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, 
sal_uInt8 flags1) {
 uno_threadpool_putJob(
 bridge_->getThreadPool(), tid.getHandle(), resp.get(), nullptr,
 false);
+// coverity[leaked_storage] - "Bridge::makeCall" destroys resp 
when received
 resp.release();
 break;
 }

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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/wrtww8.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b9cf72d76014854753f5c609208f0784a60dbd45
Author: Caolán McNamara 
AuthorDate: Sat Aug 27 10:46:03 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 13:13:08 2022 +0200

cid#1500569 silence Explicit null dereferenced

Change-Id: I55b765f12f0e77f1f4ef4cbce9d6f2c9b661d370
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138927
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 331b0038cdb9..8e9ceb3ece98 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3743,6 +3743,8 @@ ErrCode SwWW8Writer::WriteStorage()
 
 if (xPackageEncryption)
 {
+assert(pSotStorageStream && m_pStg && "because always set if 
xPackageEncryption was set");
+
 m_pStg->Commit();
 pSotStorageStream->Seek(0);
 

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

[Noel Grandin (via logerrit)]

 sc/inc/document.hxx |2 +-
 sc/inc/fmtuno.hxx   |2 +-
 sc/qa/unit/subsequent_filters_test.cxx  |4 ++--
 sc/qa/unit/subsequent_filters_test2.cxx |2 +-
 sc/qa/unit/ucalc_formula.cxx|2 +-
 sc/source/core/data/documen4.cxx|2 +-
 sc/source/core/data/patattr.cxx |4 ++--
 sc/source/core/tool/detfunc.cxx |2 +-
 sc/source/filter/excel/xicontent.cxx|2 +-
 sc/source/filter/xml/xmlcelli.cxx   |2 +-
 sc/source/ui/unoobj/cellsuno.cxx|2 +-
 sc/source/ui/unoobj/fmtuno.cxx  |2 +-
 sc/source/ui/view/cellsh2.cxx   |2 +-
 sc/source/ui/view/gridwin.cxx   |2 +-
 sc/source/ui/view/viewfun2.cxx  |2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit e3e49d07e2feebcec631eed98bea5e3f6f6ab572
Author: Noel Grandin 
AuthorDate: Sat Aug 27 08:46:31 2022 +0200
Commit: Noel Grandin 
CommitDate: Sat Aug 27 13:09:24 2022 +0200

sal_uLong->sal_uInt32 in ValidationEntry

we are already using sal_uInt32 in various places, and passing
this through SfxUInt32Item

Change-Id: Iea06b59edc56632b823729462516a6b5fb74e28a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138917
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 4dab1da8158b..41b7d71a63e7 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1867,7 +1867,7 @@ public:
 
 voidSetCondFormList( 
ScConditionalFormatList* pList, SCTAB nTab );
 SC_DLLPUBLIC sal_uLong  AddValidationEntry( const 
ScValidationData& rNew );
-SC_DLLPUBLIC const ScValidationData*GetValidationEntry( sal_uLong 
nIndex ) const;
+SC_DLLPUBLIC const ScValidationData*GetValidationEntry( sal_uInt32 
nIndex ) const;
 
 SC_DLLPUBLIC ScConditionalFormatList*   GetCondFormList( SCTAB nTab ) 
const;
 
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 75d4c099ca55..81d1532381ea 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -189,7 +189,7 @@ private:
 public:
 
 ScTableValidationObj() = delete;
-ScTableValidationObj(const ScDocument& rDoc, 
sal_uLong nKey,
+ScTableValidationObj(const ScDocument& rDoc, 
sal_uInt32 nKey,
 const 
formula::FormulaGrammar::Grammar eGrammar);
 virtual ~ScTableValidationObj() override;
 
diff --git a/sc/qa/unit/subsequent_filters_test.cxx 
b/sc/qa/unit/subsequent_filters_test.cxx
index 62c0cfb98c8a..9149d4379db4 100644
--- a/sc/qa/unit/subsequent_filters_test.cxx
+++ b/sc/qa/unit/subsequent_filters_test.cxx
@@ -1413,12 +1413,12 @@ struct ValDataTestParams
 OUString aErrorTitle;
 OUString aErrorMessage;
 ScValidErrorStyle eErrorStyle;
-sal_uLong nExpectedIndex;
+sal_uInt32 nExpectedIndex;
 
 ValDataTestParams( ScValidationMode eMode, ScConditionMode eOp,
const OUString& aExpr1, const OUString& aExpr2, 
ScDocument& rDoc,
const ScAddress& aPos, const OUString& aETitle, const 
OUString& aEMsg,
-   ScValidErrorStyle eEStyle, sal_uLong nIndex ):
+   ScValidErrorStyle eEStyle, sal_uInt32 nIndex ):
 eValMode(eMode), eCondOp(eOp), aStrVal1(aExpr1),
 aStrVal2(aExpr2), rDocument(rDoc), aPosition(aPos),
 aErrorTitle(aETitle), aErrorMessage(aEMsg),
diff --git a/sc/qa/unit/subsequent_filters_test2.cxx 
b/sc/qa/unit/subsequent_filters_test2.cxx
index 8f747f5aff03..782b3a2c497e 100644
--- a/sc/qa/unit/subsequent_filters_test2.cxx
+++ b/sc/qa/unit/subsequent_filters_test2.cxx
@@ -1252,7 +1252,7 @@ void checkValidationFormula(const ScAddress& rPos, const 
ScDocument& rDoc,
 {
 const SfxUInt32Item* pItem = rDoc.GetAttr(rPos, ATTR_VALIDDATA);
 CPPUNIT_ASSERT(pItem);
-sal_uLong nKey = pItem->GetValue();
+sal_uInt32 nKey = pItem->GetValue();
 const ScValidationData* pData = rDoc.GetValidationEntry(nKey);
 CPPUNIT_ASSERT(pData);
 
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 480c009b13dc..7463f1a23f57 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -4626,7 +4626,7 @@ void TestFormula::testFormulaRefUpdateValidity()
 SC_VALID_LIST, ScConditionMode::Equal, "C2:C4", "", *m_pDoc, 
ScAddress(0,1,0), "", "",
 m_pDoc->GetGrammar(), m_pDoc->GetGrammar());
 
-sal_uLong nIndex = m_pDoc->AddValidationEntry(aData);
+sal_uInt32 nIndex = m_pDoc->AddValidationEntry(aData);
 SfxUInt32Item aItem(ATTR_VALIDDATA, nIndex);
 
 ScPatternAttr aNewAttrs(
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 9aa39d66ca94..e7945b773d9d 100644
--

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

[Noel Grandin (via logerrit)]

 sc/source/filter/excel/xecontent.cxx |   12 ++--
 sc/source/filter/excel/xetable.cxx   |2 +-
 sc/source/filter/inc/xecontent.hxx   |   10 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 56a654ae337e48f5845252e91a95cf9a63ed3388
Author: Noel Grandin 
AuthorDate: Fri Aug 26 20:53:12 2022 +0200
Commit: Noel Grandin 
CommitDate: Sat Aug 27 13:08:20 2022 +0200

sal_uLong->sal_uInt32 in XclExpDV

we are already passing this through ATTR_VALIDDATA which is
a SfxUInt32Item

Change-Id: I491a85379a2f4900c70f3eb92f5be3f3c16a1d42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138916
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index c8de11d2548f..c5954bc06bef 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1673,7 +1673,7 @@ void lcl_SetValidationText(const OUString& rText, 
XclExpString& rValidationText)
 
 } // namespace
 
-XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
+XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uInt32 nScHandle ) :
 XclExpRecord( EXC_ID_DV ),
 XclExpRoot( rRoot ),
 mnFlags( 0 ),
@@ -1845,7 +1845,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong 
nScHandle ) :
 else
 {
 OSL_FAIL( "XclExpDV::XclExpDV - missing core data" );
-mnScHandle = ULONG_MAX;
+mnScHandle = SAL_MAX_UINT32;
 }
 }
 
@@ -1861,7 +1861,7 @@ void XclExpDV::InsertCellRange( const ScRange& rRange )
 bool XclExpDV::Finalize()
 {
 GetAddressConverter().ConvertRangeList( maXclRanges, maScRanges, true );
-return (mnScHandle != ULONG_MAX) && !maXclRanges.empty();
+return (mnScHandle != SAL_MAX_UINT32) && !maXclRanges.empty();
 }
 
 void XclExpDV::WriteBody( XclExpStream& rStrm )
@@ -1938,7 +1938,7 @@ XclExpDval::~XclExpDval()
 {
 }
 
-void XclExpDval::InsertCellRange( const ScRange& rRange, sal_uLong nScHandle )
+void XclExpDval::InsertCellRange( const ScRange& rRange, sal_uInt32 nScHandle )
 {
 if( GetBiff() == EXC_BIFF8 )
 {
@@ -1983,7 +1983,7 @@ void XclExpDval::SaveXml( XclExpXmlStream& rStrm )
 rWorksheet->endElement( XML_dataValidations );
 }
 
-XclExpDV& XclExpDval::SearchOrCreateDv( sal_uLong nScHandle )
+XclExpDV& XclExpDval::SearchOrCreateDv( sal_uInt32 nScHandle )
 {
 // test last found record
 if( mxLastFoundDV && (mxLastFoundDV->GetScHandle() == nScHandle) )
@@ -1996,7 +1996,7 @@ XclExpDV& XclExpDval::SearchOrCreateDv( sal_uLong 
nScHandle )
 size_t nFirstPos = 0;
 size_t nLastPos = maDVList.GetSize() - 1;
 bool bLoop = true;
-sal_uLong nCurrScHandle = ::std::numeric_limits< sal_uLong >::max();
+sal_uInt32 nCurrScHandle = ::std::numeric_limits< sal_uInt32 >::max();
 while( (nFirstPos <= nLastPos) && bLoop )
 {
 nCurrPos = (nFirstPos + nLastPos) / 2;
diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index f8afeb672fa9..146f6a06833b 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2750,7 +2750,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot 
) :
 // data validation
 if( ScfTools::CheckItem( rItemSet, ATTR_VALIDDATA, false ) )
 {
-sal_uLong nScHandle = rItemSet.Get( ATTR_VALIDDATA 
).GetValue();
+sal_uInt32 nScHandle = rItemSet.Get( ATTR_VALIDDATA 
).GetValue();
 ScRange aScRange( aScPos );
 aScRange.aEnd.SetCol( nLastScCol );
 mxDval->InsertCellRange( aScRange, nScHandle );
diff --git a/sc/source/filter/inc/xecontent.hxx 
b/sc/source/filter/inc/xecontent.hxx
index ba85f1d0d99f..07318a037ca4 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -314,11 +314,11 @@ private:
 class XclExpDV : public XclExpRecord, protected XclExpRoot
 {
 public:
-explicitXclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle 
);
+explicitXclExpDV( const XclExpRoot& rRoot, sal_uInt32 
nScHandle );
 virtual ~XclExpDV() override;
 
 /** Returns the core handle of the validation data. */
-sal_uLongGetScHandle() const { return mnScHandle; }
+sal_uInt32  GetScHandle() const { return mnScHandle; }
 
 /** Inserts a new cell range into the cell range list. */
 voidInsertCellRange( const ScRange& rPos );
@@ -346,7 +346,7 @@ private:
 XclTokenArrayRefmxTokArr2;  /// Formula for second condition.
 OUStringmsFormula2; /// OOXML Formula for second condition.
 sal_uInt32  mnFlags;/// Miscellaneous flags.
-sal_uLong   mnScHandle; /// The core handle for quick list 
search.
+sal_uInt32  mnScHandle; /// The core handle for 

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/dochdl/gloshdl.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d341313d3107f0480523378a464252585b17403b
Author: Caolán McNamara 
AuthorDate: Sat Aug 27 10:42:15 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 12:48:41 2022 +0200

cid#1500545 silence Explicit null dereferenced

Change-Id: Ie8cb87ab80a148a79510591fcd089c0bc230612e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138926
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/uibase/dochdl/gloshdl.cxx 
b/sw/source/uibase/dochdl/gloshdl.cxx
index c276f59ac6ce..d7a48ed8cd16 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -675,8 +675,9 @@ bool SwGlossaryHdl::ImportGlossaries( const OUString& rName 
)
 SfxMedium aMed( rName, StreamMode::READ, nullptr, nullptr );
 SfxFilterMatcher aMatcher( "swriter" );
 aMed.UseInteractionHandler( true );
-if (!aMatcher.GuessFilter(aMed, pFilter, SfxFilterFlags::NONE))
+if (aMatcher.GuessFilter(aMed, pFilter, SfxFilterFlags::NONE) == 
ERRCODE_NONE)
 {
+assert(pFilter && "success means pFilter was set");
 SwTextBlocks *pGlossary = nullptr;
 aMed.SetFilter( pFilter );
 Reader* pR = SwReaderWriter::GetReader( pFilter->GetUserData() );

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

[Caolán McNamara (via logerrit)]

 binaryurp/source/reader.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ea892cc0ea96f94c5a51227b897694f18b2b785b
Author: Caolán McNamara 
AuthorDate: Sat Aug 27 10:39:26 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 12:47:58 2022 +0200

cid#1500523 silence Resource leak

Change-Id: I9c2d026cb71615ac3121f47e47a6b0b163e820f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138925
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index cbd18f1d8252..5f8518742147 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -338,6 +338,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
 uno_threadpool_putJob(
 bridge_->getThreadPool(), tid.getHandle(), req.get(), &request,
 !synchronous);
+// coverity[leaked_storage] - "request" destroys req when executed
 req.release();
 }
 }

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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8par.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa81005151c4c266173cf7460b4db87339c921f5
Author: Caolán McNamara 
AuthorDate: Sat Aug 27 10:33:42 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 12:47:39 2022 +0200

cid#1500516 Explicit null dereferenced

Change-Id: I3fda15451e55d4ee1b296cddb1f6933d81faae3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138924
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 18610cc41f5a..fc9d7a64d780 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -264,8 +264,8 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, 
SwDocShell const * pDocS
 {
 xLongName.reset(new OUString(read_uInt16s_ToOUString(rStrm, 
nStrLen - 1)));
 rStrm.SeekRel(sizeof(sal_Unicode)); // skip null-byte at end
+lclGetAbsPath( *xLongName, 0 , pDocShell);
 }
-lclGetAbsPath( *xLongName, 0 , pDocShell);
 }
 // file link or URL
 else if( ::get_flag( nFlags, WW8_HLINK_BODY ) )

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

[Caolán McNamara (via logerrit)]

 svx/source/dialog/svxruler.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 97622503fe7ed58820b7dfc813b3b3ea8f5ad057
Author: Caolán McNamara 
AuthorDate: Sat Aug 27 10:28:39 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 12:47:21 2022 +0200

cid#1500455 Dereference after null check

Change-Id: I5cbc1d182821b88514077db5ff2c436f62372bef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138923
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index e1308ff749c3..4d873c23773e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2902,6 +2902,7 @@ void SvxRuler::CalcMinMax()
 break;
 }
   case RulerDragSize::N2:
+if (mxColumnItem)
 {
 nMaxLeft = lNullPix + mpBorders[nIdx].nPos;
 if(nIdx == mxColumnItem->Count()-2) { // last column
@@ -2924,7 +2925,7 @@ void SvxRuler::CalcMinMax()
 nMaxRight += mpBorders[nIdx].nPos +
 mpBorders[nIdx].nWidth;
 }
-}
+}
 nMaxRight -= glMinFrame;
 nMaxRight -= mpBorders[nIdx].nWidth;
 break;

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

[Caolán McNamara (via logerrit)]

 sw/source/core/text/txtcache.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d455bf3665a4539ec64c6cf6ece76437a2c4cf75
Author: Caolán McNamara 
AuthorDate: Sat Aug 27 10:21:35 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 12:46:39 2022 +0200

cid#1500408 silence Resource leak

Change-Id: Ic969e0dac9d5fceb2c14daee37eee44305c15220
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138922
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index e71be076fabb..654953e19940 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -41,7 +41,10 @@ public:
 void SetPara(SwParaPortion* pNew, bool bDelete)
 {
 if (!bDelete)
+{
+// coverity[leaked_storage] - intentional, ownership transfered
 (void)m_pLine.release();
+}
 m_pLine.reset(pNew);
 }
 };

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

[Caolán McNamara (via logerrit)]

 qadevOOo/tests/java/ifc/i18n/_XTransliteration.java |   14 ++
 1 file changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 45e54afffa40c1f2bf3c98a3229a2137c050c0fc
Author: Caolán McNamara 
AuthorDate: Sat Aug 27 10:15:07 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 12:46:16 2022 +0200

cid#1509234 DCN: Don't Catch NullPointer Exception

and

cid#1509229 DCN: Don't Catch NullPointer Exception

Change-Id: I113de964ff07fc771ac64acb8583341cd518d0e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138921
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java 
b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java
index eff58351f20e..49ee580d3b32 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java
@@ -321,12 +321,7 @@ public class _XTransliteration extends MultiMethodTest {
 
 boolean ret = true ;
 
-int res = -666 ;
-try {
-res = oObj.compareSubstring(str1, p1, len1, str2, p2, len2);
-} catch (NullPointerException e) {
-log.println("Exception while method calling occurs :" + e);
-}
+int res = oObj.compareSubstring(str1, p1, len1, str2, p2, len2);
 
 if (res != expRes) {
 log.print("Comparing FAILED; return: " + res + ", expected: " +
@@ -402,12 +397,7 @@ public class _XTransliteration extends MultiMethodTest {
 
 boolean ret = true ;
 
-int res = -666 ;
-try {
-res = oObj.compareString(str1, str2);
-} catch (NullPointerException e) {
-log.println("Exception while method calling occurs :" + e);
-}
+int res = oObj.compareString(str1, str2);
 
 if (res == expRes) {
 log.println("Comparing of '" + str1 + "' and '" + str2 + "' OK" );

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

[Caolán McNamara (via logerrit)]

 external/cairo/cairo/san.patch.0 |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 995ae3dc84a9c220b62086664c8ad4a161401cc7
Author: Caolán McNamara 
AuthorDate: Sat Aug 27 10:12:36 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 12:45:52 2022 +0200

ofz: -Wp,-D_FORTIFY_SOURCE=2 in cairo a problem with msan

Change-Id: I5c7bc7b9a370ee3a5c7dd3f7a2c92c5f2b193d58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138920
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/external/cairo/cairo/san.patch.0 b/external/cairo/cairo/san.patch.0
index 272fef628aee..54cf805d5865 100644
--- a/external/cairo/cairo/san.patch.0
+++ b/external/cairo/cairo/san.patch.0
@@ -1,3 +1,15 @@
+--- configure  2022-08-27 10:09:35.721992976 +0100
 configure  2022-08-27 10:10:00.363873391 +0100
+@@ -14940,7 +14940,8 @@
+ 
+ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+ 
+-MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
++# breaks msan
++# MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+ 
+ # invalidate cached value if MAYBE_WARN has changed
+ if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then
 --- src/cairo-fixed-private.h
 +++ src/cairo-fixed-private.h
 @@ -61,7 +61,7 @@

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

[Povilas Kanapickas (via logerrit)]

 sd/source/ui/inc/ViewShell.hxx |1 
 sd/source/ui/view/viewshel.cxx |   44 +
 2 files changed, 45 insertions(+)

New commits:
commit 85ab77d241ce3bc6adca26d541873583bce2d9d0
Author: Povilas Kanapickas 
AuthorDate: Thu Aug 25 00:18:32 2022 +0300
Commit: Caolán McNamara 
CommitDate: Sat Aug 27 10:14:31 2022 +0200

sd: react to touchpad zoom gestures in ViewShell

Zoom touchpad gesture now works in the main Impress window to zoom in
and out of the main slide.

Change-Id: I50e2fef668b1670e446068200f65337ec5ab1a94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138791
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 5454639687ed..a7b24ef57759 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -455,6 +455,7 @@ protected:
 rtl::Reference   mxCurrentFunction;
 rtl::Reference   mxOldFunction;
 std::unique_ptr mpZoomList;
+double mfLastZoomScale;
 
 Point   maViewPos;
 SizemaViewSize;
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 296b42d064c7..efc4d7a7687f 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -178,6 +178,7 @@ void ViewShell::construct()
 mpView = nullptr;
 mpFrameView = nullptr;
 mpZoomList = nullptr;
+mfLastZoomScale = 0;
 mbStartShowWithDialog = false;
 mnPrintedHandoutPageNum = 1;
 mnPrintedHandoutPageCount = 0;
@@ -751,6 +752,49 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& 
rCEvt, ::sd::Window* pWi
 }
 break;
 
+case CommandEventId::GestureZoom:
+{
+const CommandGestureZoomData* pData = rCEvt.GetGestureZoomData();
+
+Reference 
xSlideShowController(SlideShow::GetSlideShowController(GetViewShellBase()));
+
+if (pData->meEventType == GestureEventZoomType::Begin)
+{
+mfLastZoomScale = pData->mfScaleDelta;
+bDone = true;
+break;
+}
+
+if (pData->meEventType == GestureEventZoomType::Update)
+{
+double deltaBetweenEvents = (pData->mfScaleDelta - 
mfLastZoomScale) / mfLastZoomScale;
+mfLastZoomScale = pData->mfScaleDelta;
+
+if (pData != nullptr && !GetDocSh()->IsUIActive() && 
!xSlideShowController.is())
+{
+const ::tools::Long nOldZoom = 
GetActiveWindow()->GetZoom();
+::tools::Long nNewZoom;
+Point aOldMousePos = 
GetActiveWindow()->PixelToLogic(rCEvt.GetMousePosPixel());
+
+nNewZoom = nOldZoom + deltaBetweenEvents * 100;
+nNewZoom = std::max<::tools::Long>(pWin->GetMinZoom(), 
nNewZoom);
+nNewZoom = std::min<::tools::Long>(pWin->GetMaxZoom(), 
nNewZoom);
+
+SetZoom(nNewZoom);
+
+// Keep mouse at same doc point before zoom
+Point aNewMousePos = 
GetActiveWindow()->PixelToLogic(rCEvt.GetMousePosPixel());
+SetWinViewPos(GetWinViewPos() - (aNewMousePos - 
aOldMousePos));
+
+Invalidate(SID_ATTR_ZOOM);
+Invalidate(SID_ATTR_ZOOMSLIDER);
+}
+}
+
+bDone = true;
+}
+break;
+
 default:
 break;
 }