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

2023-05-10 Thread Juergen Funk (via logerrit) 
 cui/uiconfig/ui/widgettestdialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88bd66d258de5fee3d35aba80c61fec49eb2a969
Author: Juergen Funk 
AuthorDate: Wed May 10 14:23:53 2023 +0200
Commit: Caolán McNamara 
CommitDate: Wed May 10 16:08:38 2023 +0200

Double name 'liststore1' fixed

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

diff --git a/cui/uiconfig/ui/widgettestdialog.ui 
b/cui/uiconfig/ui/widgettestdialog.ui
index 62a35a0b120a..00333de38075 100644
--- a/cui/uiconfig/ui/widgettestdialog.ui
+++ b/cui/uiconfig/ui/widgettestdialog.ui
@@ -90,7 +90,7 @@
 True
 False
 False
-liststore1
+liststore4
 off
 True
 0

[Libreoffice-commits] core.git: officecfg/registry

2023-05-10 Thread Juergen Funk (via logerrit) 
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   48 
--
 1 file changed, 48 deletions(-)

New commits:
commit af1638985beaadb2254ca22e91de23f21690f74e
Author: Juergen Funk 
AuthorDate: Mon May 8 13:15:42 2023 +0200
Commit: Maxim Monastirsky 
CommitDate: Wed May 10 13:48:49 2023 +0200

Revert duplicate shortcut definition

This reverts the Accelerators.xcu part of 
b6af287527d42f8cf4bc43047fe0ed6130420d6b

The key combination for Ctrl-F is already defined in the global section,
it is not necessary to define it in other modules.

Change-Id: I44047f998487b58185ceb19c19f06ee44797c5d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151503
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index f2facf38577c..a26b90b298d6 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1002,12 +1002,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:RepeatSearch
   
 
-
-  
-I10N SHORTCUTS - NO 
TRANSLATE
-vnd.sun.star.findbar:FocusToFindbar
-  
-
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -2526,12 +2520,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:UpdateInputFields
   
 
-
-  
-I10N SHORTCUTS - NO 
TRANSLATE
-vnd.sun.star.findbar:FocusToFindbar
-  
-
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -3195,12 +3183,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:TextFitToSize
   
 
-
-  
-I10N SHORTCUTS - NO 
TRANSLATE
-vnd.sun.star.findbar:FocusToFindbar
-  
-
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -4018,12 +4000,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:UpdateInputFields
   
 
-
-  
-I10N SHORTCUTS - NO 
TRANSLATE
-vnd.sun.star.findbar:FocusToFindbar
-  
-
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -4805,12 +4781,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:UpdateInputFields
   
 
-
-  
-I10N SHORTCUTS - NO 
TRANSLATE
-vnd.sun.star.findbar:FocusToFindbar
-  
-
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -5598,12 +5568,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:RepeatSearch
   
 
-
-  
-I10N SHORTCUTS - NO 
TRANSLATE
-vnd.sun.star.findbar:FocusToFindbar
-  
-
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -6443,12 +6407,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:UpdateInputFields
   
 
-
-  
-I10N SHORTCUTS - NO 
TRANSLATE
-vnd.sun.star.findbar:FocusToFindbar
-  
-
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -7297,12 +7255,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:UpdateInputFields
   
 
-
-  
-I10N SHORTCUTS - NO 
TRANSLATE
-vnd.sun.star.findbar:FocusToFindbar
-  
-
 
   
 I10N SHORTCUTS - NO 
TRANSLATE

[Libreoffice-commits] core.git: bin/list-dispatch-commands.py include/sfx2 officecfg/registry sfx2/sdi sfx2/source

2023-05-04 Thread Juergen Funk (via logerrit) 
 bin/list-dispatch-commands.py  |   14 ++
 include/sfx2/sfxsids.hrc   |1 
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   48 
++
 sfx2/sdi/frmslots.sdi  |5 +
 sfx2/sdi/sfx.sdi   |   16 +++
 sfx2/source/control/msg.cxx|5 -
 6 files changed, 84 insertions(+), 5 deletions(-)

New commits:
commit b6af287527d42f8cf4bc43047fe0ed6130420d6b
Author: Juergen Funk 
AuthorDate: Wed May 3 11:08:43 2023 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu May 4 08:15:27 2023 +0200

tdf#153587 Display CTRL+F in the keyboard shortcuts list

* Add the missing entry to Accelerators.xcu
* Handle vnd.sun.star.findbar:-command the same as .uno commands

Change-Id: I69d441d63a6b0478a07c9ef10665b7d59d3334b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151322
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/bin/list-dispatch-commands.py b/bin/list-dispatch-commands.py
index db8bff6e7d95..c5860c193bc4 100755
--- a/bin/list-dispatch-commands.py
+++ b/bin/list-dispatch-commands.py
@@ -101,6 +101,12 @@ def newcommand(unocommand):
'arguments': ''}
 return cmd
 
+def get_uno(cmd):
+if cmd.startswith('FocusToFindbar'):
+cmd = 'vnd.sun.star.findbar:' + cmd
+else:
+cmd = '.uno:' + cmd
+return cmd
 
 def analyze_xcu(all_commands):
 for filename in XCU_FILES:
@@ -115,7 +121,7 @@ def analyze_xcu(all_commands):
 elif popups is True and line == '':
 popups = False
 continue
-if '.uno:RepeatSearch
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+vnd.sun.star.findbar:FocusToFindbar
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -2520,6 +2526,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:UpdateInputFields
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+vnd.sun.star.findbar:FocusToFindbar
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -3183,6 +3195,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:TextFitToSize
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+vnd.sun.star.findbar:FocusToFindbar
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -4000,6 +4018,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:UpdateInputFields
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+vnd.sun.star.findbar:FocusToFindbar
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -4781,6 +4805,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:UpdateInputFields
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+vnd.sun.star.findbar:FocusToFindbar
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -5568,6 +5598,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:RepeatSearch
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+vnd.sun.star.findbar:FocusToFindbar
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -6407,6 +6443,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:UpdateInputFields
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+vnd.sun.star.findbar:FocusToFindbar
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -7255,6 +7297,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:UpdateInputFields
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+vnd.sun.star.findbar:FocusToFindbar
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index 1126a0f195a0..b10f05a4ffbd 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -156,6 +156,11 @@ interface Window
 [
 ]
 
+// Only for Accelerator-Command field
+SID_SEARCH
+[
+]
+
 // Only for Designers: Slot must be present
 SID_STYLE_DRAGHIERARCHIE
 [
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 16e75ded94dc..4adb0f1b94fe 100644
--- a/sfx2/sdi/sfx.sdi
+++

[Libreoffice-commits] core.git: g

2023-04-01 Thread Juergen Funk (via logerrit) 
 g |4 
 1 file changed, 4 deletions(-)

New commits:
commit cd013e66711c056c52ffd0839e782f6ee9c2dabd
Author: Juergen Funk 
AuthorDate: Thu Mar 30 11:43:47 2023 +0200
Commit: Mike Kaganski 
CommitDate: Sat Apr 1 13:28:14 2023 +0200

git-hooks: remove hint in './g -z'

In the patch 05ea4ac1952c546a81781ac0662747dbe6073616 the hint
is too mutch and the elsewhere I think it makes no sense, remove.

Change-Id: I1c13e593f673f2cab9a307f57f59efa1fbd903c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149761
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/g b/g
index d64c9cde4687..377890a3396a 100755
--- a/g
+++ b/g
@@ -147,10 +147,6 @@ refresh_all_hooks()
 fi
 fi
 
-if [ $wingit -eq 0 ] && [ "$OSTYPE" == "cygwin" ] ; then
-echo "When you using GIT for Windows, and get git-error look to 
.git-hooks/README"
-fi
-
 popd > /dev/null
 
 }

[Libreoffice-commits] core.git: g .git-hooks/README

2023-03-22 Thread Juergen Funk (via logerrit) 
 .git-hooks/README |3 +
 g |   82 --
 2 files changed, 51 insertions(+), 34 deletions(-)

New commits:
commit 05ea4ac1952c546a81781ac0662747dbe6073616
Author: Juergen Funk 
AuthorDate: Wed Mar 8 10:14:55 2023 +0100
Commit: Juergen Funk 
CommitDate: Wed Mar 22 10:44:24 2023 +

git-hooks: better handling in './g -z' with win-links

  and linux-links

This patch improve patch
9afc6b22e225e8a6ec50c1cbb4d966585d15dbfd git-hooks:
  overwrite the windows-links not with linux-links

The main problem with the previous patch is that
when an alias is set for git, this alias will not
map in the Shell script passed, better you
use a git-symlink.

The other problem was the behavior of cygwin-bash
and win-git-bash that is not always the same, e.g.
   - winlnk=$(cmd /C ... 2>&1) it hang infinity,
  line 123
   - the 'ln' made not link, it only copy the files

Improving the FOR in ./git-hooks/README, when
you have the copied files, need a other del command

The patch can not set the windows-links, only output
the ./git-hooks/README
But in Win 11 should be possible, it is not needed
admin-rights for the 'mklink' command

Change-Id: Icecdb96e65fe2bba1270dfad2ac1af5af145925a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148462
Tested-by: Jenkins
Reviewed-by: Juergen Funk 

diff --git a/.git-hooks/README b/.git-hooks/README
index 5ef9e8e45a48..62a16c1de69e 100644
--- a/.git-hooks/README
+++ b/.git-hooks/README
@@ -7,7 +7,8 @@ To install manually, run:
 When you using GIT for Windows, you need Windows links
 Open a Dos-Box with admin rights then
   cd .git/hooks
-  FOR /F " usebackq " %i IN (`dir /b ..\..\.git-hooks`) DO del /as /f %i & 
mklink %i ..\..\.git-hooks\%i
+  FOR /F " usebackq " %i IN (`dir /b ..\..\.git-hooks`) DO del /as /f %i & del 
%i & mklink %i ..\..\.git-hooks\%i
+the error 'Could Not Find ...' can be ignore
 
 There are two groups of these hooks: client side and server side.
 
diff --git a/g b/g
index a9a879f5d907..f6f9e434df9a 100755
--- a/g
+++ b/g
@@ -90,41 +90,65 @@ refresh_all_hooks()
 local hook_name
 local hook
 local winlnk
+local wingit
+local gitbash
 local lnkfile=".git/hooks/pre-commit"
 
 pushd "${COREDIR?}" > /dev/null
 
-if [ $WINGIT -eq 1 ]; then
-winlnk=0
-if [ -e "${lnkfile}" ] && [ -L "${lnkfile}" ] ; then
-# if linux-links or windows-links?
-# dos dir output windows link:
-# 04.09.2020  10:54  pre-commit 
[..\..\.git-hooks\pre-commit]
-# dos dir output linux link:
-# file not found
-winlnk=$(cmd /C "DIR ${lnkfile//'/'/'\'}" 2>&1)
-winlnk=$(echo "$winlnk" | grep -icE ".*${lnkfile##*/} \[")
-fi
+# it is 'GIT for Windows'
+wingit=$(git --version | grep -ic windows)
+gitbash=$(echo $OSTYPE | grep -ic msys)
 
-if [ $winlnk -eq 0 ]; then
-echo "You using GIT for Windows, but the hook-links not right, 
change with mklink"
-cat .git-hooks/README
+# In the win-git-bash, do not make links, it make only copies
+if [ $gitbash -eq 1 ]; then
+if [ -d ".git" ]; then
+if [ ! -e "${lnkfile}" ] || [ ! -L "${lnkfile}" ] ; then
+# here when wrong link then the file not exist
+echo "Your hooks not right, solve this in cygwin with"
+echo "   ./g -z"
+fi
 fi
 else
-# There's no ".git" e.g. in a secondary worktree
-if [ -d ".git" ]; then
-for hook_name in "${COREDIR?}/.git-hooks"/* ; do
-hook=".git/hooks/${hook_name##*/}"
-if [ ! -e "${hook?}" ] || [ ! -L "${hook?}" ] ; then
-rm -f "${hook?}"
-ln -sf "${hook_name}" "${hook?}"
+if [ $wingit -eq 1 ]; then
+# There's no ".git" e.g. in a secondary worktree
+if [ -d ".git" ]; then
+winlnk=0
+if [ -e "${lnkfile}" ] && [ -L "${lnkfile}" ] ; then
+# if linux-links or windows-links?
+# dos dir output windows link:
+#   04.09.2020  10:54  pre-commit 
[..\..\.git-hooks\pre-commit]
+# dos dir output linux link:
+#   file not found
+winlnk=$(cmd /C "DIR ${lnkfile//'/'/'\'}" 2>&1)
+winlnk=$(echo "$winlnk" | grep -icE 
".*${lnkfile##*/} \[")
 fi
+
+if [ $winlnk -eq 0 ]; then
+echo "You using GIT for Windows, but the hook-links not 
right, change with mklink"
+cat .git-hooks/README
+fi
+fi
+else
+# There's no ".git" e.g. in a secondary worktree
+

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

2023-03-20 Thread Juergen Funk (via logerrit) 
 framework/source/accelerators/acceleratorcache.cxx |1 -
 framework/source/accelerators/acceleratorconfiguration.cxx |5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 038f0b06a2d7d90e7ea19f2233f2892d9c78a08c
Author: Juergen Funk 
AuthorDate: Wed Feb 15 12:25:10 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 20 11:37:40 2023 +

little optimization in accelerators

remove double calls

Change-Id: I4242067bdc0fdcc5184d555bb293f17d66965fb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147094
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/framework/source/accelerators/acceleratorcache.cxx 
b/framework/source/accelerators/acceleratorcache.cxx
index 0163654d4bf7..c0b819a2a9e8 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -116,7 +116,6 @@ void AcceleratorCache::removeCommand(const OUString& 
sCommand)
 {
 removeKey(lKey);
 }
-m_lCommand2Keys.erase(sCommand);
 }
 
 } // namespace framework
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx 
b/framework/source/accelerators/acceleratorconfiguration.cxx
index 3507314a9a6e..48e0d362026e 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -614,10 +614,9 @@ void SAL_CALL 
XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
 
 if (rPrimaryCache.hasKey(aKeyEvent))
 {
-OUString sDelCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
-if (!sDelCommand.isEmpty())
+OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
+if (!sOriginalCommand.isEmpty())
 {
-OUString sOriginalCommand = 
rPrimaryCache.getCommandByKey(aKeyEvent);
 if (rSecondaryCache.hasCommand(sOriginalCommand))
 {
 AcceleratorCache::TKeyList lSecondaryKeys = 
rSecondaryCache.getKeysByCommand(sOriginalCommand);

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

2023-03-20 Thread Juergen Funk (via logerrit) 
 cui/source/options/optgdlg.cxx |   36 -
 cui/source/options/optgdlg.hxx |5 
 cui/uiconfig/ui/optviewpage.ui |  129 -
 framework/source/accelerators/acceleratorcache.cxx |   19 ++-
 4 files changed, 18 insertions(+), 171 deletions(-)

New commits:
commit c6dffdf014127af23b0b20b1015a4b6fdf0e1ac9
Author: Juergen Funk 
AuthorDate: Wed Feb 15 12:02:31 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 20 11:37:04 2023 +

tdf#153587 If one of the multiple shortcuts is deleted,

  the next one is not displayed

This patch solve the part 2 of the bug, the problem was
that it did not take into account whether a command was assigned
multiple keys, it simply deleted the whole command

Change-Id: I4e09096d3bc112ed49a4210dd294d1acf7a48159
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147093
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/framework/source/accelerators/acceleratorcache.cxx 
b/framework/source/accelerators/acceleratorcache.cxx
index 342b9701f99d..0163654d4bf7 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -90,8 +90,23 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& 
aKey)
 // remove key from primary list
 m_lKey2Commands.erase(aKey);
 
-// remove key from optimized command list
-m_lCommand2Keys.erase(sCommand);
+// get keylist for that command
+TCommand2Keys::iterator pCommand = m_lCommand2Keys.find(sCommand);
+if (pCommand == m_lCommand2Keys.end())
+return;
+TKeyList& lKeys = pCommand->second;
+
+// one or more keys assign
+if (lKeys.size() == 1)
+// remove key from optimized command list
+m_lCommand2Keys.erase(sCommand);
+else // only remove this key from the keylist
+{
+auto pKeys = ::std::find(lKeys.begin(), lKeys.end(), aKey);
+
+if (pKeys != lKeys.end())
+lKeys.erase(pKeys);
+}
 }
 
 void AcceleratorCache::removeCommand(const OUString& sCommand)
commit 770eea32b68a95e493a86a97eba5003c46ed736b
Author: Caolán McNamara 
AuthorDate: Mon Mar 20 09:44:16 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 20 11:37:01 2023 +

tdf#152898 remove "show context menu shortcuts" from options page

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

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 71ac0594cd15..8a30f35535a9 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -530,9 +530,6 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 , m_xFontAntiAliasing(m_xBuilder->weld_check_button("aafont"))
 , m_xAAPointLimitLabel(m_xBuilder->weld_label("aafrom"))
 , m_xAAPointLimit(m_xBuilder->weld_metric_spin_button("aanf", 
FieldUnit::PIXEL))
-, m_xMenuIconBox(m_xBuilder->weld_widget("menuiconsbox"))
-, m_xMenuIconsLB(m_xBuilder->weld_combo_box("menuicons"))
-, 
m_xContextMenuShortcutsLB(m_xBuilder->weld_combo_box("contextmenushortcuts"))
 , m_xFontShowCB(m_xBuilder->weld_check_button("showfontpreview"))
 , m_xUseHardwareAccell(m_xBuilder->weld_check_button("useaccel"))
 , m_xUseAntiAliase(m_xBuilder->weld_check_button("useaa"))
@@ -547,9 +544,6 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 , m_sAutoStr(m_xIconStyleLB->get_text(0))
 {
 OUString sToolKitName(Application::GetToolkitName());
-if (sToolKitName.startsWith("gtk"))
-m_xMenuIconBox->hide();
-
 const bool bHasDarkMode = sToolKitName.startsWith("gtk") || sToolKitName 
== "osx" || sToolKitName == "win";
 if (!bHasDarkMode)
 m_xDarkModeFrame->hide();
@@ -781,33 +775,12 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
 bModified = true;
 }
 
-if (m_xMenuIconsLB->get_value_changed_from_saved())
-{
-
officecfg::Office::Common::View::Menu::IsSystemIconsInMenus::set(m_xMenuIconsLB->get_active()
 == 0, xChanges);
-
officecfg::Office::Common::View::Menu::ShowIconsInMenues::set(m_xMenuIconsLB->get_active()
 == 2, xChanges);
-bModified = true;
-bMenuOptModified = true;
-bAppearanceChanged = true;
-}
-
 if (m_xAppearanceStyleLB->get_value_changed_from_saved())
 {
 bDarkModeOptModified = true;
 bModified = true;
 }
 
-if (m_xContextMenuShortcutsLB->get_value_changed_from_saved())
-{
-officecfg::Office::Common::View::Menu::ShortcutsInContextMenus::set(
-m_xContextMenuShortcutsLB->get_active() == 0 ?
-TRISTATE_INDET :
-static_cast(m_xContextMenuShortcutsLB->get_active() - 1),
-xChanges);
-

[Libreoffice-commits] core.git: g .git-hooks/README

2023-03-01 Thread Juergen Funk (via logerrit) 
 .git-hooks/README |2 -
 g |   64 --
 2 files changed, 49 insertions(+), 17 deletions(-)

New commits:
commit 9afc6b22e225e8a6ec50c1cbb4d966585d15dbfd
Author: Juergen Funk 
AuthorDate: Wed Feb 22 12:15:06 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Mar 1 10:44:25 2023 +

git-hooks: overwrite the windows-links not with linux-links

Always when you call build or logerrit, then the windows-links
overwrite with linux-links, but when you using GIT for Windows
you need the windows-links.
This patch made a check it is using GIT for Windows, and check what
for link it is, when wrong link, it output the .git-hooks/README

Improve the check for links, when a link is set not need to set
the link anymore

In .git-hooks/README improve the FOR with delete of the wrong link

look here for GIT for Windows:

https://wiki.documentfoundation.org/Development/BuildingOnWindows/de#Cygwin_and_git

Change-Id: I9f6ef9aca316058ef74cb2b2d107236f03a2e2ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147458
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/.git-hooks/README b/.git-hooks/README
index 93b00ee01c3b..5ef9e8e45a48 100644
--- a/.git-hooks/README
+++ b/.git-hooks/README
@@ -7,7 +7,7 @@ To install manually, run:
 When you using GIT for Windows, you need Windows links
 Open a Dos-Box with admin rights then
   cd .git/hooks
-  FOR /F " usebackq " %i IN (`dir /b ..\..\.git-hooks`) DO mklink %i 
..\..\.git-hooks\%i
+  FOR /F " usebackq " %i IN (`dir /b ..\..\.git-hooks`) DO del /as /f %i & 
mklink %i ..\..\.git-hooks\%i
 
 There are two groups of these hooks: client side and server side.
 
diff --git a/g b/g
index b018561c6775..a9a879f5d907 100755
--- a/g
+++ b/g
@@ -42,7 +42,7 @@ refresh_submodule_hooks()
 continue
 fi
 hook="${repo?}/.git/hooks/${hook_name##*/}"
-if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
+if [ ! -e "${hook?}" ] || [ ! -L "${hook?}" ] ; then
 rm -f "${hook?}"
 ln -sf "${hook_name}" "${hook?}"
 fi
@@ -53,7 +53,7 @@ refresh_submodule_hooks()
 continue
 fi
 hook="${repo?}/.git/hooks/${hook_name##*/}"
-if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
+if [ ! -e "${hook?}" ] || [ ! -L "${hook?}" ] ; then
 rm -f "${hook?}"
 ln -sf "${hook_name}" "${hook?}"
 fi
@@ -64,7 +64,7 @@ refresh_submodule_hooks()
 continue
 fi
 hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
-if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
+if [ ! -e "${hook?}" ] || [ ! -L "${hook?}" ] ; then
 rm -f "${hook?}"
 ln -sf "${hook_name}" "${hook?}"
 fi
@@ -75,7 +75,7 @@ refresh_submodule_hooks()
 continue
 fi
 hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
-if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
+if [ ! -e "${hook?}" ] || [ ! -L "${hook?}" ] ; then
 rm -f "${hook?}"
 ln -sf "${hook_name}" "${hook?}"
 fi
@@ -89,22 +89,44 @@ refresh_all_hooks()
 local repo
 local hook_name
 local hook
+local winlnk
+local lnkfile=".git/hooks/pre-commit"
 
 pushd "${COREDIR?}" > /dev/null
-# There's no ".git" e.g. in a secondary worktree
-if [ -d ".git" ]; then
-for hook_name in "${COREDIR?}/.git-hooks"/* ; do
-hook=".git/hooks/${hook_name##*/}"
-if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
-rm -f "${hook?}"
-ln -sf "${hook_name}" "${hook?}"
-fi
+
+if [ $WINGIT -eq 1 ]; then
+winlnk=0
+if [ -e "${lnkfile}" ] && [ -L "${lnkfile}" ] ; then
+# if linux-links or windows-links?
+# dos dir output windows link:
+# 04.09.2020  10:54  pre-commit 
[..\..\.git-hooks\pre-commit]
+# dos dir output linux link:
+# file not found
+winlnk=$(cmd /C "DIR ${lnkfile//'/'/'\'}" 2>&1)
+winlnk=$(echo "$winlnk" | grep -icE ".*${lnkfile##*/} \[")
+fi
+
+if [ $winlnk -eq 0 ]; then
+echo "You using GIT for Windows, but the hook-links not right, 
change with mklink"
+cat .git-hooks/README
+fi
+else
+# There's no ".git" e.g. in a secondary worktree
+if [ -d ".git" ]; then
+for hook_name in "${COREDIR?}/.git-hooks"/* ; do
+hook=".git/hooks/${hook_name##*/}"
+if [ ! -e "${hook?}" ] || [ ! -L "${hook?}" ] ; then
+rm -f "${hook?}"
+ln -sf "${hook_name}" "${hook?}"
+

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

2023-02-09 Thread Juergen Funk (via logerrit) 
 cui/source/customize/acccfg.cxx |9 +
 framework/inc/properties.h  |2 ++
 framework/source/layoutmanager/layoutmanager.cxx|9 -
 framework/source/layoutmanager/toolbarlayoutmanager.cxx |   14 ++
 framework/source/layoutmanager/toolbarlayoutmanager.hxx |2 ++
 5 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 7a851c5b2da723ca618061c12a14f11479748dfd
Author: Juergen Funk 
AuthorDate: Wed Feb 8 12:15:44 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Feb 9 15:26:48 2023 +

tdf#95936: Tooltip not updated in Toolbars after change Shortcut

The update of all toobars after change the shortcut was missing,
this patch update the toolbars now

Change-Id: Ibc896dc48c9143307b028a3c271476482111c2c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146678
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 1a37964fb8c8..70ec1764fc5e 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -63,6 +63,8 @@
 #include 
 #include 
 
+#include 
+
 // namespaces
 
 using namespace css;
@@ -1480,6 +1482,13 @@ bool SfxAcceleratorConfigPage::FillItemSet(SfxItemSet*)
 try
 {
 m_xAct->store();
+css::uno::Reference xFrameProps(m_xFrame,
+  
css::uno::UNO_QUERY_THROW);
+css::uno::Reference xLayoutManager;
+xFrameProps->getPropertyValue("LayoutManager") >>= xLayoutManager;
+css::uno::Reference 
xLayoutProps(xLayoutManager,
+   
css::uno::UNO_QUERY_THROW);
+xLayoutProps->setPropertyValue("RefreshContextToolbarToolTip", 
css::uno::Any(true));
 }
 catch (const uno::RuntimeException&)
 {
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index fead8e3e1fad..b11a5b2e9d71 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -49,6 +49,7 @@ inline constexpr OUStringLiteral 
LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY
 inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI = 
u"HideCurrentUI";
 inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT = 
u"LockCount";
 inline constexpr OUStringLiteral 
LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE = u"PreserveContentSize";
+inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_REFRESHTOOLTIP = 
u"RefreshContextToolbarToolTip";
 
 #define LAYOUTMANAGER_PROPNAME_MENUBARCLOSER
LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER
 
@@ -58,6 +59,7 @@ inline constexpr OUStringLiteral 
LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_S
 #define LAYOUTMANAGER_PROPHANDLE_HIDECURRENTUI  3
 #define LAYOUTMANAGER_PROPHANDLE_LOCKCOUNT  4
 #define LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE  5
+#define LAYOUTMANAGER_PROPHANDLE_REFRESHTOOLTIP 6
 
 /** properties for "UICommandDescription" class */
 inline constexpr OUStringLiteral 
UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST = 
u"private:resource/image/commandimagelist";
diff --git a/framework/source/layoutmanager/layoutmanager.cxx 
b/framework/source/layoutmanager/layoutmanager.cxx
index ec6ed5572d94..652521fdf6aa 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -130,6 +130,7 @@ LayoutManager::LayoutManager( const Reference< 
XComponentContext >& xContext ) :
 registerProperty( LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, 
LAYOUTMANAGER_PROPHANDLE_MENUBARCLOSER, beans::PropertyAttribute::TRANSIENT, 
_bMenuBarCloseButton, cppu::UnoType::get() );
 registerPropertyNoMember( LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY, 
LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY, 
beans::PropertyAttribute::TRANSIENT, cppu::UnoType::get(), 
css::uno::Any(false) );
 registerProperty( LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE, 
LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE, 
beans::PropertyAttribute::TRANSIENT, _bPreserveContentSize, 
cppu::UnoType::get() );
+registerPropertyNoMember( LAYOUTMANAGER_PROPNAME_ASCII_REFRESHTOOLTIP, 
LAYOUTMANAGER_PROPHANDLE_REFRESHTOOLTIP, beans::PropertyAttribute::TRANSIENT, 
cppu::UnoType::get(), css::uno::Any(false) );
 }
 
 LayoutManager::~LayoutManager()
@@ -3001,7 +3002,7 @@ void SAL_CALL LayoutManager::elementReplaced( const 
ui::ConfigurationEvent& Even
 void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32   
nHandle,
const uno::Any& 
aValue  )
 {
-if ( nHandle != LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY )
+if ( (nHandle != LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY) && (nHandle 
!= LAYOUTMANAGER_PROPHANDLE_REFRESHTOOLTIP) )

[Libreoffice-commits] core.git: comphelper/source embeddedobj/Library_embobj.mk embeddedobj/source framework/source include/comphelper include/embeddedobj include/svtools include/unotools reportdesign

2022-05-10 Thread Juergen Funk (via logerrit) 
 comphelper/source/container/embeddedobjectcontainer.cxx |   13 -
 embeddedobj/Library_embobj.mk   |4 
 embeddedobj/source/commonembedding/embedobj.cxx |7 
 embeddedobj/source/commonembedding/miscobj.cxx  |  153 ++--
 embeddedobj/source/commonembedding/persistence.cxx  |   31 ---
 embeddedobj/source/inc/commonembobj.hxx |   20 ++
 embeddedobj/source/inc/strings.hrc  |   19 +
 framework/source/services/autorecovery.cxx  |2 
 include/comphelper/embeddedobjectcontainer.hxx  |1 
 include/embeddedobj/embeddedupdate.hxx  |   52 +
 include/embeddedobj/embobjdllapi.h  |   20 ++
 include/svtools/embedhlp.hxx|5 
 include/svtools/filechangedchecker.hxx  |6 
 include/unotools/mediadescriptor.hxx|1 
 reportdesign/source/core/api/ReportDefinition.cxx   |4 
 sfx2/source/doc/objstor.cxx |7 
 svtools/source/misc/embedhlp.cxx|   13 +
 svtools/source/misc/filechangedchecker.cxx  |   22 +-
 sw/source/core/view/viewsh.cxx  |2 
 19 files changed, 329 insertions(+), 53 deletions(-)

New commits:
commit cf650ceaafb4d3a3f46991dc1b12efa0e37a71f9
Author: Juergen Funk 
AuthorDate: Tue Feb 22 09:19:29 2022 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Tue May 10 09:02:01 2022 +0200

tdf#147590 update OLE object after document refresh

Regression from b099da78a6f0b3e120f706714003b05d84d11e70
we didn't update linked OLE document after document reload

Change-Id: I8e52f6430f454b276cb43449c6f7a3b0e07e909f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130692
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Jenkins

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 2d85b73f44ba..094597fe6d06 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1158,7 +1158,8 @@ namespace {
 
 }
 
-bool EmbeddedObjectContainer::StoreAsChildren(bool _bOasisFormat,bool 
_bCreateEmbedded,const uno::Reference < embed::XStorage >& _xStorage)
+bool EmbeddedObjectContainer::StoreAsChildren(bool _bOasisFormat,bool 
_bCreateEmbedded, bool _bAutoSaveEvent,
+  const uno::Reference < 
embed::XStorage >& _xStorage)
 {
 bool bResult = false;
 try
@@ -1222,7 +1223,7 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool 
_bOasisFormat,bool _bCreateEm
 uno::Reference< embed::XEmbedPersist > xPersist( xObj, 
uno::UNO_QUERY );
 if ( xPersist.is() )
 {
-uno::Sequence< beans::PropertyValue > aArgs( _bOasisFormat 
? 2 : 3 );
+uno::Sequence< beans::PropertyValue > aArgs( _bOasisFormat 
? 3 : 4 );
 auto pArgs = aArgs.getArray();
 pArgs[0].Name = "StoreVisualReplacement";
 pArgs[0].Value <<= !_bOasisFormat;
@@ -1230,11 +1231,15 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool 
_bOasisFormat,bool _bCreateEm
 // if it is an embedded object or the optimized inserting 
fails the normal inserting should be done
 pArgs[1].Name = "CanTryOptimization";
 pArgs[1].Value <<= !_bCreateEmbedded;
+
+pArgs[2].Name = "AutoSaveEvent";
+pArgs[2].Value <<= _bAutoSaveEvent;
+
 if ( !_bOasisFormat )
 {
 // if object has no cached replacement it will use 
this one
-pArgs[2].Name = "VisualReplacement";
-pArgs[2].Value <<= xStream;
+pArgs[3].Name = "VisualReplacement";
+pArgs[3].Value <<= xStream;
 }
 
 try
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
index 35a654835dae..18cf55518d44 100644
--- a/embeddedobj/Library_embobj.mk
+++ b/embeddedobj/Library_embobj.mk
@@ -21,6 +21,10 @@ $(eval $(call gb_Library_set_include,embobj,\
$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_add_defs,embobj,\
+-DEMBOBJ_DLLIMPLEMENTATION \
+))
+
 $(eval $(call gb_Library_use_external,embobj,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,embobj))
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx 
b/embeddedobj/source/commonembedding/embedobj.cxx
index 223f25e6302c..240112b2483e 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -639,6 +639,13 @@ void SAL_CALL OCommonEmbeddedObject::setContainerName( 
const OUString& sName )
 m_aContainerName = sName;
 }

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

2022-03-22 Thread Juergen Funk (via logerrit) 
 framework/source/services/autorecovery.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 846c3ce7a2aa2a87399edb57ee858720ec837fb8
Author: Juergen Funk 
AuthorDate: Mon Mar 21 09:38:51 2022 +0100
Commit: Juergen Funk 
CommitDate: Tue Mar 22 13:27:56 2022 +0100

Solve exception in implts_flushConfigItem

Regression from 4256c764aee070466115a97420d9b55c23ac
in framework/source/services/autorecovery.cxx
in line 1997 sloved the exception

Change-Id: I4bee90b94307978c9c5186c1c5fdaca1aa420e21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131901
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index ae2188466898..131c104dcba9 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1992,7 +1992,7 @@ void AutoRecovery::implts_flushConfigItem(const 
AutoRecovery::TDocumentInfo& rIn
 implts_openConfig();
 
 css::uno::Reference xCheck(
-officecfg::Office::Recovery::RecoveryList::get());
+officecfg::Office::Recovery::RecoveryList::get(batch));
 
 css::uno::Reference< css::container::XNameContainer >   
xModify(xCheck, css::uno::UNO_QUERY_THROW);
 css::uno::Reference< css::lang::XSingleServiceFactory > 
xCreate(xCheck, css::uno::UNO_QUERY_THROW);

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

2022-03-21 Thread Juergen Funk (via logerrit) 
 embeddedobj/source/commonembedding/miscobj.cxx |8 
 embeddedobj/source/commonembedding/persistence.cxx |   11 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 0498c522724bbfd789261cb1562b3bfe1a81bb3e
Author: Juergen Funk 
AuthorDate: Wed Feb 23 05:49:46 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Mar 21 10:25:03 2022 +0100

tdf#147589 In document with OLE link, don't show temp-file is in use

Regression from 218f36dd614cf828e949f605faaf6a6fd615da26
change the handling in OTempFileService::closeOutput
That was the problem in the OLE-Link handling

Change-Id: I5a7fa74b4a731f758e1c405dfb9cd298b30086a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130408
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/embeddedobj/source/commonembedding/miscobj.cxx 
b/embeddedobj/source/commonembedding/miscobj.cxx
index d65380cdc87e..a5d5573416d1 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -231,14 +231,14 @@ void OCommonEmbeddedObject::LinkInit_Impl(
 {
 // create temporary file
 m_aLinkTempFile = io::TempFile::create(m_xContext);
+uno::Reference< ucb::XSimpleFileAccess > 
xTempOutAccess(ucb::SimpleFileAccess::create(m_xContext));
+// if the temp stream is used, then the temp file remains locked
+uno::Reference< io::XOutputStream > 
xOutStream(xTempOutAccess->openFileWrite(m_aLinkTempFile->getUri()));
 
 if(m_aLinkTempFile.is())
 {
 // completely copy content of original OLE data
-uno::Reference < io::XOutputStream > xTempOut = 
m_aLinkTempFile->getOutputStream();
-::comphelper::OStorageHelper::CopyInputToOutput( xInStream, 
xTempOut );
-xTempOut->flush();
-xTempOut->closeOutput();
+::comphelper::OStorageHelper::CopyInputToOutput(xInStream, 
xOutStream);
 
 // reset flag m_bLinkTempFileChanged, so it will also work for 
multiple
 // save op's of the containing file/document
diff --git a/embeddedobj/source/commonembedding/persistence.cxx 
b/embeddedobj/source/commonembedding/persistence.cxx
index 2aeb60e8eda0..77bc947650af 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1284,18 +1284,17 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( 
const uno::Reference< embed::
 // tdf#141529 if we have a changed copy of the original OLE data 
we now
 // need to write it back 'over' the original OLE data
 uno::Reference < ucb::XSimpleFileAccess2 > 
xFileAccess(ucb::SimpleFileAccess::create( m_xContext ));
-uno::Reference < io::XInputStream > xTempIn = 
m_aLinkTempFile->getInputStream();
 
+uno::Reference< ucb::XSimpleFileAccess > 
xTempAccess(ucb::SimpleFileAccess::create(m_xContext));
+// if the temp stream is used, then the temp file remains locked
+uno::Reference< io::XInputStream > 
xInStream(xTempAccess->openFileRead(m_aLinkTempFile->getUri()));
 // This is *needed* since OTempFileService calls 
OTempFileService::readBytes which
 // ensures the SvStream mpStream gets/is opened, *but* also sets 
the mnCachedPos from
 // OTempFileService which still points to the end-of-file (from 
write-cc'ing).
-uno::Reference < io::XSeekable > xSeek( xTempIn, 
uno::UNO_QUERY_THROW );
+uno::Reference < io::XSeekable > xSeek( xInStream, 
uno::UNO_QUERY_THROW );
 xSeek->seek(0);
 
-xFileAccess->writeFile(m_aLinkURL, xTempIn);
-
-// Do *not* close input, that would remove the temporary file too 
early
-// xTempIn->closeInput();
+xFileAccess->writeFile(m_aLinkURL, xInStream);
 
 // reset flag m_bLinkTempFileChanged
 m_bLinkTempFileChanged = false;

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - bin/symstore.sh

2022-03-03 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)

New commits:
commit c3ca7870a749ef2f63f998d7f9d5570cd6ed0b52
Author: Juergen Funk 
AuthorDate: Fri Mar 6 11:43:21 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Mar 3 13:25:37 2022 +0100

symstore.sh: add vorbose mode

Change-Id: I01f9827140810080c037108021ca70f2b906b05e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90083
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index f4b0a5d13943..09ea3576bfe4 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -31,6 +31,10 @@ sqlite3.dll
 ssl3.dll
 ssleay32.dll"
 
+verbose_none()
+{
+do_none=
+}
 
 add_pdb()
 {
@@ -45,10 +49,15 @@ add_pdb()
 ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF 
"$BLACK_LIST")
 while IFS= read -r file
 do
+${VERBOSE} -n "Found: $file"
 # store dll/exe itself (needed for minidumps)
 if [ $WITHEXEC == 1 ] ; then
 cygpath -w "$file" >> "$list"
+${VERBOSE} " insert"
+else
+${VERBOSE} " "
 fi
+
 # store pdb file
 filename=$(basename "$file" ".${extension}")
 pdball+=($(grep -i "/${filename}${pdbext}" <<< ${ALL_PDBS}))
@@ -56,8 +65,12 @@ add_pdb()
 cygpath -w "${pdball[0]}" >> "$list"
 fi
 case ${#pdball[@]} in
-0) ((++stats_notfound)) ;;
-1) ((++stats_found)) ;;
+0) ((++stats_notfound))
+   ${VERBOSE} "   PDB not found"
+;;
+1) ((++stats_found))
+   ${VERBOSE} "   ${pdball[0]} insert"
+;;
 *) ((++stats_morefound))
 if [ -z "$(echo $file | grep -F "$MOREPDBS_OKLIST")" ]; then
 echo "Error: found duplicate PDBs:"
@@ -65,6 +78,8 @@ add_pdb()
echo " $morepdbs"
 done
 exit 1
+else
+   ${VERBOSE} "   ${pdball[0]} insert (is in more okay 
list)"
 fi
 ;;
 esac
@@ -98,13 +113,15 @@ SYM_PATH=${WORKDIR}/symstore
 COMMENT=""
 COMCMD=""
 WITHEXEC=1
+VERBOSE=verbose_none
 
-USAGE="Usage: $0 [-h|-k |-p ]
+USAGE="Usage: $0 [-h|-k |-p |-c 
|-n|-v]
-h:  this cruft
-c  specifies a comment for the transaction
-n   do not store exe/dll on the symbole server
-k :keep this number of old symbol versions around
 (default: ${MAX_KEEP}. Set to 0 for unlimited)
+   -v   verbose mode, output detail report of files
-p :   specify full path to symbol store tree
 If no path is specified, defaults to ${SYM_PATH}.
 "
@@ -117,6 +134,7 @@ do
 -p|--path) SYM_PATH="$2"; shift 2;;
 -c|--comment) COMCMD="/c"; COMMENT="$2"; shift 2;;
 -n|--noexec) WITHEXEC=0; shift ;;
+-v|--verbose) VERBOSE=echo; shift ;;
 -h|--help) echo "${USAGE}"; exit 0;;
 -*) echo "${USAGE}" >&2; exit 1;;
 *) break;;

[Libreoffice-commits] core.git: Changes to 'private/juergen/LoTest'

2022-01-25 Thread Juergen Funk (via logerrit) 
New branch 'private/juergen/LoTest' available with the following commits:
commit ea556e36e39f19db01b1c55fca69610d422c1843
Author: Juergen Funk 
Date:   Tue Jan 25 12:13:52 2022 +0100

Test build for master

test

Change-Id: Idf90a06d125ead43117212fcf2e755514b665e2f

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.1.6.3.M15'

2021-05-11 Thread Juergen Funk (via logerrit) 
Tag 'mimo-6.1.6.3.M15' created by Andras Timar  at 
2021-05-11 19:05 +

mimo-6.1.6.3.M15

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-5.4.7.2.M7'

2021-05-11 Thread Juergen Funk (via logerrit) 
Tag 'mimo-5.4.7.2.M7' created by Andras Timar  at 
2021-05-11 19:04 +

mimo-5.4.7.2.M7

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

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-5-4-7-2' - configure.ac

2021-05-11 Thread Juergen Funk (via logerrit) 
 configure.ac |   21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 5bd0fe89f87cd3c00da988809ecd0c42f57fb7d0
Author: Juergen Funk 
AuthorDate: Wed Sep 5 15:36:23 2018 +0200
Commit: Andras Timar 
CommitDate: Tue May 11 12:41:21 2021 +0200

Improve the Windows SDK 10 ProductVersion-Path

At the moment the ProductVersion-Path has always the same format,
with this patch, when the format the same, then no change is need for
the next Version.

Change-Id: I6a52fd20751ba139dd5ed6e3802f29c5e8f02975
Reviewed-on: https://gerrit.libreoffice.org/60041
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) 

diff --git a/configure.ac b/configure.ac
index bab32d23e6fa..a4dc1c7d2622 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5193,17 +5193,16 @@ find_winsdk_version()
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v${1}/ProductVersion"
 if test -n "$regvalue"; then
 winsdkbinsubdir="$regvalue".0
-fi
-winsdklibsubdir=$regvalue
-if test "$regvalue" = "10.0.14393"; then
-winsdklibsubdir="10.0.14393.0"
-elif test "$regvalue" = "10.0.15063"; then
-winsdklibsubdir="10.0.15063.0"
-dnl Hack needed at least by tml:
-if test ! -f "${winsdktest}/Include/10.0.15063.0/um/sqlext.h" \
--a -f "${winsdktest}/Include/10.0.14393.0/um/sqlext.h"
-then
-winsdklibsubdir="10.0.14393.0"
+winsdklibsubdir=$winsdkbinsubdir
+tmppath="$winsdktest\\Include\\$winsdklibsubdir"
+# test exist the SDK path
+if test -d "$tmppath"; then
+   # when path is convertable to a short path then path is okay
+   if ! cygpath -d "$tmppath"; then
+  AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see 
NtfsDisable8dot3NameCreation])
+   fi
+else
+   AC_MSG_ERROR([The Windows SDK not found, check the 
installation])
 fi
 fi
 return
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-1' - configure.ac

2021-05-11 Thread Juergen Funk (via logerrit) 
 configure.ac |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit b341657aa04cd3d7910d0765424649e990b03d80
Author: Juergen Funk 
AuthorDate: Wed Sep 5 15:36:23 2018 +0200
Commit: Andras Timar 
CommitDate: Tue May 11 12:38:59 2021 +0200

Improve the Windows SDK 10 ProductVersion-Path

At the moment the ProductVersion-Path has always the same format,
with this patch, when the format the same, then no change is need for
the next Version.

Change-Id: I6a52fd20751ba139dd5ed6e3802f29c5e8f02975
Reviewed-on: https://gerrit.libreoffice.org/60041
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) 

diff --git a/configure.ac b/configure.ac
index 34720ba7e7b9..b1a8fd178d08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5240,16 +5240,17 @@ find_winsdk_version()
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v${1}/ProductVersion"
 if test -n "$regvalue"; then
 winsdkbinsubdir="$regvalue".0
-fi
-winsdklibsubdir=$regvalue
-if test "$regvalue" = "10.0.14393"; then
-winsdklibsubdir="10.0.14393.0"
-elif test "$regvalue" = "10.0.16299"; then
-winsdklibsubdir="10.0.16299.0"
-elif test "$regvalue" = "10.0.15063"; then
-winsdklibsubdir="10.0.15063.0"
-elif test "$regvalue" = "10.0.17134"; then
-winsdklibsubdir="$regvalue.0"
+winsdklibsubdir=$winsdkbinsubdir
+tmppath="$winsdktest\\Include\\$winsdklibsubdir"
+# test exist the SDK path
+if test -d "$tmppath"; then
+   # when path is convertable to a short path then path is okay
+   if ! cygpath -d "$tmppath"; then
+  AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see 
NtfsDisable8dot3NameCreation])
+   fi
+else
+   AC_MSG_ERROR([The Windows SDK not found, check the 
installation])
+fi
 fi
 return
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/source

2020-09-16 Thread Juergen Funk (via logerrit) 
 vcl/source/window/printdlg.cxx |   20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)

New commits:
commit edc33e9d0f05f3717a5f450c60d5f538fdb89c6e
Author: Juergen Funk 
AuthorDate: Fri Sep 4 10:53:44 2020 +0200
Commit: Juergen Funk 
CommitDate: Wed Sep 16 11:34:35 2020 +0200

tdf#127932 fix wrong page number in print progress

- in ctor, reset start pages to non-inflated value after size
  calculation
- update label, _then_ progress in setProgress()

trac#33592

Change-Id: I66576e339de814922512b68167e6c0a9b1025378
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102031
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 63bf8f042abe3c0f6989f6763d13f5389182b816)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102281
Tested-by: Jenkins
(cherry picked from commit 72c1c84e14ffc8127f24930066220e7c7b28a970)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102832
Tested-by: Juergen Funk 
Reviewed-by: Juergen Funk 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index b59bfc17dfe3..c4cf4977b41a 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1972,6 +1972,15 @@ void PrintDialog::previewBackward()
 mpPageEdit->Down();
 }
 
+
+static OUString getNewLabel(const OUString& aLabel, int i_nCurr, int i_nMax)
+{
+OUString aNewText( aLabel.replaceFirst( "%p", OUString::number( i_nCurr ) 
) );
+aNewText = aNewText.replaceFirst( "%n", OUString::number( i_nMax ) );
+
+return aNewText;
+}
+
 // PrintProgressDialog
 
 PrintProgressDialog::PrintProgressDialog(vcl::Window* i_pParent, int i_nMax)
@@ -1991,9 +2000,7 @@ PrintProgressDialog::PrintProgressDialog(vcl::Window* 
i_pParent, int i_nMax)
 
 //just multiply largest value by 10 and take the width of that string as
 //the max size we will want
-OUString aNewText( searchAndReplace( maStr, "%p", 2, OUString::number( 
mnMax * 10 ) ) );
-aNewText = searchAndReplace( aNewText, "%n", 2, OUString::number( mnMax * 
10 ) );
-mpText->SetText( aNewText );
+mpText->SetText( getNewLabel(maStr, mnMax * 10, mnMax * 10) );
 mpText->set_width_request(mpText->get_preferred_size().Width());
 
 //Pick a useful max width
@@ -2001,6 +2008,7 @@ PrintProgressDialog::PrintProgressDialog(vcl::Window* 
i_pParent, int i_nMax)
 
 mpButton->SetClickHdl( LINK( this, PrintProgressDialog, ClickHdl ) );
 
+mpText->SetText( getNewLabel(maStr, mnMax, mnMax) );
 }
 
 PrintProgressDialog::~PrintProgressDialog()
@@ -2029,11 +2037,9 @@ void PrintProgressDialog::setProgress( int i_nCurrent )
 if( mnMax < 1 )
 mnMax = 1;
 
-mpProgress->SetValue(mnCur*100/mnMax);
+mpText->SetText( getNewLabel(maStr, mnCur, mnMax) );
 
-OUString aNewText( searchAndReplace( maStr, "%p", 2, OUString::number( 
mnCur ) ) );
-aNewText = searchAndReplace( aNewText, "%n", 2, OUString::number( mnMax ) 
);
-mpText->SetText( aNewText );
+mpProgress->SetValue(mnCur*100/mnMax);
 }
 
 void PrintProgressDialog::tick()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-10 Thread Juergen Funk (via logerrit) 
 vcl/source/window/printdlg.cxx |   24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

New commits:
commit 72c1c84e14ffc8127f24930066220e7c7b28a970
Author: Juergen Funk 
AuthorDate: Fri Sep 4 10:53:44 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Sep 10 12:11:11 2020 +0200

tdf#127932 fix wrong page number in print progress

- in ctor, reset start pages to non-inflated value after size
  calculation
- update label, _then_ progress in setProgress()

Change-Id: I66576e339de814922512b68167e6c0a9b1025378
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102031
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 63bf8f042abe3c0f6989f6763d13f5389182b816)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102281
Tested-by: Jenkins

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 7d340559806a..1515b8b74264 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -2159,6 +2159,15 @@ void PrintDialog::previewLast()
 ActivateHdl(*mxPageEdit);
 }
 
+
+static OUString getNewLabel(const OUString& aLabel, int i_nCurr, int i_nMax)
+{
+OUString aNewText( aLabel.replaceFirst( "%p", OUString::number( i_nCurr ) 
) );
+aNewText = aNewText.replaceFirst( "%n", OUString::number( i_nMax ) );
+
+return aNewText;
+}
+
 // PrintProgressDialog
 PrintProgressDialog::PrintProgressDialog(weld::Window* i_pParent, int i_nMax)
 : GenericDialogController(i_pParent, "vcl/ui/printprogressdialog.ui", 
"PrintProgressDialog")
@@ -2176,15 +2185,17 @@ PrintProgressDialog::PrintProgressDialog(weld::Window* 
i_pParent, int i_nMax)
 
 //just multiply largest value by 10 and take the width of that string as
 //the max size we will want
-OUString aNewText( maStr.replaceFirst( "%p", OUString::number( mnMax * 10 
) ) );
-aNewText = aNewText.replaceFirst( "%n", OUString::number( mnMax * 10 ) );
-mxText->set_label( aNewText );
+mxText->set_label(getNewLabel(maStr, mnMax * 10, mnMax * 10));
 mxText->set_size_request(mxText->get_preferred_size().Width(), -1);
 
 //Pick a useful max width
 mxProgress->set_size_request(mxProgress->get_approximate_digit_width() * 
25, -1);
 
 mxButton->connect_clicked( LINK( this, PrintProgressDialog, ClickHdl ) );
+
+// after this patch f7157f04fab298423e2c4f6a7e5f8e361164b15f, we have seen 
the calc Max string (sometimes) look above
+// now init to the right start vaules
+mxText->set_label(getNewLabel(maStr, mnCur, mnMax));
 }
 
 PrintProgressDialog::~PrintProgressDialog()
@@ -2203,11 +2214,10 @@ void PrintProgressDialog::setProgress( int i_nCurrent )
 if( mnMax < 1 )
 mnMax = 1;
 
-mxProgress->set_percentage(mnCur*100/mnMax);
+mxText->set_label(getNewLabel(maStr, mnCur, mnMax));
 
-OUString aNewText( maStr.replaceFirst( "%p", OUString::number( mnCur ) ) );
-aNewText = aNewText.replaceFirst( "%n", OUString::number( mnMax ) );
-mxText->set_label( aNewText );
+// here view the dialog, with the right label
+mxProgress->set_percentage(mnCur*100/mnMax);
 }
 
 void PrintProgressDialog::tick()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-09 Thread Juergen Funk (via logerrit) 
 vcl/source/window/printdlg.cxx |   24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

New commits:
commit 9c843ca8659bc06694f44b5641186716d1428de6
Author: Juergen Funk 
AuthorDate: Fri Sep 4 10:53:44 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Sep 9 09:24:48 2020 +0200

tdf#127932 fix wrong page number in print progress

- in ctor, reset start pages to non-inflated value after size
  calculation
- update label, _then_ progress in setProgress()

Change-Id: I66576e339de814922512b68167e6c0a9b1025378
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102031
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 63bf8f042abe3c0f6989f6763d13f5389182b816)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102280
Tested-by: Jenkins

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index ba86b136b413..820d9f9ee7e8 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -2163,6 +2163,15 @@ void PrintDialog::previewLast()
 ActivateHdl(*mxPageEdit);
 }
 
+
+static OUString getNewLabel(const OUString& aLabel, int i_nCurr, int i_nMax)
+{
+OUString aNewText( aLabel.replaceFirst( "%p", OUString::number( i_nCurr ) 
) );
+aNewText = aNewText.replaceFirst( "%n", OUString::number( i_nMax ) );
+
+return aNewText;
+}
+
 // PrintProgressDialog
 PrintProgressDialog::PrintProgressDialog(weld::Window* i_pParent, int i_nMax)
 : GenericDialogController(i_pParent, "vcl/ui/printprogressdialog.ui", 
"PrintProgressDialog")
@@ -2180,15 +2189,17 @@ PrintProgressDialog::PrintProgressDialog(weld::Window* 
i_pParent, int i_nMax)
 
 //just multiply largest value by 10 and take the width of that string as
 //the max size we will want
-OUString aNewText( maStr.replaceFirst( "%p", OUString::number( mnMax * 10 
) ) );
-aNewText = aNewText.replaceFirst( "%n", OUString::number( mnMax * 10 ) );
-mxText->set_label( aNewText );
+mxText->set_label(getNewLabel(maStr, mnMax * 10, mnMax * 10));
 mxText->set_size_request(mxText->get_preferred_size().Width(), -1);
 
 //Pick a useful max width
 mxProgress->set_size_request(mxProgress->get_approximate_digit_width() * 
25, -1);
 
 mxButton->connect_clicked( LINK( this, PrintProgressDialog, ClickHdl ) );
+
+// after this patch f7157f04fab298423e2c4f6a7e5f8e361164b15f, we have seen 
the calc Max string (sometimes) look above
+// now init to the right start vaules
+mxText->set_label(getNewLabel(maStr, mnCur, mnMax));
 }
 
 PrintProgressDialog::~PrintProgressDialog()
@@ -2207,11 +2218,10 @@ void PrintProgressDialog::setProgress( int i_nCurrent )
 if( mnMax < 1 )
 mnMax = 1;
 
-mxProgress->set_percentage(mnCur*100/mnMax);
+mxText->set_label(getNewLabel(maStr, mnCur, mnMax));
 
-OUString aNewText( maStr.replaceFirst( "%p", OUString::number( mnCur ) ) );
-aNewText = aNewText.replaceFirst( "%n", OUString::number( mnMax ) );
-mxText->set_label( aNewText );
+// here view the dialog, with the right label
+mxProgress->set_percentage(mnCur*100/mnMax);
 }
 
 void PrintProgressDialog::tick()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-08 Thread Juergen Funk (via logerrit) 
 vcl/source/window/printdlg.cxx |   24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

New commits:
commit 63bf8f042abe3c0f6989f6763d13f5389182b816
Author: Juergen Funk 
AuthorDate: Fri Sep 4 10:53:44 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Sep 8 13:40:28 2020 +0200

tdf#127932 fix wrong page number in print progress

- in ctor, reset start pages to non-inflated value after size
  calculation
- update label, _then_ progress in setProgress()

Change-Id: I66576e339de814922512b68167e6c0a9b1025378
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102031
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index d964390ef062..c210525b17f3 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -2164,6 +2164,15 @@ void PrintDialog::previewLast()
 ActivateHdl(*mxPageEdit);
 }
 
+
+static OUString getNewLabel(const OUString& aLabel, int i_nCurr, int i_nMax)
+{
+OUString aNewText( aLabel.replaceFirst( "%p", OUString::number( i_nCurr ) 
) );
+aNewText = aNewText.replaceFirst( "%n", OUString::number( i_nMax ) );
+
+return aNewText;
+}
+
 // PrintProgressDialog
 PrintProgressDialog::PrintProgressDialog(weld::Window* i_pParent, int i_nMax)
 : GenericDialogController(i_pParent, "vcl/ui/printprogressdialog.ui", 
"PrintProgressDialog")
@@ -2181,15 +2190,17 @@ PrintProgressDialog::PrintProgressDialog(weld::Window* 
i_pParent, int i_nMax)
 
 //just multiply largest value by 10 and take the width of that string as
 //the max size we will want
-OUString aNewText( maStr.replaceFirst( "%p", OUString::number( mnMax * 10 
) ) );
-aNewText = aNewText.replaceFirst( "%n", OUString::number( mnMax * 10 ) );
-mxText->set_label( aNewText );
+mxText->set_label(getNewLabel(maStr, mnMax * 10, mnMax * 10));
 mxText->set_size_request(mxText->get_preferred_size().Width(), -1);
 
 //Pick a useful max width
 mxProgress->set_size_request(mxProgress->get_approximate_digit_width() * 
25, -1);
 
 mxButton->connect_clicked( LINK( this, PrintProgressDialog, ClickHdl ) );
+
+// after this patch f7157f04fab298423e2c4f6a7e5f8e361164b15f, we have seen 
the calc Max string (sometimes) look above
+// now init to the right start vaules
+mxText->set_label(getNewLabel(maStr, mnCur, mnMax));
 }
 
 PrintProgressDialog::~PrintProgressDialog()
@@ -2208,11 +2219,10 @@ void PrintProgressDialog::setProgress( int i_nCurrent )
 if( mnMax < 1 )
 mnMax = 1;
 
-mxProgress->set_percentage(mnCur*100/mnMax);
+mxText->set_label(getNewLabel(maStr, mnCur, mnMax));
 
-OUString aNewText( maStr.replaceFirst( "%p", OUString::number( mnCur ) ) );
-aNewText = aNewText.replaceFirst( "%n", OUString::number( mnMax ) );
-mxText->set_label( aNewText );
+// here view the dialog, with the right label
+mxProgress->set_percentage(mnCur*100/mnMax);
 }
 
 void PrintProgressDialog::tick()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .git-hooks/README

2020-09-07 Thread Juergen Funk (via logerrit) 
 .git-hooks/README |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 933dd275aafe3b3c7a76019de4878d222f0ebae6
Author: Juergen Funk 
AuthorDate: Fri Sep 4 11:07:15 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Sep 7 09:30:52 2020 +0200

Info git-hook for GIT for Windows

when you using git for windows (faster) then the git-hooks
not work with "ln", it needs "mklink" from windows

Change-Id: I15981f44293186efd3fbaa5c1a044348034cef28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102032
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/.git-hooks/README b/.git-hooks/README
index 56ac97496e86..93b00ee01c3b 100644
--- a/.git-hooks/README
+++ b/.git-hooks/README
@@ -3,6 +3,11 @@ Git hooks are executable scripts you can place in 
$GIT_DIR/hooks directory to tr
 To install manually, run:
 
   cd .git/hooks && ln -s ../../.git-hooks/* ./
+  
+When you using GIT for Windows, you need Windows links
+Open a Dos-Box with admin rights then
+  cd .git/hooks
+  FOR /F " usebackq " %i IN (`dir /b ..\..\.git-hooks`) DO mklink %i 
..\..\.git-hooks\%i
 
 There are two groups of these hooks: client side and server side.
 
@@ -13,3 +18,4 @@ The server-side hooks:
 are for Git server operations such as receiving pushed commits.
 
 See Also [ http://git-scm.com/book/en/Customizing-Git-Git-Hooks ]
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh

2020-03-06 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)

New commits:
commit d0b9d7c2915f45ad34cc8a764cb9674cfbf3203b
Author: Juergen Funk 
AuthorDate: Fri Mar 6 11:43:21 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Mar 6 16:26:54 2020 +0100

symstore.sh: add vorbose mode

Change-Id: I01f9827140810080c037108021ca70f2b906b05e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90083
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index b1470ae9b947..532efb16630f 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -31,6 +31,10 @@ sqlite3.dll
 ssl3.dll
 ssleay32.dll"
 
+verbose_none()
+{
+do_none=
+}
 
 add_pdb()
 {
@@ -45,10 +49,15 @@ add_pdb()
 ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF 
"$BLACK_LIST")
 while IFS= read -r file
 do
+${VERBOSE} -n "Found: $file"
 # store dll/exe itself (needed for minidumps)
 if [ $WITHEXEC == 1 ] ; then
 cygpath -w "$file" >> "$list"
+${VERBOSE} " insert"
+else
+${VERBOSE} " "
 fi
+
 # store pdb file
 filename=$(basename "$file" ".${extension}")
 pdball+=($(grep -i "/${filename}${pdbext}" <<< ${ALL_PDBS}))
@@ -56,8 +65,12 @@ add_pdb()
 cygpath -w "${pdball[0]}" >> "$list"
 fi
 case ${#pdball[@]} in
-0) ((++stats_notfound)) ;;
-1) ((++stats_found)) ;;
+0) ((++stats_notfound))
+   ${VERBOSE} "   PDB not found"
+;;
+1) ((++stats_found))
+   ${VERBOSE} "   ${pdball[0]} insert"
+;;
 *) ((++stats_morefound))
 if [ -z "$(echo $file | grep -F "$MOREPDBS_OKLIST")" ]; then
 echo "Error: found duplicate PDBs:"
@@ -65,6 +78,8 @@ add_pdb()
echo " $morepdbs"
 done
 exit 1
+else
+   ${VERBOSE} "   ${pdball[0]} insert (is in more okay 
list)"
 fi
 ;;
 esac
@@ -98,13 +113,15 @@ SYM_PATH=${WORKDIR}/symstore
 COMMENT=""
 COMCMD=""
 WITHEXEC=1
+VERBOSE=verbose_none
 
-USAGE="Usage: $0 [-h|-k |-p ]
+USAGE="Usage: $0 [-h|-k |-p |-c 
|-n|-v]
-h:  this cruft
-c  specifies a comment for the transaction
-n   do not store exe/dll on the symbole server
-k :keep this number of old symbol versions around
 (default: ${MAX_KEEP}. Set to 0 for unlimited)
+   -v   verbose mode, output detail report of files
-p :   specify full path to symbol store tree
 If no path is specified, defaults to ${SYM_PATH}.
 "
@@ -117,6 +134,7 @@ do
 -p|--path) SYM_PATH="$2"; shift 2;;
 -c|--comment) COMCMD="/c"; COMMENT="$2"; shift 2;;
 -n|--noexec) WITHEXEC=0; shift ;;
+-v|--verbose) VERBOSE=echo; shift ;;
 -h|--help) echo "${USAGE}"; exit 0;;
 -*) echo "${USAGE}" >&2; exit 1;;
 *) break;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - bin/symstore.sh external/libxml2 external/libxslt external/nss solenv/gbuild

2020-02-19 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   18 -
 external/libxml2/UnpackedTarball_libxml2.mk |4 ++-
 external/libxml2/libxml2-icu-sym.patch.0|   37 
 external/libxslt/UnpackedTarball_libxslt.mk |4 ++-
 external/libxslt/libxslt-msvc-sym.patch.2   |   16 
 external/nss/ExternalProject_nss.mk |4 +++
 solenv/gbuild/CliLibrary.mk |3 ++
 7 files changed, 82 insertions(+), 4 deletions(-)

New commits:
commit d2fc4c27a4538c137c7df436b17e18c76b0193a5
Author: Juergen Funk 
AuthorDate: Thu Jan 30 11:28:38 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Feb 19 13:54:52 2020 +0100

Optionally generate PDBs for external libs

also for C#
  Enables pdb generation for symbol builds, for:
   - cli_basetypes.dll
   - cli_cppuhelper.dll
   - cli_uno.dll
   - cli_ure.dll

  Not covered are:
   - cli_oootypes.dll
   - cli_uretypes.dll

..as sadly climaker generates those, and can't produce PDBs.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87727
(cherry picked from commit 1bbabd67720d6d2cfcca15d811c625562fcffad6)

also for libxslt.dll

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87967
(cherry picked from commit 98c7c52e30a921a1bde3e4b2aa8c240d95ed577d)

also for libxml.dll

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88156
(cherry picked from commit 52292c374c3a6a5b4d9c6ced616b0ddd505a5298)

also for nss

  Enables pdb generation for symbol builds, for:
   - freebl3.dll
   - libeay32.dll
   - nspr4.dll
   - nss3.dll
   - nssckbi.dll
   - nssdbm3.dll
   - nssutil3.dll
   - plc4.dll
   - plds4.dll
   - smime3.dll
   - softokn3.dll
   - sqlite3.dll
   - ssl3.dll
   - ssleay32.dll

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88673
(cherry picked from commit 54acab919e7c7c5d60fc697bda54278861ac250e)

all above Reviewed-by: Thorsten Behrens 

libxstl.dll:  Reduce code when symboles enabled

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88157
Reviewed-by: Michael Stahl 
(cherry picked from commit 127d8c2abcae44869458b39a77f48c93bff8c327)

Change-Id: I9db843a638cf9091fa49b21e27dcb578f98e95fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88933
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 564739a0279f..f4b0a5d13943 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -14,8 +14,22 @@ BLACK_LIST="python.exe"
 # occurence in the build tree. Files _not_ included here will generate
 # an error, if duplicates are found.
 #
-# Same format as for BLACK_LIST above above
-MOREPDBS_OKLIST="libcurl.dll"
+# Same format as for BLACK_LIST above
+MOREPDBS_OKLIST="libcurl.dll
+freebl3.dll
+libeay32.dll
+nspr4.dll
+nss3.dll
+nssckbi.dll
+nssdbm3.dll
+nssutil3.dll
+plc4.dll
+plds4.dll
+smime3.dll
+softokn3.dll
+sqlite3.dll
+ssl3.dll
+ssleay32.dll"
 
 
 add_pdb()
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk 
b/external/libxml2/UnpackedTarball_libxml2.mk
index 3194f1e08e75..37b5bad97549 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -18,7 +18,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-vc10.patch \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
-   external/libxml2/libxml2-icu.patch.0 \
+   $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \
+   external/libxml2/libxml2-icu-sym.patch.0, \
+   external/libxml2/libxml2-icu.patch.0) \
external/libxml2/ubsan.patch.0 \
 ))
 
diff --git a/external/libxml2/libxml2-icu-sym.patch.0 
b/external/libxml2/libxml2-icu-sym.patch.0
new file mode 100644
index ..aac9d09ef13e
--- /dev/null
+++ b/external/libxml2/libxml2-icu-sym.patch.0
@@ -0,0 +1,37 @@
+Find bundled ICU in workdir and use debug .libs when needed
+
+diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
+--- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200
 win32/Makefile.msvc2014-07-18 19:01:39.347982929 +0200
+@@ -46,6 +46,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
+ CC = cl.exe
+ CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 
$(CRUNTIME)
+ CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
++CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n 
/I$(WORKDIR)/UnpackedTarball/icu/source/common
+ !if "$(WITH_THREADS)" != "no"
+ CFLAGS = $(CFLAGS) /D "_REENTRANT"
+ !endif
+@@ -62,7 +63,9 @@
+ # The linker and its options.
+ LD = link.exe
+ LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
++LDFLAGS = $(LDFLAGS)

[Libreoffice-commits] core.git: bin/symstore.sh external/nss

2020-02-14 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   16 +++-
 external/nss/ExternalProject_nss.mk |4 
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 54acab919e7c7c5d60fc697bda54278861ac250e
Author: Juergen Funk 
AuthorDate: Fri Feb 14 10:05:56 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Feb 14 15:25:24 2020 +0100

Optionally generate PDBs also for nss

Enables pdb generation for symbol builds, for:
- freebl3.dll
- libeay32.dll
- nspr4.dll
- nss3.dll
- nssckbi.dll
- nssdbm3.dll
- nssutil3.dll
- plc4.dll
- plds4.dll
- smime3.dll
- softokn3.dll
- sqlite3.dll
- ssl3.dll
- ssleay32.dll

Change-Id: I231fdc8e8ade7b7a8b85fc76536291e0546f2eac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88673
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 9809c5554c8a..b1470ae9b947 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -15,7 +15,21 @@ BLACK_LIST="python.exe"
 # an error, if duplicates are found.
 #
 # Same format as for BLACK_LIST above
-MOREPDBS_OKLIST="libcurl.dll"
+MOREPDBS_OKLIST="libcurl.dll
+freebl3.dll
+libeay32.dll
+nspr4.dll
+nss3.dll
+nssckbi.dll
+nssdbm3.dll
+nssutil3.dll
+plc4.dll
+plds4.dll
+smime3.dll
+softokn3.dll
+sqlite3.dll
+ssl3.dll
+ssleay32.dll"
 
 
 add_pdb()
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 4d175e184da5..57b0c961c611 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -19,6 +19,10 @@ ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
+   $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \
+   MOZ_DEBUG_SYMBOLS=1 \
+   MOZ_DEBUG_FLAGS=" " \
+   OPT_CODE_SIZE=0) \
MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-08 Thread Juergen Funk (via logerrit) 
 external/libxml2/UnpackedTarball_libxml2.mk |4 ++-
 external/libxml2/libxml2-icu-sym.patch.0|   37 
 2 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit 52292c374c3a6a5b4d9c6ced616b0ddd505a5298
Author: Juergen Funk 
AuthorDate: Fri Feb 7 07:48:27 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Feb 8 18:08:51 2020 +0100

Optionally generate PDB for libxml.dll

Change-Id: I58f762fa134052e2a7b4a5c7206b4b75df5c1e69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88156
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/external/libxml2/UnpackedTarball_libxml2.mk 
b/external/libxml2/UnpackedTarball_libxml2.mk
index 3194f1e08e75..37b5bad97549 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -18,7 +18,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-vc10.patch \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
-   external/libxml2/libxml2-icu.patch.0 \
+   $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \
+   external/libxml2/libxml2-icu-sym.patch.0, \
+   external/libxml2/libxml2-icu.patch.0) \
external/libxml2/ubsan.patch.0 \
 ))
 
diff --git a/external/libxml2/libxml2-icu-sym.patch.0 
b/external/libxml2/libxml2-icu-sym.patch.0
new file mode 100644
index ..aac9d09ef13e
--- /dev/null
+++ b/external/libxml2/libxml2-icu-sym.patch.0
@@ -0,0 +1,37 @@
+Find bundled ICU in workdir and use debug .libs when needed
+
+diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
+--- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200
 win32/Makefile.msvc2014-07-18 19:01:39.347982929 +0200
+@@ -46,6 +46,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
+ CC = cl.exe
+ CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 
$(CRUNTIME)
+ CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
++CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n 
/I$(WORKDIR)/UnpackedTarball/icu/source/common
+ !if "$(WITH_THREADS)" != "no"
+ CFLAGS = $(CFLAGS) /D "_REENTRANT"
+ !endif
+@@ -62,7 +63,9 @@
+ # The linker and its options.
+ LD = link.exe
+ LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
++LDFLAGS = $(LDFLAGS) /LIBPATH:$(WORKDIR)/UnpackedTarball/icu/source/lib
+ LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
++LDFLAGS = $(LDFLAGS) /DEBUG /OPT:REF
+ LIBS =
+ !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
+ LIBS = $(LIBS) wsock32.lib ws2_32.lib
+@@ -74,9 +77,13 @@
+ !if "$(STATIC)" == "1"
+ LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib
+ !else
++!if "$(WITH_RUN_DEBUG)" == "1"
++LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
++!else
+ LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib
+ !endif
+ !endif
++!endif
+ !if "$(WITH_ZLIB)" == "1"
+ # could be named differently zdll or zlib
+ # LIBS = $(LIBS) zdll.lib
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-07 Thread Juergen Funk (via logerrit) 
 external/libxslt/libxslt-msvc-sym.patch.2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 127d8c2abcae44869458b39a77f48c93bff8c327
Author: Juergen Funk 
AuthorDate: Fri Feb 7 07:55:59 2020 +0100
Commit: Michael Stahl 
CommitDate: Fri Feb 7 10:51:21 2020 +0100

libxstl.dll:  Reduce code when symboles enabled

Change-Id: I189ac6346758c4accadc6b268c321654ae151752
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88157
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/libxslt/libxslt-msvc-sym.patch.2 
b/external/libxslt/libxslt-msvc-sym.patch.2
index 34bf1d0c9d1e..e4d4e673f339 100644
--- a/external/libxslt/libxslt-msvc-sym.patch.2
+++ b/external/libxslt/libxslt-msvc-sym.patch.2
@@ -10,7 +10,7 @@
  LD = link.exe
  LDFLAGS = /nologo
  LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
-+LDFLAGS = $(LDFLAGS) /DEBUG 
++LDFLAGS = $(LDFLAGS) /DEBUG /OPT:REF
  LIBS =
  
  # The archiver and its options.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-04 Thread Juergen Funk (via logerrit) 
 external/libxslt/UnpackedTarball_libxslt.mk |4 +++-
 external/libxslt/libxslt-msvc-sym.patch.2   |   16 
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 98c7c52e30a921a1bde3e4b2aa8c240d95ed577d
Author: Juergen Funk 
AuthorDate: Tue Feb 4 12:07:17 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Feb 4 22:19:13 2020 +0100

Optionally generate PDB for libxslt.dll

Change-Id: I4d6fc685fdbcb7536f5ccb4825094b323820741a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87967
Reviewed-by: Michael Stahl 
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/external/libxslt/UnpackedTarball_libxslt.mk 
b/external/libxslt/UnpackedTarball_libxslt.mk
index b035e99f0a79..5bde97637e25 100644
--- a/external/libxslt/UnpackedTarball_libxslt.mk
+++ b/external/libxslt/UnpackedTarball_libxslt.mk
@@ -16,7 +16,9 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,libxslt))
 $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\
external/libxslt/libxslt-config.patch.1 \
external/libxslt/libxslt-internal-symbols.patch.1 \
-   external/libxslt/libxslt-msvc.patch.2 \
+   $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED),\
+   external/libxslt/libxslt-msvc-sym.patch.2, \
+   external/libxslt/libxslt-msvc.patch.2) \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/rpath.patch.0 \
external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 \
diff --git a/external/libxslt/libxslt-msvc-sym.patch.2 
b/external/libxslt/libxslt-msvc-sym.patch.2
new file mode 100644
index ..34bf1d0c9d1e
--- /dev/null
+++ b/external/libxslt/libxslt-msvc-sym.patch.2
@@ -0,0 +1,16 @@
+--- build/libxslt-1.1.26/win32/Makefile.msvc.old   2019-10-20 
01:02:55.359375000 +0200
 build/libxslt-1.1.26/win32/Makefile.msvc   2019-10-20 01:03:05.18750 
+0200
+@@ -54,11 +54,13 @@
+ CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D 
"_REENTRANT"
+ CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
+ CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
++CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) 
-I$(WORKDIR)\UnpackedTarball\libxml2\include 
-I$(WORKDIR)/UnpackedTarball/icu/source/i18n 
-I$(WORKDIR)/UnpackedTarball/icu/source/common
+ 
+ # The linker and its options.
+ LD = link.exe
+ LDFLAGS = /nologo
+ LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
++LDFLAGS = $(LDFLAGS) /DEBUG 
+ LIBS =
+ 
+ # The archiver and its options.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

2020-02-03 Thread Juergen Funk (via logerrit) 
 solenv/gbuild/CliLibrary.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1bbabd67720d6d2cfcca15d811c625562fcffad6
Author: Juergen Funk 
AuthorDate: Thu Jan 30 11:28:38 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Feb 3 16:48:12 2020 +0100

Optionally generate PDBs also for C#

Enables pdb generation for symbol builds, for:
- cli_basetypes.dll
- cli_cppuhelper.dll
- cli_uno.dll
- cli_ure.dll

Not covered are:
- cli_oootypes.dll
- cli_uretypes.dll

..as sadly climaker generates those, and can't produce PDBs.

Change-Id: I6004e06f9f2a76b4577ad9a4de971f46ad6bf521
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87727
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index e7fa508efada..275f0d68f439 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -41,6 +41,9 @@ $(call gb_Output_announce,$(2),$(true),CSC,3)
$(CLI_CSCFLAGS) \
-target:library \
-out:$(1) \
+   $(if $(call gb_LinkTarget__symbols_enabled,$(1)),\
+   -debug:pdbonly \
+   -pdb:$(call 
gb_LinkTarget__get_pdb_filename,$(WORKDIR)/LinkTarget/Library/$(notdir $(1 \
-keyfile:$(CLI_KEYFILE) \
-reference:System.dll \
$(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - solenv/gbuild

2020-01-23 Thread Juergen Funk (via logerrit) 
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a08be41267e9812fce69f4a49bb14af11305e59f
Author: Juergen Funk 
AuthorDate: Thu Jan 9 08:34:28 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 23 15:49:34 2020 +0100

Get PDB files to work for soffice.bin and unopkg.bin

..by renaming them to *.bin.pdb, so WinDbg picks them up. Follow-up fix
to commit 6ca3adf22b62b88b313c8fc9311183efdabe445a

trac#29781

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86465
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit d3f138efc185e1ee781943d44eb33b82d46ca577)

Change-Id: I5cb7b305c997b423cf0cd70835163811f75b3e25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87268
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 1dfa3b899ebf..f05793b83dfa 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -114,7 +114,7 @@ gb_LinkTarget_INCLUDE :=\
 # We must name the .pdb like libname.pdb, not libname.\(dll\|exe\|pyd\).pdb,
 # otherwise WinDbg does not find it.
 define gb_LinkTarget__get_pdb_filename
-$(patsubst %.dll,%.pdb,$(patsubst %.exe,%.pdb,$(patsubst %.pyd,%.pdb,$(1
+$(patsubst %.dll,%.pdb,$(patsubst %.exe,%.pdb,$(patsubst 
%.bin,%.bin.pdb,$(patsubst %.pyd,%.pdb,$(1)
 endef
 
 gb_LinkTarget_get_pdbfile_in = \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - bin/symstore.sh

2020-01-23 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   68 
 1 file changed, 59 insertions(+), 9 deletions(-)

New commits:
commit f2ec0b8017bab4263b3003c8b40bbec536d27031
Author: Juergen Funk 
AuthorDate: Tue Nov 26 08:06:39 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 23 15:49:17 2020 +0100

symstore.sh: collect PDBs for *all* artifacts

- a number of external library PDBs where missing

Reviewed-on: https://gerrit.libreoffice.org/83726
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 6ca3adf22b62b88b313c8fc9311183efdabe445a)

§§{JNKCMD:NoBuild}§§

Change-Id: Idafcce87bfefadfa669807a861efab76b4122c62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87267
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 2f7ad2f77610..564739a0279f 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -1,22 +1,67 @@
 #!/usr/bin/env bash
 
+# Files listed here would not be store in the symbolestore-server.
+# The format is a string with files e.g.
+#  BLACKLIST="python.exe
+#  file.dll
+#  next_file.exe"
+#
+# It removes "python.exe", "file.dll", and "next_file.exe" from what's
+# added to the symstore. Separator is the newline
+BLACK_LIST="python.exe"
+
+# List files here where it's ok for this script to find more than one
+# occurence in the build tree. Files _not_ included here will generate
+# an error, if duplicates are found.
+#
+# Same format as for BLACK_LIST above above
+MOREPDBS_OKLIST="libcurl.dll"
+
+
 add_pdb()
 {
 extension=$1
-type=$2
+pdbext=$2
 list=$3
-for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+stats_notfound=0
+stats_found=0
+stats_morefound=0
+declare -a pdball
+echo "Collect $extension"
+ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF 
"$BLACK_LIST")
+while IFS= read -r file
+do
 # store dll/exe itself (needed for minidumps)
-if [ -f "$file" -a $WITHEXEC == 1 ] ; then
+if [ $WITHEXEC == 1 ] ; then
 cygpath -w "$file" >> "$list"
 fi
 # store pdb file
 filename=$(basename "$file" ".${extension}")
-pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
-if [ -f "$pdb" ]; then
-cygpath -w "$pdb" >> "$list"
+pdball+=($(grep -i "/${filename}${pdbext}" <<< ${ALL_PDBS}))
+if [ -n "${pdball[0]}" ]; then
+cygpath -w "${pdball[0]}" >> "$list"
 fi
-done
+case ${#pdball[@]} in
+0) ((++stats_notfound)) ;;
+1) ((++stats_found)) ;;
+*) ((++stats_morefound))
+if [ -z "$(echo $file | grep -F "$MOREPDBS_OKLIST")" ]; then
+echo "Error: found duplicate PDBs:"
+for morepdbs in ${pdball[@]} ; do
+   echo " $morepdbs"
+done
+exit 1
+fi
+;;
+esac
+unset pdball
+done

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - bin/symstore.sh

2020-01-23 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e37503aa5a45046e132127a67cf8749676bdb7ed
Author: Juergen Funk 
AuthorDate: Mon Nov 18 10:33:13 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 23 15:48:21 2020 +0100

symstore.sh: use logical operators for test statements

No need to spawn two subshells, test can do and/or logical ops itself.

Reviewed-on: https://gerrit.libreoffice.org/83066
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 7f8c9ddbbd26594bb9249cc6295d0170e4bb58e7)

§§{JNKCMD:NoBuild}§§

Change-Id: I2abba303383f9f0053515088d4fa32753a777a1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87266
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index f37ea0f4e7a0..2f7ad2f77610 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -20,11 +20,11 @@ add_pdb()
 }
 
 # check preconditions
-if [ -z "${INSTDIR}" ] || [ -z "${WORKDIR}" ]; then
+if [ -z "${INSTDIR}" -o -z "${WORKDIR}" ]; then
 echo "INSTDIR or WORKDIR not set - script expects calling inside buildenv"
 exit 1
 fi
-if [ ! -d "${INSTDIR}" ] || [ ! -d "${WORKDIR}" ]; then
+if [ ! -d "${INSTDIR}" -o ! -d "${WORKDIR}" ]; then
 echo "INSTDIR or WORKDIR not present - script expects calling after full 
build"
 exit 1
 fi
@@ -84,7 +84,7 @@ rm -f "${TMPFILE}"
 # Cleanup symstore, older revisions will be removed.  Unless the
 # .dll/.exe changes, the .pdb should be shared, so with incremental
 # tinderbox several revisions should not be that space-demanding.
-if [ "${MAX_KEEP}" -gt 0 ] && [ -d "${SYM_PATH}/000Admin" ]; then
+if [ "${MAX_KEEP}" -gt 0 -a -d "${SYM_PATH}/000Admin" ]; then
 to_remove=$(ls -1 "${SYM_PATH}/000Admin" | grep -v '\.txt' | grep -v 
'\.deleted' | sort | head -n "-${MAX_KEEP}")
 for revision in $to_remove; do
 symstore.exe del /i "${revision}" /s "$(cygpath -w "${SYM_PATH}")"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - bin/symstore.sh

2020-01-23 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 9f81310c32cc1c050fe79b8a8aeaff0b598f6a10
Author: Juergen Funk 
AuthorDate: Thu Nov 14 12:25:35 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 23 15:48:08 2020 +0100

Add comment and pdb-only switch to symstore.sh

Two new switches added:
-c plus a comment for the transaction
-n do not store the exe/dll on the symbol server

Reviewed-on: https://gerrit.libreoffice.org/82751
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 83e3ba6fba486a5bf68427f0cf9aa9de7d97a391)

§§{JNKCMD:NoBuild}§§

Change-Id: I8c5db06909720707987970347e298be6d55ebc71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87265
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index b368eb3e6715..f37ea0f4e7a0 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -7,7 +7,7 @@ add_pdb()
 list=$3
 for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
 # store dll/exe itself (needed for minidumps)
-if [ -f "$file" ]; then
+if [ -f "$file" -a $WITHEXEC == 1 ] ; then
 cygpath -w "$file" >> "$list"
 fi
 # store pdb file
@@ -36,12 +36,17 @@ which symstore.exe > /dev/null 2>&1 || {
 # defaults
 MAX_KEEP=5
 SYM_PATH=${WORKDIR}/symstore
+COMMENT=""
+COMCMD=""
+WITHEXEC=1
 
 USAGE="Usage: $0 [-h|-k |-p ]
-   -h: this cruft
-   -k :   keep this number of old symbol versions around
-   (default: ${MAX_KEEP}. Set to 0 for unlimited)
-   -p :  specify full path to symbol store tree
+   -h:  this cruft
+   -c  specifies a comment for the transaction
+   -n   do not store exe/dll on the symbole server
+   -k :keep this number of old symbol versions around
+(default: ${MAX_KEEP}. Set to 0 for unlimited)
+   -p :   specify full path to symbol store tree
 If no path is specified, defaults to ${SYM_PATH}.
 "
 
@@ -51,7 +56,9 @@ do
case "$1" in
 -k|--keep) MAX_KEEP="$2"; shift 2;;
 -p|--path) SYM_PATH="$2"; shift 2;;
--h|--help) echo "${USAGE}"; exit 0; shift;;
+-c|--comment) COMCMD="/c"; COMMENT="$2"; shift 2;;
+-n|--noexec) WITHEXEC=0; shift ;;
+-h|--help) echo "${USAGE}"; exit 0;;
 -*) echo "${USAGE}" >&2; exit 1;;
 *) break;;
esac
@@ -71,7 +78,7 @@ add_pdb dll Library "${TMPFILE}"
 add_pdb exe Executable "${TMPFILE}"
 
 # stick all of it into symbol store
-symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w 
"${SYM_PATH}")" /t "${PRODUCTNAME}" /v 
"${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
+symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w 
"${SYM_PATH}")" /t "${PRODUCTNAME}" /v 
"${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
 "${COMCMD}" "${COMMENT}"
 rm -f "${TMPFILE}"
 
 # Cleanup symstore, older revisions will be removed.  Unless the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - instsetoo_native/util scp2/source

2020-01-23 Thread Juergen Funk (via logerrit) 
 instsetoo_native/util/openoffice.lst.in |1 +
 scp2/source/ooo/common_brand.scp|2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6d1a04be2c2eb2b5ec3ba86fab05f424974f5a1f
Author: Juergen Funk 
AuthorDate: Tue Nov 19 10:07:25 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 23 15:47:14 2020 +0100

tdf#127711 Fix msi-soffice.ini CrashDumpEnable-entry

 when the switch --disable-crashdump is set, then the
 switch "CrashDumpEnable" set to "false", was only in
 instdir/program/soffice.ini, but was not
 in soffice.ini in msi it was always true

Reviewed-on: https://gerrit.libreoffice.org/83171
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 73524467b9a6a7c4e6d5173aba79d80632ef46e2)

§§{JNKCMD:NoBuild}§§

Change-Id: I2668c1425a776fdf5f0c4e4511c2216e8f418a5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87264
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 8394418d5fe6..2d3ed7b9473f 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -35,6 +35,7 @@ Globals
 STARTCENTER_HIDE_EXTERNAL_LINKS 0
 64BITPRODUCT @WINDOWS_X64@
 WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@
+CRASHDUMPENABLE @DEFAULT_CRASHDUMP_VALUE@
 }
 }
 }
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1209c5786fb5..e46bd98acd60 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -444,7 +444,7 @@ ProfileItem gid_Brand_Profileitem_Soffice_CrashDump
 ModuleID = gid_Module_Root_Brand;
 Section = "Bootstrap";
 Key = "CrashDumpEnable";
-Value = "true";
+Value = "${CRASHDUMPENABLE}";
 End
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - config_host.mk.in configure.ac cui/Library_cui.mk cui/source desktop/source include/desktop instsetoo_native/CustomTarge

2020-01-23 Thread Juergen Funk (via logerrit) 
 config_host.mk.in  |1 
 configure.ac   |   15 +++
 cui/Library_cui.mk |3 ++
 cui/source/options/optgdlg.cxx |6 +++-
 desktop/source/app/crashreport.cxx |   43 +
 include/desktop/crashreport.hxx|2 +
 instsetoo_native/CustomTarget_setup.mk |1 
 scp2/source/ooo/common_brand.scp   |9 ++
 8 files changed, 68 insertions(+), 12 deletions(-)

New commits:
commit a1b6dc0d58d45f00198bf4755006ebbf66a8c365
Author: Juergen Funk 
AuthorDate: Wed Sep 18 11:48:21 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jan 23 15:46:46 2020 +0100

tdf#127711 - A runtime-switch for the MiniCrashDump

 - in soffice.ini (sofficerc) the entry "CrashDumpEnable" default is "true"
- when false then the Dump.ini and the dump-file are not written
- when the switch --disable-crashdump is set, then the
  switch "CrashDumpEnable" set to "false"
- when the entry "CrashDumpEnable" is missing, in this case is the
  default true, too
- the checkbox under Options-General "Send crash reports to ..."
  is deactive and shows off (only view, not change the config)

 - when set the environment variable "CRASH_DUMP_ENABLE" to any char
   then the switch "CrashDumpEnable=false" are overrules with true
   and the Dump.ini and dump-file are write

Reviewed-on: https://gerrit.libreoffice.org/79273
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) 
(cherry picked from commit 2215be5268a646d3cc7d138a0184c6826585b7fb)

§§{JNKCMD:NoBuild}§§

Change-Id: I34e7795640eb95d111e18b0ad46ec67b2c126b19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87263
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/config_host.mk.in b/config_host.mk.in
index 683abbff2e05..767011a1cb5d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -110,6 +110,7 @@ export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
 export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
 export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_BREAKPAD=@ENABLE_BREAKPAD@
+export DEFAULT_CRASHDUMP_VALUE=@DEFAULT_CRASHDUMP_VALUE@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
 export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@
 export ENABLE_CIPHER_OPENSSL_BACKEND=@ENABLE_CIPHER_OPENSSL_BACKEND@
diff --git a/configure.ac b/configure.ac
index 502e53e28862..da7e24c30b47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1051,6 +1051,11 @@ libo_FUZZ_ARG_ENABLE(breakpad,
 [Enables breakpad for crash reporting.])
 )
 
+libo_FUZZ_ARG_ENABLE(crashdump,
+AS_HELP_STRING([--disable-crashdump],
+[Disable dump.ini and dump-file, when --enable-breakpad])
+)
+
 AC_ARG_ENABLE(fetch-external,
 AS_HELP_STRING([--disable-fetch-external],
 [Disables fetching external tarballs from web sources.])
@@ -9157,6 +9162,7 @@ AC_SUBST(ICU_UCHAR_TYPE)
 dnl ==
 dnl Breakpad
 dnl ==
+DEFAULT_CRASHDUMP_VALUE="true"
 AC_MSG_CHECKING([whether to enable breakpad])
 if test "$enable_breakpad" != yes; then
 AC_MSG_RESULT([no])
@@ -9167,6 +9173,14 @@ else
 AC_DEFINE(HAVE_FEATURE_BREAKPAD, 1)
 BUILD_TYPE="$BUILD_TYPE BREAKPAD"
 
+AC_MSG_CHECKING([for disable crash dump])
+if test "$enable_crashdump" = no; then
+DEFAULT_CRASHDUMP_VALUE="false"
+AC_MSG_RESULT([yes])
+else
+   AC_MSG_RESULT([no])
+fi
+
 AC_MSG_CHECKING([for crashreport config])
 if test "$with_symbol_config" = "no"; then
 BREAKPAD_SYMBOL_CONFIG="invalid"
@@ -9179,6 +9193,7 @@ else
 AC_SUBST(BREAKPAD_SYMBOL_CONFIG)
 fi
 AC_SUBST(ENABLE_BREAKPAD)
+AC_SUBST(DEFAULT_CRASHDUMP_VALUE)
 
 dnl ==
 dnl libfuzzer
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 44bac812c557..302c6890729c 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -60,6 +60,9 @@ $(eval $(call gb_Library_use_libraries,cui,\
 ucbhelper \
 utl \
 vcl \
+$(if $(ENABLE_BREAKPAD), \
+crashreport \
+) \
 ))
 
 $(eval $(call gb_Library_use_externals,cui,\
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 7949342e40d1..e8fc180bb3b4 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -69,6 +69,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -427,8 +429,8 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 m_pCollectUsageInfo->SaveValue();
 
 #if HAVE_FEATURE_BREAKPAD
-m_xCrashReport->Check(officecfg::Office::Common::Misc::CrashReport::get());
-
m_xCrashReport->Enable(!officecfg::Office::Common::Misc::CrashReport::isReadOnly());
+

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - desktop/source framework/source include/desktop svx/source vcl/opengl vcl/source vcl/unx vcl/win

2020-01-23 Thread Juergen Funk (via logerrit) 
 desktop/source/app/app.cxx  |   39 ++-
 desktop/source/app/crashreport.cxx  |   93 +---
 desktop/source/app/sofficemain.cxx  |   14 +---
 desktop/source/minidump/minidump.cxx|   20 --
 desktop/source/minidump/minidump_upload.cxx |2 
 framework/source/services/desktop.cxx   |2 
 include/desktop/crashreport.hxx |   59 ++---
 include/desktop/minidump.hxx|   13 +++
 svx/source/dialog/crashreportdlg.cxx|5 -
 vcl/opengl/win/WinDeviceInfo.cxx|6 -
 vcl/opengl/x11/X11DeviceInfo.cxx|4 -
 vcl/source/opengl/OpenGLHelper.cxx  |2 
 vcl/source/window/builder.cxx   |2 
 vcl/unx/generic/plugadapt/salplug.cxx   |2 
 vcl/win/app/salinst.cxx |2 
 15 files changed, 147 insertions(+), 118 deletions(-)

New commits:
commit 645bb8690a80eeef8f33dfcbe6e1fd3db97fa23a
Author: Juergen Funk 
AuthorDate: Wed Sep 25 13:49:26 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jan 23 15:46:25 2020 +0100

Refactoring of the class CrashReporter

 - remove double code
 - using of all the methode of the CrashReporter-Class
 - all methode only active when crash-dump enable
except the addKeyValue

With this change the handling for the patch
tdf#127711 A runtime-switch for the MiniCrashDump
would be simpler

Reviewed-on: https://gerrit.libreoffice.org/79272
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) 
(cherry picked from commit 8fe03eef707561bb0b9e1655292619ec3cd347f5)

 Conflicts:
desktop/source/app/crashreport.cxx
vcl/opengl/x11/X11DeviceInfo.cxx
vcl/source/app/salplug.cxx

§§{JNKCMD:NoBuild}§§

Change-Id: I339b3b8e06f7fc2cd3c0d34ece112a6fd352913a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87262
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d1b76aa49d3c..e9995c8a5635 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -122,10 +122,6 @@
 
 #include "langselect.hxx"
 
-#if HAVE_FEATURE_BREAKPAD
-#include 
-#endif
-
 #if defined MACOSX
 #include 
 #include 
@@ -889,26 +885,6 @@ void Desktop::HandleBootstrapErrors(
 
 namespace {
 
-bool crashReportInfoExists()
-{
-#if HAVE_FEATURE_BREAKPAD
-std::string path = CrashReporter::getIniFileName();
-std::ifstream aFile(path);
-while (aFile.good())
-{
-std::string line;
-std::getline(aFile, line);
-int sep = line.find('=');
-if (sep >= 0)
-{
-std::string key = line.substr(0, sep);
-if (key == "DumpFile")
-return true;
-}
-}
-#endif
-return false;
-}
 
 #if HAVE_FEATURE_BREAKPAD
 void handleCrashReport()
@@ -967,7 +943,12 @@ void impl_checkRecoveryState(bool& bCrashed   ,
  bool& bRecoveryDataExists,
  bool& bSessionDataExists )
 {
-bCrashed = officecfg::Office::Recovery::RecoveryInfo::Crashed::get() || 
crashReportInfoExists();
+bCrashed = officecfg::Office::Recovery::RecoveryInfo::Crashed::get()
+#if HAVE_FEATURE_BREAKPAD
+|| CrashReporter::crashReportInfoExists();
+#else
+;
+#endif
 bool elements = officecfg::Office::Recovery::RecoveryList::get()->
 hasElements();
 bool session
@@ -2025,7 +2006,7 @@ void Desktop::OpenClients()
 #endif
 
 #if HAVE_FEATURE_BREAKPAD
-if (officecfg::Office::Common::Misc::CrashReport::get() && 
crashReportInfoExists())
+if (officecfg::Office::Common::Misc::CrashReport::get() && 
CrashReporter::crashReportInfoExists())
 handleCrashReport();
 #endif
 
@@ -2103,11 +2084,9 @@ void Desktop::OpenClients()
 }
 }
 }
-#if HAVE_FEATURE_BREAKPAD
-CrashReporter::writeCommonInfo();
+
 // write this information here to avoid depending on vcl in the crash 
reporter lib
-CrashReporter::addKeyValue("Language", 
Application::GetSettings().GetLanguageTag().getBcp47());
-#endif
+CrashReporter::addKeyValue("Language", 
Application::GetSettings().GetLanguageTag().getBcp47(), CrashReporter::Create);
 
 RequestHandler::EnableRequests();
 
diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index f19b9f0305b2..2fb078c7417d 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -14,17 +14,17 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 
 #include 
-#include 
 
-osl::Mutex CrashReporter::maMutex;
 
 #if HAVE_FEATURE_BREAKPAD
 
+#include 
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
 #include 
 #elif defined WNT
@@ -38,41 +38,44 @@ osl::Mutex CrashReporter::maMutex;
 #endif
 #endif
 
+osl::Mutex

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 2 commits - desktop/source framework/source include/desktop vcl/opengl vcl/source vcl/unx vcl/win

2020-01-23 Thread Juergen Funk (via logerrit) 
 desktop/source/app/app.cxx|2 +-
 desktop/source/app/crashreport.cxx|2 +-
 desktop/source/minidump/minidump.cxx  |4 +++-
 framework/source/services/desktop.cxx |2 +-
 include/desktop/crashreport.hxx   |4 ++--
 vcl/opengl/win/WinDeviceInfo.cxx  |6 +++---
 vcl/opengl/x11/X11DeviceInfo.cxx  |4 ++--
 vcl/source/opengl/OpenGLHelper.cxx|2 +-
 vcl/source/window/builder.cxx |2 +-
 vcl/unx/generic/plugadapt/salplug.cxx |2 +-
 vcl/win/app/salinst.cxx   |2 +-
 11 files changed, 17 insertions(+), 15 deletions(-)

New commits:
commit 28b7864b3f7d2b46a9b8384c8a14af5c33fc92c2
Author: Juergen Funk 
AuthorDate: Wed Sep 25 12:09:21 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jan 23 15:45:24 2020 +0100

desktop: proper error checking for crashreport ini reading

Reviewed-on: https://gerrit.libreoffice.org/79603
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 
(cherry picked from commit 044a683e6c8f864d46fe8ebe3ef5c757cbea30a6)

§§{JNKCMD:NoBuild}§§

Change-Id: I1107304a0e3f482b6a7e6110006c2f26b9cb0778
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87261
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/desktop/source/minidump/minidump.cxx 
b/desktop/source/minidump/minidump.cxx
index f3eefd023b75..0e83ac98905c 100644
--- a/desktop/source/minidump/minidump.cxx
+++ b/desktop/source/minidump/minidump.cxx
@@ -23,7 +23,9 @@ std::map readStrings(std::istream& 
file)
 {
 std::map parameters;
 
-while (!file.eof())
+// when file is not readable, the status eof would not be set
+// better test of state is okay
+while (file)
 {
 std::string line;
 std::getline(file, line);
commit 2b5659865dc0847eb9626f911606c2c116f4200e
Author: Juergen Funk 
AuthorDate: Wed Sep 25 11:21:17 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jan 23 15:45:12 2020 +0100

crashreport: change addKeyValue to lower-case camel

Reviewed-on: https://gerrit.libreoffice.org/79601
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 
(cherry picked from commit b5adb2433de4f376c253a813a632e982c7ac90c5)

 Conflicts:
vcl/opengl/x11/X11DeviceInfo.cxx
vcl/source/app/salplug.cxx

§§{JNKCMD:NoBuild}§§

Change-Id: Ife5775d3a570da1fc2e4dd627456523705b64e1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87260
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8c41c01a09ae..d1b76aa49d3c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2106,7 +2106,7 @@ void Desktop::OpenClients()
 #if HAVE_FEATURE_BREAKPAD
 CrashReporter::writeCommonInfo();
 // write this information here to avoid depending on vcl in the crash 
reporter lib
-CrashReporter::AddKeyValue("Language", 
Application::GetSettings().GetLanguageTag().getBcp47());
+CrashReporter::addKeyValue("Language", 
Application::GetSettings().GetLanguageTag().getBcp47());
 #endif
 
 RequestHandler::EnableRequests();
diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index 29001367bb91..f19b9f0305b2 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -52,7 +52,7 @@ void writeToStream(std::ofstream& strm, const OUString& rKey, 
const OUString& rV
 
 }
 
-void CrashReporter::AddKeyValue(const OUString& rKey, const OUString& rValue)
+void CrashReporter::addKeyValue(const OUString& rKey, const OUString& rValue)
 {
 osl::MutexGuard aGuard(maMutex);
 if (mbInit)
diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index d88371979f20..3ca73dbb13a4 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -314,7 +314,7 @@ sal_Bool SAL_CALL Desktop::terminate()
 // see dispose() for further information.
 /* SAFE AREA 
---
 */
 SolarMutexClearableGuard aWriteLock;
-CrashReporter::AddKeyValue("ShutDown", OUString::boolean(true));
+CrashReporter::addKeyValue("ShutDown", OUString::boolean(true));
 m_bIsTerminated = true;
 aWriteLock.clear();
 /* UNSAFE AREA 
-
 */
diff --git a/include/desktop/crashreport.hxx b/include/desktop/crashreport.hxx
index 6056adbe1d28..e3486bbf0863 100644
--- a/include/desktop/crashreport.hxx
+++ b/include/desktop/crashreport.hxx
@@ -41,7 +41,7 @@ CRASHREPORT_DLLPUBLIC
 /*class*/ CrashReporter
 {
 public:
-static void AddKeyValue(const OUString& rKey, const OUString& rValue);
+static void addKeyValue(const OUString& rKey, const OUString&

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - solenv/gbuild

2020-01-09 Thread Juergen Funk (via logerrit) 
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d5d176379400798689857a2678e8eb63cbac533
Author: Juergen Funk 
AuthorDate: Thu Jan 9 08:34:28 2020 +0100
Commit: Juergen Funk (CIB) 
CommitDate: Thu Jan 9 11:45:55 2020 +0100

Get PDB files to work for soffice.bin and unopkg.bin

..by renaming them to *.bin.pdb, so WinDbg picks them up. Follow-up fix
to commit 6ca3adf22b62b88b313c8fc9311183efdabe445a

Change-Id: I5cb7b305c997b423cf0cd70835163811f75b3e25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86465
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit d3f138efc185e1ee781943d44eb33b82d46ca577)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86470
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index c56079ff45df..3c41c945a559 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -155,7 +155,7 @@ gb_LinkTarget_INCLUDE :=\
 # We must name the .pdb like libname.pdb, not libname.\(dll\|exe\|pyd\).pdb,
 # otherwise WinDbg does not find it.
 define gb_LinkTarget__get_pdb_filename
-$(patsubst %.dll,%.pdb,$(patsubst %.exe,%.pdb,$(patsubst %.pyd,%.pdb,$(1
+$(patsubst %.dll,%.pdb,$(patsubst %.exe,%.pdb,$(patsubst 
%.bin,%.bin.pdb,$(patsubst %.pyd,%.pdb,$(1)
 endef
 
 gb_LinkTarget_get_pdbfile_in = \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

2020-01-09 Thread Juergen Funk (via logerrit) 
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d3f138efc185e1ee781943d44eb33b82d46ca577
Author: Juergen Funk 
AuthorDate: Thu Jan 9 08:34:28 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 9 10:08:16 2020 +0100

Get PDB files to work for soffice.bin and unopkg.bin

..by renaming them to *.bin.pdb, so WinDbg picks them up. Follow-up fix
to commit 6ca3adf22b62b88b313c8fc9311183efdabe445a

Change-Id: I5cb7b305c997b423cf0cd70835163811f75b3e25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86465
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 44f1949e2e73..5df38636a706 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -156,7 +156,7 @@ gb_LinkTarget_INCLUDE :=\
 # We must name the .pdb like libname.pdb, not libname.\(dll\|exe\|pyd\).pdb,
 # otherwise WinDbg does not find it.
 define gb_LinkTarget__get_pdb_filename
-$(patsubst %.dll,%.pdb,$(patsubst %.exe,%.pdb,$(patsubst %.pyd,%.pdb,$(1
+$(patsubst %.dll,%.pdb,$(patsubst %.exe,%.pdb,$(patsubst 
%.bin,%.bin.pdb,$(patsubst %.pyd,%.pdb,$(1)
 endef
 
 gb_LinkTarget_get_pdbfile_in = \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - bin/symstore.sh

2019-12-19 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   68 
 1 file changed, 59 insertions(+), 9 deletions(-)

New commits:
commit 2918e7f0cd785deca1cd3129d5469375b08603a8
Author: Juergen Funk 
AuthorDate: Tue Nov 26 08:06:39 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Dec 19 16:07:07 2019 +0100

symstore.sh: collect PDBs for *all* artifacts

- a number of external library PDBs where missing
- also the soffice.bin and unopkg.bin (renaming that to *.bin.pdb)

Change-Id: Idafcce87bfefadfa669807a861efab76b4122c62
Reviewed-on: https://gerrit.libreoffice.org/83726
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 6ca3adf22b62b88b313c8fc9311183efdabe445a)
Reviewed-on: https://gerrit.libreoffice.org/85502
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 2f7ad2f77610..564739a0279f 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -1,22 +1,67 @@
 #!/usr/bin/env bash
 
+# Files listed here would not be store in the symbolestore-server.
+# The format is a string with files e.g.
+#  BLACKLIST="python.exe
+#  file.dll
+#  next_file.exe"
+#
+# It removes "python.exe", "file.dll", and "next_file.exe" from what's
+# added to the symstore. Separator is the newline
+BLACK_LIST="python.exe"
+
+# List files here where it's ok for this script to find more than one
+# occurence in the build tree. Files _not_ included here will generate
+# an error, if duplicates are found.
+#
+# Same format as for BLACK_LIST above above
+MOREPDBS_OKLIST="libcurl.dll"
+
+
 add_pdb()
 {
 extension=$1
-type=$2
+pdbext=$2
 list=$3
-for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+stats_notfound=0
+stats_found=0
+stats_morefound=0
+declare -a pdball
+echo "Collect $extension"
+ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF 
"$BLACK_LIST")
+while IFS= read -r file
+do
 # store dll/exe itself (needed for minidumps)
-if [ -f "$file" -a $WITHEXEC == 1 ] ; then
+if [ $WITHEXEC == 1 ] ; then
 cygpath -w "$file" >> "$list"
 fi
 # store pdb file
 filename=$(basename "$file" ".${extension}")
-pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
-if [ -f "$pdb" ]; then
-cygpath -w "$pdb" >> "$list"
+pdball+=($(grep -i "/${filename}${pdbext}" <<< ${ALL_PDBS}))
+if [ -n "${pdball[0]}" ]; then
+cygpath -w "${pdball[0]}" >> "$list"
 fi
-done
+case ${#pdball[@]} in
+0) ((++stats_notfound)) ;;
+1) ((++stats_found)) ;;
+*) ((++stats_morefound))
+if [ -z "$(echo $file | grep -F "$MOREPDBS_OKLIST")" ]; then
+echo "Error: found duplicate PDBs:"
+for morepdbs in ${pdball[@]} ; do
+   echo " $morepdbs"
+done
+exit 1
+fi
+;;
+esac
+unset pdball
+done

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - bin/symstore.sh

2019-12-19 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 603bb1fcd02fd931046a92c83381afcfd5972257
Author: Juergen Funk 
AuthorDate: Mon Nov 18 10:33:13 2019 +0100
Commit: Juergen Funk (CIB) 
CommitDate: Thu Dec 19 10:52:27 2019 +0100

symstore.sh: use logical operators for test statements

No need to spawn two subshells, test can do and/or logical ops itself.

Change-Id: I2abba303383f9f0053515088d4fa32753a777a1d
Reviewed-on: https://gerrit.libreoffice.org/83066
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 7f8c9ddbbd26594bb9249cc6295d0170e4bb58e7)
Reviewed-on: https://gerrit.libreoffice.org/85381
Reviewed-by: Juergen Funk (CIB) 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index f37ea0f4e7a0..2f7ad2f77610 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -20,11 +20,11 @@ add_pdb()
 }
 
 # check preconditions
-if [ -z "${INSTDIR}" ] || [ -z "${WORKDIR}" ]; then
+if [ -z "${INSTDIR}" -o -z "${WORKDIR}" ]; then
 echo "INSTDIR or WORKDIR not set - script expects calling inside buildenv"
 exit 1
 fi
-if [ ! -d "${INSTDIR}" ] || [ ! -d "${WORKDIR}" ]; then
+if [ ! -d "${INSTDIR}" -o ! -d "${WORKDIR}" ]; then
 echo "INSTDIR or WORKDIR not present - script expects calling after full 
build"
 exit 1
 fi
@@ -84,7 +84,7 @@ rm -f "${TMPFILE}"
 # Cleanup symstore, older revisions will be removed.  Unless the
 # .dll/.exe changes, the .pdb should be shared, so with incremental
 # tinderbox several revisions should not be that space-demanding.
-if [ "${MAX_KEEP}" -gt 0 ] && [ -d "${SYM_PATH}/000Admin" ]; then
+if [ "${MAX_KEEP}" -gt 0 -a -d "${SYM_PATH}/000Admin" ]; then
 to_remove=$(ls -1 "${SYM_PATH}/000Admin" | grep -v '\.txt' | grep -v 
'\.deleted' | sort | head -n "-${MAX_KEEP}")
 for revision in $to_remove; do
 symstore.exe del /i "${revision}" /s "$(cygpath -w "${SYM_PATH}")"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - bin/symstore.sh

2019-12-19 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 968daf12db7b882e01ef6e4d2e94faf18a5af74e
Author: Juergen Funk 
AuthorDate: Thu Nov 14 12:25:35 2019 +0100
Commit: Juergen Funk (CIB) 
CommitDate: Thu Dec 19 10:52:06 2019 +0100

Add comment and pdb-only switch to symstore.sh

Two new switches added:
-c plus a comment for the transaction
-n do not store the exe/dll on the symbol server

Change-Id: I8c5db06909720707987970347e298be6d55ebc71
Reviewed-on: https://gerrit.libreoffice.org/82751
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 83e3ba6fba486a5bf68427f0cf9aa9de7d97a391)
Reviewed-on: https://gerrit.libreoffice.org/85379
Reviewed-by: Juergen Funk (CIB) 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index b368eb3e6715..f37ea0f4e7a0 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -7,7 +7,7 @@ add_pdb()
 list=$3
 for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
 # store dll/exe itself (needed for minidumps)
-if [ -f "$file" ]; then
+if [ -f "$file" -a $WITHEXEC == 1 ] ; then
 cygpath -w "$file" >> "$list"
 fi
 # store pdb file
@@ -36,12 +36,17 @@ which symstore.exe > /dev/null 2>&1 || {
 # defaults
 MAX_KEEP=5
 SYM_PATH=${WORKDIR}/symstore
+COMMENT=""
+COMCMD=""
+WITHEXEC=1
 
 USAGE="Usage: $0 [-h|-k |-p ]
-   -h: this cruft
-   -k :   keep this number of old symbol versions around
-   (default: ${MAX_KEEP}. Set to 0 for unlimited)
-   -p :  specify full path to symbol store tree
+   -h:  this cruft
+   -c  specifies a comment for the transaction
+   -n   do not store exe/dll on the symbole server
+   -k :keep this number of old symbol versions around
+(default: ${MAX_KEEP}. Set to 0 for unlimited)
+   -p :   specify full path to symbol store tree
 If no path is specified, defaults to ${SYM_PATH}.
 "
 
@@ -51,7 +56,9 @@ do
case "$1" in
 -k|--keep) MAX_KEEP="$2"; shift 2;;
 -p|--path) SYM_PATH="$2"; shift 2;;
--h|--help) echo "${USAGE}"; exit 0; shift;;
+-c|--comment) COMCMD="/c"; COMMENT="$2"; shift 2;;
+-n|--noexec) WITHEXEC=0; shift ;;
+-h|--help) echo "${USAGE}"; exit 0;;
 -*) echo "${USAGE}" >&2; exit 1;;
 *) break;;
esac
@@ -71,7 +78,7 @@ add_pdb dll Library "${TMPFILE}"
 add_pdb exe Executable "${TMPFILE}"
 
 # stick all of it into symbol store
-symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w 
"${SYM_PATH}")" /t "${PRODUCTNAME}" /v 
"${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
+symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w 
"${SYM_PATH}")" /t "${PRODUCTNAME}" /v 
"${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
 "${COMCMD}" "${COMMENT}"
 rm -f "${TMPFILE}"
 
 # Cleanup symstore, older revisions will be removed.  Unless the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh

2019-12-17 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   68 
 1 file changed, 59 insertions(+), 9 deletions(-)

New commits:
commit 6ca3adf22b62b88b313c8fc9311183efdabe445a
Author: Juergen Funk 
AuthorDate: Tue Nov 26 08:06:39 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Dec 17 10:26:25 2019 +0100

symstore.sh: collect PDBs for *all* artifacts

- a number of external library PDBs where missing
- also the soffice.bin and unopkg.bin (renaming that to *.bin.pdb)

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

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 2f7ad2f77610..564739a0279f 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -1,22 +1,67 @@
 #!/usr/bin/env bash
 
+# Files listed here would not be store in the symbolestore-server.
+# The format is a string with files e.g.
+#  BLACKLIST="python.exe
+#  file.dll
+#  next_file.exe"
+#
+# It removes "python.exe", "file.dll", and "next_file.exe" from what's
+# added to the symstore. Separator is the newline
+BLACK_LIST="python.exe"
+
+# List files here where it's ok for this script to find more than one
+# occurence in the build tree. Files _not_ included here will generate
+# an error, if duplicates are found.
+#
+# Same format as for BLACK_LIST above above
+MOREPDBS_OKLIST="libcurl.dll"
+
+
 add_pdb()
 {
 extension=$1
-type=$2
+pdbext=$2
 list=$3
-for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+stats_notfound=0
+stats_found=0
+stats_morefound=0
+declare -a pdball
+echo "Collect $extension"
+ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF 
"$BLACK_LIST")
+while IFS= read -r file
+do
 # store dll/exe itself (needed for minidumps)
-if [ -f "$file" -a $WITHEXEC == 1 ] ; then
+if [ $WITHEXEC == 1 ] ; then
 cygpath -w "$file" >> "$list"
 fi
 # store pdb file
 filename=$(basename "$file" ".${extension}")
-pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
-if [ -f "$pdb" ]; then
-cygpath -w "$pdb" >> "$list"
+pdball+=($(grep -i "/${filename}${pdbext}" <<< ${ALL_PDBS}))
+if [ -n "${pdball[0]}" ]; then
+cygpath -w "${pdball[0]}" >> "$list"
 fi
-done
+case ${#pdball[@]} in
+0) ((++stats_notfound)) ;;
+1) ((++stats_found)) ;;
+*) ((++stats_morefound))
+if [ -z "$(echo $file | grep -F "$MOREPDBS_OKLIST")" ]; then
+echo "Error: found duplicate PDBs:"
+for morepdbs in ${pdball[@]} ; do
+   echo " $morepdbs"
+done
+exit 1
+fi
+;;
+esac
+unset pdball
+done

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - instsetoo_native/util scp2/source

2019-11-22 Thread Juergen Funk (via logerrit) 
 instsetoo_native/util/openoffice.lst.in |1 +
 scp2/source/ooo/common_brand.scp|2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1908393e7861f45aea616a192059ccbd9b62b5a4
Author: Juergen Funk 
AuthorDate: Tue Nov 19 10:07:25 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Nov 22 14:31:07 2019 +0100

tdf#127711 Fix msi-soffice.ini CrashDumpEnable-entry

 when the switch --disable-crashdump is set, then the
 switch "CrashDumpEnable" set to "false", was only in
 instdir/program/soffice.ini, but was not
 in soffice.ini in msi it was always true

Change-Id: I2668c1425a776fdf5f0c4e4511c2216e8f418a5b
Reviewed-on: https://gerrit.libreoffice.org/83171
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 73524467b9a6a7c4e6d5173aba79d80632ef46e2)
Reviewed-on: https://gerrit.libreoffice.org/83289

diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 65c488bef8a7..1a2fdb5540f0 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -34,6 +34,7 @@ Globals
 OOODOWNLOADNAME 1
 64BITPRODUCT @WINDOWS_X64@
 WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@
+CRASHDUMPENABLE @DEFAULT_CRASHDUMP_VALUE@
 }
 }
 }
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1209c5786fb5..e46bd98acd60 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -444,7 +444,7 @@ ProfileItem gid_Brand_Profileitem_Soffice_CrashDump
 ModuleID = gid_Module_Root_Brand;
 Section = "Bootstrap";
 Key = "CrashDumpEnable";
-Value = "true";
+Value = "${CRASHDUMPENABLE}";
 End
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/util scp2/source

2019-11-20 Thread Juergen Funk (via logerrit) 
 instsetoo_native/util/openoffice.lst.in |1 +
 scp2/source/ooo/common_brand.scp|2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 73524467b9a6a7c4e6d5173aba79d80632ef46e2
Author: Juergen Funk 
AuthorDate: Tue Nov 19 10:07:25 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Nov 20 11:42:59 2019 +0100

tdf#127711 Fix msi-soffice.ini CrashDumpEnable-entry

 when the switch --disable-crashdump is set, then the
 switch "CrashDumpEnable" set to "false", was only in
 instdir/program/soffice.ini, but was not
 in soffice.ini in msi it was always true

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

diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 65c488bef8a7..1a2fdb5540f0 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -34,6 +34,7 @@ Globals
 OOODOWNLOADNAME 1
 64BITPRODUCT @WINDOWS_X64@
 WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@
+CRASHDUMPENABLE @DEFAULT_CRASHDUMP_VALUE@
 }
 }
 }
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1209c5786fb5..e46bd98acd60 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -444,7 +444,7 @@ ProfileItem gid_Brand_Profileitem_Soffice_CrashDump
 ModuleID = gid_Module_Root_Brand;
 Section = "Bootstrap";
 Key = "CrashDumpEnable";
-Value = "true";
+Value = "${CRASHDUMPENABLE}";
 End
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh

2019-11-19 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7f8c9ddbbd26594bb9249cc6295d0170e4bb58e7
Author: Juergen Funk 
AuthorDate: Mon Nov 18 10:33:13 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Nov 19 11:17:57 2019 +0100

symstore.sh: use logical operators for test statements

No need to spawn two subshells, test can do and/or logical ops itself.

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

diff --git a/bin/symstore.sh b/bin/symstore.sh
index f37ea0f4e7a0..2f7ad2f77610 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -20,11 +20,11 @@ add_pdb()
 }
 
 # check preconditions
-if [ -z "${INSTDIR}" ] || [ -z "${WORKDIR}" ]; then
+if [ -z "${INSTDIR}" -o -z "${WORKDIR}" ]; then
 echo "INSTDIR or WORKDIR not set - script expects calling inside buildenv"
 exit 1
 fi
-if [ ! -d "${INSTDIR}" ] || [ ! -d "${WORKDIR}" ]; then
+if [ ! -d "${INSTDIR}" -o ! -d "${WORKDIR}" ]; then
 echo "INSTDIR or WORKDIR not present - script expects calling after full 
build"
 exit 1
 fi
@@ -84,7 +84,7 @@ rm -f "${TMPFILE}"
 # Cleanup symstore, older revisions will be removed.  Unless the
 # .dll/.exe changes, the .pdb should be shared, so with incremental
 # tinderbox several revisions should not be that space-demanding.
-if [ "${MAX_KEEP}" -gt 0 ] && [ -d "${SYM_PATH}/000Admin" ]; then
+if [ "${MAX_KEEP}" -gt 0 -a -d "${SYM_PATH}/000Admin" ]; then
 to_remove=$(ls -1 "${SYM_PATH}/000Admin" | grep -v '\.txt' | grep -v 
'\.deleted' | sort | head -n "-${MAX_KEEP}")
 for revision in $to_remove; do
 symstore.exe del /i "${revision}" /s "$(cygpath -w "${SYM_PATH}")"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh

2019-11-19 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 83e3ba6fba486a5bf68427f0cf9aa9de7d97a391
Author: Juergen Funk 
AuthorDate: Thu Nov 14 12:25:35 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Nov 19 11:17:36 2019 +0100

Add comment and pdb-only switch to symstore.sh

Two new switches added:
-c plus a comment for the transaction
-n do not store the exe/dll on the symbol server

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

diff --git a/bin/symstore.sh b/bin/symstore.sh
index b368eb3e6715..f37ea0f4e7a0 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -7,7 +7,7 @@ add_pdb()
 list=$3
 for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
 # store dll/exe itself (needed for minidumps)
-if [ -f "$file" ]; then
+if [ -f "$file" -a $WITHEXEC == 1 ] ; then
 cygpath -w "$file" >> "$list"
 fi
 # store pdb file
@@ -36,12 +36,17 @@ which symstore.exe > /dev/null 2>&1 || {
 # defaults
 MAX_KEEP=5
 SYM_PATH=${WORKDIR}/symstore
+COMMENT=""
+COMCMD=""
+WITHEXEC=1
 
 USAGE="Usage: $0 [-h|-k |-p ]
-   -h: this cruft
-   -k :   keep this number of old symbol versions around
-   (default: ${MAX_KEEP}. Set to 0 for unlimited)
-   -p :  specify full path to symbol store tree
+   -h:  this cruft
+   -c  specifies a comment for the transaction
+   -n   do not store exe/dll on the symbole server
+   -k :keep this number of old symbol versions around
+(default: ${MAX_KEEP}. Set to 0 for unlimited)
+   -p :   specify full path to symbol store tree
 If no path is specified, defaults to ${SYM_PATH}.
 "
 
@@ -51,7 +56,9 @@ do
case "$1" in
 -k|--keep) MAX_KEEP="$2"; shift 2;;
 -p|--path) SYM_PATH="$2"; shift 2;;
--h|--help) echo "${USAGE}"; exit 0; shift;;
+-c|--comment) COMCMD="/c"; COMMENT="$2"; shift 2;;
+-n|--noexec) WITHEXEC=0; shift ;;
+-h|--help) echo "${USAGE}"; exit 0;;
 -*) echo "${USAGE}" >&2; exit 1;;
 *) break;;
esac
@@ -71,7 +78,7 @@ add_pdb dll Library "${TMPFILE}"
 add_pdb exe Executable "${TMPFILE}"
 
 # stick all of it into symbol store
-symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w 
"${SYM_PATH}")" /t "${PRODUCTNAME}" /v 
"${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
+symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w 
"${SYM_PATH}")" /t "${PRODUCTNAME}" /v 
"${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
 "${COMCMD}" "${COMMENT}"
 rm -f "${TMPFILE}"
 
 # Cleanup symstore, older revisions will be removed.  Unless the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - cui/source

2019-11-04 Thread Juergen Funk (via logerrit) 
 cui/source/options/optgdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4501cbf6ee93b140cad9ba2d5d1abda5d421764
Author: Juergen Funk 
AuthorDate: Mon Nov 4 10:42:06 2019 +0100
Commit: Juergen Funk (CIB) 
CommitDate: Mon Nov 4 13:13:56 2019 +0100

Backport mismatch for tdf#107471 Add checkbox

  to enable/disable sending crash reports to TDF

  the hide it when compiled with --disable-breakpad
  was not hide it was inactive

   commit: 42af34720f5fb5be34e0b5b757e7b7a69595f91c

Change-Id: Id4731265ad444bc6b16443e98e531f186be5b11c
Reviewed-on: https://gerrit.libreoffice.org/81989
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 05c48787f6b1..7949342e40d1 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -431,7 +431,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 
m_xCrashReport->Enable(!officecfg::Office::Common::Misc::CrashReport::isReadOnly());
 m_xCrashReport->SaveValue();
 #else
-m_xCrashReport->Disable();
+m_xCrashReport->Hide();
 #endif
 
 SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false, 
 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac cui/Library_cui.mk cui/source desktop/source include/desktop instsetoo_native/CustomTarget_setup.mk scp2/source

2019-10-02 Thread Juergen Funk (via logerrit) 
 config_host.mk.in  |1 
 configure.ac   |   15 +++
 cui/Library_cui.mk |3 ++
 cui/source/options/optgdlg.cxx |5 ++-
 desktop/source/app/crashreport.cxx |   43 +
 include/desktop/crashreport.hxx|2 +
 instsetoo_native/CustomTarget_setup.mk |1 
 scp2/source/ooo/common_brand.scp   |9 ++
 8 files changed, 67 insertions(+), 12 deletions(-)

New commits:
commit 2215be5268a646d3cc7d138a0184c6826585b7fb
Author: Juergen Funk 
AuthorDate: Wed Sep 18 11:48:21 2019 +0200
Commit: Juergen Funk (CIB) 
CommitDate: Wed Oct 2 09:43:12 2019 +0200

tdf#127711 - A runtime-switch for the MiniCrashDump

 - in soffice.ini (sofficerc) the entry "CrashDumpEnable" default is "true"
- when false then the Dump.ini and the dump-file are not written
- when the switch --disable-crashdump is set, then the
  switch "CrashDumpEnable" set to "false"
- when the entry "CrashDumpEnable" is missing, in this case is the
  default true, too
- the checkbox under Options-General "Send crash reports to ..."
  is deactive and shows off (only view, not change the config)

 - when set the environment variable "CRASH_DUMP_ENABLE" to any char
   then the switch "CrashDumpEnable=false" are overrules with true
   and the Dump.ini and dump-file are write

Change-Id: I34e7795640eb95d111e18b0ad46ec67b2c126b19
Reviewed-on: https://gerrit.libreoffice.org/79273
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) 

diff --git a/config_host.mk.in b/config_host.mk.in
index 048e14a538ab..9a1bb81f70d7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -118,6 +118,7 @@ export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
 export ENABLE_ANDROID_EDITING=@ENABLE_ANDROID_EDITING@
 export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_BREAKPAD=@ENABLE_BREAKPAD@
+export DEFAULT_CRASHDUMP_VALUE=@DEFAULT_CRASHDUMP_VALUE@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
 export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@
 export ENABLE_CIPHER_OPENSSL_BACKEND=@ENABLE_CIPHER_OPENSSL_BACKEND@
diff --git a/configure.ac b/configure.ac
index 9de464819664..364efe36621a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1050,6 +1050,11 @@ libo_FUZZ_ARG_ENABLE(breakpad,
 [Enables breakpad for crash reporting.])
 )
 
+libo_FUZZ_ARG_ENABLE(crashdump,
+AS_HELP_STRING([--disable-crashdump],
+[Disable dump.ini and dump-file, when --enable-breakpad])
+)
+
 AC_ARG_ENABLE(fetch-external,
 AS_HELP_STRING([--disable-fetch-external],
 [Disables fetching external tarballs from web sources.])
@@ -9515,6 +9520,7 @@ AC_SUBST(ICU_UCHAR_TYPE)
 dnl ==
 dnl Breakpad
 dnl ==
+DEFAULT_CRASHDUMP_VALUE="true"
 AC_MSG_CHECKING([whether to enable breakpad])
 if test "$enable_breakpad" != yes; then
 AC_MSG_RESULT([no])
@@ -9525,6 +9531,14 @@ else
 AC_DEFINE(HAVE_FEATURE_BREAKPAD, 1)
 BUILD_TYPE="$BUILD_TYPE BREAKPAD"
 
+AC_MSG_CHECKING([for disable crash dump])
+if test "$enable_crashdump" = no; then
+DEFAULT_CRASHDUMP_VALUE="false"
+AC_MSG_RESULT([yes])
+else
+   AC_MSG_RESULT([no])
+fi
+
 AC_MSG_CHECKING([for crashreport config])
 if test "$with_symbol_config" = "no"; then
 BREAKPAD_SYMBOL_CONFIG="invalid"
@@ -9537,6 +9551,7 @@ else
 AC_SUBST(BREAKPAD_SYMBOL_CONFIG)
 fi
 AC_SUBST(ENABLE_BREAKPAD)
+AC_SUBST(DEFAULT_CRASHDUMP_VALUE)
 
 dnl ==
 dnl libfuzzer
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 54e3733daef1..e45e35a8f0e3 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -59,6 +59,9 @@ $(eval $(call gb_Library_use_libraries,cui,\
 ucbhelper \
 utl \
 vcl \
+$(if $(ENABLE_BREAKPAD), \
+crashreport \
+) \
 ))
 
 $(eval $(call gb_Library_use_externals,cui,\
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 3c92e50a6ac2..c41a2ab51576 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -392,8 +393,8 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 m_xCollectUsageInfo->save_state();
 
 #if HAVE_FEATURE_BREAKPAD
-
m_xCrashReport->set_active(officecfg::Office::Common::Misc::CrashReport::get());
-
m_xCrashReport->set_sensitive(!officecfg::Office::Common::Misc::CrashReport::isReadOnly());
+
m_xCrashReport->set_active(officecfg::Office::Common::Misc::CrashReport::get() 
&& CrashReporter::IsDumpEnable());
+
m_xCrashReport->set_sensitive(!officecfg::Office::Common::Misc::CrashReport::isReadOnly()
 && CrashReporter::IsDumpEnable());

[Libreoffice-commits] core.git: desktop/source framework/source include/desktop svx/source vcl/opengl vcl/source vcl/win

2019-10-01 Thread Juergen Funk (via logerrit) 
 desktop/source/app/app.cxx  |   39 ++-
 desktop/source/app/crashreport.cxx  |   93 +---
 desktop/source/app/sofficemain.cxx  |   14 +---
 desktop/source/minidump/minidump.cxx|   20 --
 desktop/source/minidump/minidump_upload.cxx |2 
 framework/source/services/desktop.cxx   |2 
 include/desktop/crashreport.hxx |   59 ++---
 include/desktop/minidump.hxx|   13 +++
 svx/source/dialog/crashreportdlg.cxx|5 -
 vcl/opengl/win/WinDeviceInfo.cxx|6 -
 vcl/opengl/x11/X11DeviceInfo.cxx|4 -
 vcl/source/app/salplug.cxx  |2 
 vcl/source/opengl/OpenGLHelper.cxx  |2 
 vcl/source/window/builder.cxx   |2 
 vcl/win/app/salinst.cxx |2 
 15 files changed, 147 insertions(+), 118 deletions(-)

New commits:
commit 8fe03eef707561bb0b9e1655292619ec3cd347f5
Author: Juergen Funk 
AuthorDate: Wed Sep 25 13:49:26 2019 +0200
Commit: Juergen Funk (CIB) 
CommitDate: Wed Oct 2 07:10:50 2019 +0200

Refactoring of the class CrashReporter

 - remove double code
 - using of all the methode of the CrashReporter-Class
 - all methode only active when crash-dump enable
except the addKeyValue

With this change the handling for the patch
tdf#127711 A runtime-switch for the MiniCrashDump
would be simpler

Change-Id: I339b3b8e06f7fc2cd3c0d34ece112a6fd352913a
Reviewed-on: https://gerrit.libreoffice.org/79272
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 13fece37a5b1..b39f6931ec56 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -127,10 +127,6 @@
 #include 
 #include "langselect.hxx"
 
-#if HAVE_FEATURE_BREAKPAD
-#include 
-#endif
-
 #if defined MACOSX
 #include 
 #include 
@@ -894,26 +890,6 @@ void Desktop::HandleBootstrapErrors(
 
 namespace {
 
-bool crashReportInfoExists()
-{
-#if HAVE_FEATURE_BREAKPAD
-std::string path = CrashReporter::getIniFileName();
-std::ifstream aFile(path);
-while (aFile.good())
-{
-std::string line;
-std::getline(aFile, line);
-int sep = line.find('=');
-if (sep >= 0)
-{
-std::string key = line.substr(0, sep);
-if (key == "DumpFile")
-return true;
-}
-}
-#endif
-return false;
-}
 
 #if HAVE_FEATURE_BREAKPAD
 void handleCrashReport()
@@ -972,7 +948,12 @@ void impl_checkRecoveryState(bool& bCrashed   ,
  bool& bRecoveryDataExists,
  bool& bSessionDataExists )
 {
-bCrashed = officecfg::Office::Recovery::RecoveryInfo::Crashed::get() || 
crashReportInfoExists();
+bCrashed = officecfg::Office::Recovery::RecoveryInfo::Crashed::get()
+#if HAVE_FEATURE_BREAKPAD
+|| CrashReporter::crashReportInfoExists();
+#else
+;
+#endif
 bool elements = officecfg::Office::Recovery::RecoveryList::get()->
 hasElements();
 bool session
@@ -2005,7 +1986,7 @@ void Desktop::OpenClients()
 #endif
 
 #if HAVE_FEATURE_BREAKPAD
-if (officecfg::Office::Common::Misc::CrashReport::get() && 
crashReportInfoExists())
+if (officecfg::Office::Common::Misc::CrashReport::get() && 
CrashReporter::crashReportInfoExists())
 handleCrashReport();
 #endif
 
@@ -2083,11 +2064,9 @@ void Desktop::OpenClients()
 }
 }
 }
-#if HAVE_FEATURE_BREAKPAD
-CrashReporter::writeCommonInfo();
+
 // write this information here to avoid depending on vcl in the crash 
reporter lib
-CrashReporter::addKeyValue("Language", 
Application::GetSettings().GetLanguageTag().getBcp47());
-#endif
+CrashReporter::addKeyValue("Language", 
Application::GetSettings().GetLanguageTag().getBcp47(), CrashReporter::Create);
 
 RequestHandler::EnableRequests();
 
diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index 23868fe70c58..88cd6d77b0d3 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -14,17 +14,17 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 
 #include 
-#include 
 
-osl::Mutex CrashReporter::maMutex;
 
 #if HAVE_FEATURE_BREAKPAD
 
+#include 
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
 #include 
 #elif defined WNT
@@ -38,41 +38,44 @@ osl::Mutex CrashReporter::maMutex;
 #endif
 #endif
 
+osl::Mutex CrashReporter::maMutex;
 google_breakpad::ExceptionHandler* CrashReporter::mpExceptionHandler = nullptr;
 bool CrashReporter::mbInit = false;
-std::map CrashReporter::maKeyValues;
+CrashReporter::vmaKeyValues CrashReporter::maKeyValues;
 
-namespace {
 
-void writeToStream(std::ofstream& strm, const OUString& rKey, const OUString& 
rValue)
+void

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

2019-10-01 Thread Juergen Funk (via logerrit) 
 desktop/source/minidump/minidump.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 044a683e6c8f864d46fe8ebe3ef5c757cbea30a6
Author: Juergen Funk 
AuthorDate: Wed Sep 25 12:09:21 2019 +0200
Commit: Juergen Funk (CIB) 
CommitDate: Tue Oct 1 10:35:16 2019 +0200

desktop: proper error checking for crashreport ini reading


Change-Id: I1107304a0e3f482b6a7e6110006c2f26b9cb0778
Reviewed-on: https://gerrit.libreoffice.org/79603
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 

diff --git a/desktop/source/minidump/minidump.cxx 
b/desktop/source/minidump/minidump.cxx
index 85b2374e4ad7..f9666bff5998 100644
--- a/desktop/source/minidump/minidump.cxx
+++ b/desktop/source/minidump/minidump.cxx
@@ -23,7 +23,9 @@ static std::map 
readStrings(std::istream& file)
 {
 std::map parameters;
 
-while (!file.eof())
+// when file is not readable, the status eof would not be set
+// better test of state is okay
+while (file)
 {
 std::string line;
 std::getline(file, line);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source framework/source include/desktop vcl/opengl vcl/source vcl/win

2019-10-01 Thread Juergen Funk (via logerrit) 
 desktop/source/app/app.cxx|2 +-
 desktop/source/app/crashreport.cxx|2 +-
 framework/source/services/desktop.cxx |2 +-
 include/desktop/crashreport.hxx   |4 ++--
 vcl/opengl/win/WinDeviceInfo.cxx  |6 +++---
 vcl/opengl/x11/X11DeviceInfo.cxx  |4 ++--
 vcl/source/app/salplug.cxx|2 +-
 vcl/source/opengl/OpenGLHelper.cxx|2 +-
 vcl/source/window/builder.cxx |2 +-
 vcl/win/app/salinst.cxx   |2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit b5adb2433de4f376c253a813a632e982c7ac90c5
Author: Juergen Funk 
AuthorDate: Wed Sep 25 11:21:17 2019 +0200
Commit: Juergen Funk (CIB) 
CommitDate: Tue Oct 1 10:34:20 2019 +0200

crashreport: change addKeyValue to lower-case camel

Change-Id: Ife5775d3a570da1fc2e4dd627456523705b64e1d
Reviewed-on: https://gerrit.libreoffice.org/79601
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c38958c05dd9..13fece37a5b1 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2086,7 +2086,7 @@ void Desktop::OpenClients()
 #if HAVE_FEATURE_BREAKPAD
 CrashReporter::writeCommonInfo();
 // write this information here to avoid depending on vcl in the crash 
reporter lib
-CrashReporter::AddKeyValue("Language", 
Application::GetSettings().GetLanguageTag().getBcp47());
+CrashReporter::addKeyValue("Language", 
Application::GetSettings().GetLanguageTag().getBcp47());
 #endif
 
 RequestHandler::EnableRequests();
diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index 4a702f4420bd..23868fe70c58 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -52,7 +52,7 @@ void writeToStream(std::ofstream& strm, const OUString& rKey, 
const OUString& rV
 
 }
 
-void CrashReporter::AddKeyValue(const OUString& rKey, const OUString& rValue)
+void CrashReporter::addKeyValue(const OUString& rKey, const OUString& rValue)
 {
 osl::MutexGuard aGuard(maMutex);
 if (mbInit)
diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 7e0052bf57a6..26895afe78dc 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -320,7 +320,7 @@ sal_Bool SAL_CALL Desktop::terminate()
 // see dispose() for further information.
 /* SAFE AREA 
---
 */
 SolarMutexClearableGuard aWriteLock;
-CrashReporter::AddKeyValue("ShutDown", OUString::boolean(true));
+CrashReporter::addKeyValue("ShutDown", OUString::boolean(true));
 m_bIsTerminated = true;
 aWriteLock.clear();
 /* UNSAFE AREA 
-
 */
diff --git a/include/desktop/crashreport.hxx b/include/desktop/crashreport.hxx
index 6056adbe1d28..e3486bbf0863 100644
--- a/include/desktop/crashreport.hxx
+++ b/include/desktop/crashreport.hxx
@@ -41,7 +41,7 @@ CRASHREPORT_DLLPUBLIC
 /*class*/ CrashReporter
 {
 public:
-static void AddKeyValue(const OUString& rKey, const OUString& rValue);
+static void addKeyValue(const OUString& rKey, const OUString& rValue);
 
 static std::string getIniFileName();
 
@@ -69,7 +69,7 @@ private:
 // everywhere we want to log something to the crash report system.
 #if HAVE_FEATURE_BREAKPAD
 #else
-inline void CrashReporter::AddKeyValue(SAL_UNUSED_PARAMETER const OUString& 
/*rKey*/, SAL_UNUSED_PARAMETER const OUString& /*rValue*/)
+inline void CrashReporter::addKeyValue(SAL_UNUSED_PARAMETER const OUString& 
/*rKey*/, SAL_UNUSED_PARAMETER const OUString& /*rValue*/)
 {
 }
 #endif
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 5c86d9aca22f..53801f4ed859 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -531,9 +531,9 @@ void writeToLog(SvStream& rStrm, const char* pKey, const 
OUString & rVal)
 
 bool WinOpenGLDeviceInfo::isDeviceBlocked()
 {
-CrashReporter::AddKeyValue("OpenGLVendor", maAdapterVendorID);
-CrashReporter::AddKeyValue("OpenGLDevice", maAdapterDeviceID);
-CrashReporter::AddKeyValue("OpenGLDriver", maDriverVersion);
+CrashReporter::addKeyValue("OpenGLVendor", maAdapterVendorID);
+CrashReporter::addKeyValue("OpenGLDevice", maAdapterDeviceID);
+CrashReporter::addKeyValue("OpenGLDriver", maDriverVersion);
 
 SAL_INFO("vcl.opengl", maDriverVersion);
 SAL_INFO("vcl.opengl", maDriverDate);
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index ace010d8ed31..68d6c204a17f 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -283,8 +283,8 @@ bool X11OpenGLDeviceInfo::isDeviceBlocked()
 if (mnGLMajorVersion

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/win

2019-08-29 Thread Juergen Funk (via logerrit) 
 vcl/win/gdi/salprn.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5df61843fa1c2360f794ab74e0ac94c12764faa7
Author: Juergen Funk 
AuthorDate: Tue Aug 27 09:22:17 2019 +0200
Commit: Juergen Funk (CIB) 
CommitDate: Thu Aug 29 10:06:37 2019 +0200

tdf#127192 Printing in main thread

trac29045

the wollmux has change the dialogs form swing to the LO-Dialogs,
and when printig with MS-PDF then LO hang on this line.
The reason is wollmux run in it own thread, but this thread has
no win-message-pump, when the printer-driver would open the
FileSave-Dialog then it hangs, because the message-pump
is missing in this thread.

The swing has made it own win-message-pump for this
thread.

Reviewed-on: https://gerrit.libreoffice.org/78170
Reviewed-by: Jan-Marek Glogowski 
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 
(cherry picked from commit c16bfef0d51ad903defdb2bacb4550de481d3074)

Change-Id: Ia5131464dcc5f166133a3302d29550e945dd1026
Reviewed-on: https://gerrit.libreoffice.org/78248
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 

diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index ddf58fd7e969..aaf96785b0db 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -48,6 +48,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 #include 
@@ -1497,8 +1499,8 @@ bool WinSalPrinter::StartJob( const OUString* pFileName,
 else
 aInfo.lpszOutput = nullptr;
 
-// start Job
-int nRet = lcl_StartDocW( hDC, , this );
+// start Job, in the main thread
+int nRet = vcl::solarthread::syncExecute([hDC, this, ]() -> int { 
return lcl_StartDocW(hDC, , this); });
 
 if ( nRet <= 0 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-08-28 Thread Juergen Funk (via logerrit) 
 vcl/win/gdi/salprn.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c16bfef0d51ad903defdb2bacb4550de481d3074
Author: Juergen Funk 
AuthorDate: Tue Aug 27 09:22:17 2019 +0200
Commit: Juergen Funk (CIB) 
CommitDate: Wed Aug 28 14:23:11 2019 +0200

tdf#127192 Printing in main thread

the wollmux has change the dialogs form swing to the LO-Dialogs,
and when printig with MS-PDF then LO hang on this line.
The reason is wollmux run in it own thread, but this thread has
no win-message-pump, when the printer-driver would open the
FileSave-Dialog then it hangs, because the message-pump
is missing in this thread.

The swing has made it own win-message-pump for this
thread.

Change-Id: Ia5131464dcc5f166133a3302d29550e945dd1026
Reviewed-on: https://gerrit.libreoffice.org/78170
Reviewed-by: Jan-Marek Glogowski 
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 

diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 8119bad8cdb7..73ade5080c55 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -52,6 +52,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 #include 
@@ -1502,8 +1504,8 @@ bool WinSalPrinter::StartJob( const OUString* pFileName,
 else
 aInfo.lpszOutput = nullptr;
 
-// start Job
-int nRet = lcl_StartDocW( hDC, , this );
+// start Job, in the main thread
+int nRet = vcl::solarthread::syncExecute([hDC, this, ]() -> int { 
return lcl_StartDocW(hDC, , this); });
 
 if ( nRet <= 0 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57c' - configure.ac

2019-07-01 Thread Juergen Funk (via logerrit) 
 configure.ac |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit afa2f20897c453c0dc43a7f51d18a9da2fc3b781
Author: Juergen Funk 
AuthorDate: Wed Sep 5 15:36:23 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Jul 1 09:34:15 2019 +0200

Improve the Windows SDK 10 ProductVersion-Path

At the moment the ProductVersion-Path has always the same format,
with this patch, when the format the same, then no change is need for
the next Version.

Change-Id: I6a52fd20751ba139dd5ed6e3802f29c5e8f02975
Reviewed-on: https://gerrit.libreoffice.org/60041
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) 
(cherry picked from commit dfb18a0557d5a897f443fd1f1d617365f6ae134a)
(cherry picked from commit a19d1e592695f95e8ef1e57ee23d74cad7801a29)

diff --git a/configure.ac b/configure.ac
index e83bb7909574..6d2cb1c0857f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5240,16 +5240,17 @@ find_winsdk_version()
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v${1}/ProductVersion"
 if test -n "$regvalue"; then
 winsdkbinsubdir="$regvalue".0
-fi
-winsdklibsubdir=$regvalue
-if test "$regvalue" = "10.0.14393"; then
-winsdklibsubdir="10.0.14393.0"
-elif test "$regvalue" = "10.0.16299"; then
-winsdklibsubdir="10.0.16299.0"
-elif test "$regvalue" = "10.0.15063"; then
-winsdklibsubdir="10.0.15063.0"
-elif test "$regvalue" = "10.0.17134"; then
-winsdklibsubdir="$regvalue.0"
+winsdklibsubdir=$winsdkbinsubdir
+tmppath="$winsdktest\\Include\\$winsdklibsubdir"
+# test exist the SDK path
+if test -d "$tmppath"; then
+   # when path is convertable to a short path then path is okay
+   if ! cygpath -d "$tmppath"; then
+  AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see 
NtfsDisable8dot3NameCreation])
+   fi
+else
+   AC_MSG_ERROR([The Windows SDK not found, check the 
installation])
+fi
 fi
 return
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac

2019-06-16 Thread Juergen Funk (via logerrit) 
 configure.ac |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 75ec97162909e5490826f23b9e2ef7ab4e84f9d9
Author: Juergen Funk 
AuthorDate: Wed Sep 5 15:36:23 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Jun 17 03:48:14 2019 +0200

Improve the Windows SDK 10 ProductVersion-Path

At the moment the ProductVersion-Path has always the same format,
with this patch, when the format the same, then no change is need for
the next Version.

Change-Id: I6a52fd20751ba139dd5ed6e3802f29c5e8f02975
Reviewed-on: https://gerrit.libreoffice.org/60041
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) 
(cherry picked from commit dfb18a0557d5a897f443fd1f1d617365f6ae134a)

diff --git a/configure.ac b/configure.ac
index eb496653b5f9..8e02e8357ef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5240,16 +5240,17 @@ find_winsdk_version()
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v${1}/ProductVersion"
 if test -n "$regvalue"; then
 winsdkbinsubdir="$regvalue".0
-fi
-winsdklibsubdir=$regvalue
-if test "$regvalue" = "10.0.14393"; then
-winsdklibsubdir="10.0.14393.0"
-elif test "$regvalue" = "10.0.16299"; then
-winsdklibsubdir="10.0.16299.0"
-elif test "$regvalue" = "10.0.15063"; then
-winsdklibsubdir="10.0.15063.0"
-elif test "$regvalue" = "10.0.17134"; then
-winsdklibsubdir="$regvalue.0"
+winsdklibsubdir=$winsdkbinsubdir
+tmppath="$winsdktest\\Include\\$winsdklibsubdir"
+# test exist the SDK path
+if test -d "$tmppath"; then
+   # when path is convertable to a short path then path is okay
+   if ! cygpath -d "$tmppath"; then
+  AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see 
NtfsDisable8dot3NameCreation])
+   fi
+else
+   AC_MSG_ERROR([The Windows SDK not found, check the 
installation])
+fi
 fi
 return
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-31 Thread Juergen Funk (via logerrit) 
 bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx |4 ++--
 bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6d21e8d651ace0704e954bb13bdc8f67c17b1a41
Author: Juergen Funk 
AuthorDate: Mon May 27 12:36:44 2019 +0200
Commit: Michael Stahl 
CommitDate: Fri May 31 11:26:51 2019 +0200

Replace 0 in nullptr

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

diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 01967af8bf43..a5e0e53580ac 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -55,8 +55,8 @@ static inline typelib_TypeClass cpp2uno_call(
 TYPELIB_DANGER_GET( , pReturnTypeRef );
 }
 
-void * pUnoReturn = 0;
-void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, 
reconversion need
+void * pUnoReturn = nullptr;
+void * pCppReturn = nullptr; // complex return ptr: if != 0 && != 
pUnoReturn, reconversion need
 
 if (pReturnTypeDescr)
 {
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx 
b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
index d5c89ca78985..f215a92e9078 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
@@ -150,7 +150,7 @@ static void cpp_call(
 TYPELIB_DANGER_GET( , pReturnTypeRef );
 assert(pReturnTypeDescr);
 
-void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
+void * pCppReturn = nullptr; // if != 0 && != pUnoReturn, needs 
reconversion
 
 if (pReturnTypeDescr)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits