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

[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

[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

[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
+++ b/sfx2/sdi

[Libreoffice-commits] core.git: g

[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

[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 -i

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

[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

[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::Shortc

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

[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 ];

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

[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_

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

[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 +6

AW: New function UNOIDL interface

[Juergen Funk ML]

Okay, i made new offapi/com/sun/star/embed/XEmbeddedObject2.idl,

thank you thorsten for the hint

juergen


Von: LibreOffice  im Auftrag von 
Juergen Funk ML 
Gesendet: Mittwoch, 23. März 2022 10:00
An: Miklos Vajna
Cc: libreoffice-dev
Betreff: AW: New function UNOIDL interface

Hi Miklos,

thank you for the hint.

I prefer " external UNO API user would use that interface, then perhaps you 
should mark it as non-published",
in this case it is okay it is in offapi/com/sun/star/embed/XEmbeddedObject.idl 
or i need the new offapi/com/sun/star/embed/XEmbeddedObject2.idl?


Best
Juergen

Von: Miklos Vajna 
Gesendet: Mittwoch, 23. März 2022 09:28
An: Juergen Funk Mailinglist
Cc: libreoffice-dev
Betreff: Re: New function UNOIDL interface

Hi Juergen,

On Tue, Mar 22, 2022 at 12:10:07PM +0000, Juergen Funk Mailinglist 
 wrote:
>
> I have this patch https://gerrit.libreoffice.org/c/core/+/130692. When the 
> user performs an "Update All" it is possible that there can be overwrites, 
> via dialog box is pointed out, but when this is canceled, immediately the 
> same query occurs again.
> Because there are two updates (for the links and for the OLE object), to 
> distinguish these two updates I have found no other solution than to extend 
> the UNOIDL interface by a function.
>
> Maybe someone has a better solution to not change the UNOIDL interface.

Did you consider adding a new
offapi/com/sun/star/embed/XEmbeddedObject2.idl instead of changing the
existing XEmbeddedObject one? That would avoid the need to change an
existing, published interface.

Or in case you think that it's not likely that any external UNO API user
would use that interface, then perhaps you should mark it as
non-published.

Regards,

Miklos

AW: New function UNOIDL interface

[Juergen Funk ML]

Hi Miklos,

thank you for the hint.

I prefer " external UNO API user would use that interface, then perhaps you 
should mark it as non-published", 
in this case it is okay it is in offapi/com/sun/star/embed/XEmbeddedObject.idl 
or i need the new offapi/com/sun/star/embed/XEmbeddedObject2.idl?


Best
Juergen

Von: Miklos Vajna 
Gesendet: Mittwoch, 23. März 2022 09:28
An: Juergen Funk Mailinglist
Cc: libreoffice-dev
Betreff: Re: New function UNOIDL interface

Hi Juergen,

On Tue, Mar 22, 2022 at 12:10:07PM +0000, Juergen Funk Mailinglist 
 wrote:
>
> I have this patch https://gerrit.libreoffice.org/c/core/+/130692. When the 
> user performs an "Update All" it is possible that there can be overwrites, 
> via dialog box is pointed out, but when this is canceled, immediately the 
> same query occurs again.
> Because there are two updates (for the links and for the OLE object), to 
> distinguish these two updates I have found no other solution than to extend 
> the UNOIDL interface by a function.
>
> Maybe someone has a better solution to not change the UNOIDL interface.

Did you consider adding a new
offapi/com/sun/star/embed/XEmbeddedObject2.idl instead of changing the
existing XEmbeddedObject one? That would avoid the need to change an
existing, published interface.

Or in case you think that it's not likely that any external UNO API user
would use that interface, then perhaps you should mark it as
non-published.

Regards,

Miklos

New function UNOIDL interface

[Juergen Funk Mailinglist]

Hello

I have this patch https://gerrit.libreoffice.org/c/core/+/130692. When the user 
performs an "Update All" it is possible that there can be overwrites, via 
dialog box is pointed out, but when this is canceled, immediately the same 
query occurs again.
Because there are two updates (for the links and for the OLE object), to 
distinguish these two updates I have found no other solution than to extend the 
UNOIDL interface by a function.

Maybe someone has a better solution to not change the UNOIDL interface.


Call-Stack (Link)

OCommonEmbeddedObject::HandleLinkAndTempFileSave line 410 
embeddedobj/source/commonembedding/miscobj.cxx
OCommonEmbeddedObject::LoadLink_Impl() line 400 
embeddedobj/source/commonembedding/persistence.cxx
OCommonEmbeddedObject::SwitchStateTo_Impl line 179 
embeddedobj/source/commonembedding/embedobj.cxx
OCommonEmbeddedObject::changeState line 459 
embeddedobj/source/commonembedding/embedobj.cxx
OCommonEmbeddedObject::getPreferredVisualRepresentation line 169 
embeddedobj/source/commonembedding/visobj.cxx
comphelper::EmbeddedObjectContainer::GetGraphicReplacementStream line 1429 
comphelper/source/container/embeddedobjectcontainer.cxx
svt::EmbeddedObjectRef::GetGraphicReplacementStream line 869 
svtools/source/misc/embedhlp.cxx
svt::EmbeddedObjectRef::GetGraphicStream line 676 
svtools/source/misc/embedhlp.cxx
svt::EmbeddedObjectRef::GetReplacement line 473 svtools/source/misc/embedhlp.cxx
svt::EmbeddedObjectRef::UpdateReplacement line 891 
svtools/source/misc/embedhlp.cxx
SwOLENode::GetNewReplacement line 522 sw/source/core/ole/ndole.cxx
SwEmbedObjectLink::DataChanged line 204 sw/source/core/ole/ndole.cxx
sfx2::SvBaseLink::Update line 320 sfx2/source/appl/lnkbase2.cxx
sfx2::LinkManager::UpdateAllLinks line 344 sfx2/source/appl/linkmgr2.cxx
SwBaseShell::Execute line 823 sw/source/uibase/shells/basesh.cxx



Call-Stack (OLE-Objekt)

OCommonEmbeddedObject::HandleLinkAndTempFileSave line 410 
embeddedobj/source/commonembedding/miscobj.cxx
OCommonEmbeddedObject::LoadLink_Impl line 400 
embeddedobj/source/commonembedding/persistence.cxx
OCommonEmbeddedObject::SwitchStateTo_Impl line 179  
embeddedobj/source/commonembedding/embedobj.cxx
OCommonEmbeddedObject::changeState line 459 
embeddedobj/source/commonembedding/embedobj.cxx
OCommonEmbeddedObject::getPreferredVisualRepresentation line 169 
embeddedobj/source/commonembedding/visobj.cxx
comphelper::EmbeddedObjectContainer::GetGraphicReplacementStream line 1429
svt::EmbeddedObjectRef::GetGraphicReplacementStream line 869 
comphelper/source/container/embeddedobjectcontainer.cxx
svt::EmbeddedObjectRef::GetGraphicStream line 676 
svtools/source/misc/embedhlp.cxx
svt::EmbeddedObjectRef::GetReplacement line 473 svtools/source/misc/embedhlp.cxx
svt::EmbeddedObjectRef::UpdateReplacement line 891 
svtools/source/misc/embedhlp.cxx
SwViewShell::UpdateOleObjectPreviews line 764 sw/source/core/view/viewsh.cxx
SwBaseShell::Execute line 832 sw/source/uibase/shells/basesh.cxx



Juergen

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

[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

[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

[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'

[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'

[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'

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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
+ LDFLAG

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

[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

[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

[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

[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

[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

[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

[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 <https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[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

[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

[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

[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::Comm

[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

[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 
 #eli

[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

[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

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

[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

[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

[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 <https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[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

[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

[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 <https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[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

[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

[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

[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

[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

[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() 
&& Cra

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

[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&am

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

[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

[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.

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

[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

[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

[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

[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

[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

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - instsetoo_native/CustomTarget_setup.mk

[Juergen Funk]

 instsetoo_native/CustomTarget_setup.mk |   45 -
 1 file changed, 33 insertions(+), 12 deletions(-)

New commits:
commit 2d40123f62f3361267af2602aa8fb6776b25509f
Author: Juergen Funk 
Date:   Fri Jun 22 08:39:28 2018 +0200

tdf#118303 - Wrong converting of the Vendor-String

Using the make-file function, in this case no converting

this problem was introduced by switching to native Win32 make:

* Makefiles don't have any metadata to specify the encoding
* all of the Cygwin tools in the build system assume
   everything is UTF-8 encoded
* Win32 make calls CreateProcessA(), which converts the
   arguments from some so-called "ANSI" codepage to UCS-2

hence in commands invoked from make, the UTF-8 string is
erroneously interpreted as latin1 and converted to UCS-2.

Change-Id: Ibf3e573b07e7e2d9119e0ff7b4972d8065d84bea
Reviewed-on: https://gerrit.libreoffice.org/56272
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 7f1f1f53206c85fb0e2290e5fb2e20dcedfa2610)

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index a8d56a3beb38..d23dcfeb1b72 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -131,20 +131,41 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'UNO_SERVICES=$(if $(filter 
MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/)services.rdb 
$${URE_MORE_SERVICES}' \
) > $@
 
+
+
+
+
+define instsetoo_native_genversionini
+[Version]
+AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)
+BuildVersion=$(BUILD_VER_STRING)
+buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)
+ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update
+ReferenceOOoMajorMinor=4.1
+UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US
+UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))
+UpdateUserAgent= ($${buildid}; $${_OS}; $${_ARCH}; 
)
+Vendor=$(OOO_VENDOR)
+endef
+
+
+
 .PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,version)
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,version) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-   ( \
-   echo '[Version]' \
-   && echo 'AllLanguages=$(if 
$(gb_WITH_LANG),$(gb_WITH_LANG),en-US)' \
-   && echo 'BuildVersion=$(BUILD_VER_STRING)' \
-   && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 
--format=%H)' \
-   && echo 
'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update'
 \
-   && echo 'ReferenceOOoMajorMinor=4.1' \
-   && echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \
-   && echo 'UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \
-   && echo 'UpdateUserAgent= ($${buildid}; $${_OS}; 
$${_ARCH}; )' \
-   && echo 'Vendor=$(OOO_VENDOR)' \
-   ) > $@
+ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)
+   printf '[Version]\n' > $@ && \
+   printf 'AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)\n' >> 
$@ && \
+   printf 'BuildVersion=$(BUILD_VER_STRING)\n' >> $@ && \
+   printf 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)\n' >> 
$@ && \
+   printf 
'ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update\n'
 >> $@ && \
+   printf 'ReferenceOOoMajorMinor=4.1\n' >> $@ && \
+   printf 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US\n' >> $@ && 
\
+   printf 'UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))\n' >> $@ && \
+   printf 'UpdateUserAgent= ($${buildid}; $${_OS}; $${_ARCH}; 
)\n' >> $@ && \
+   printf 'Vendor=$(OOO_VENDOR)\n' >> $@
+else
+   $(file > $@, $(call instsetoo_native_genversionini))
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - instsetoo_native/CustomTarget_setup.mk

[Juergen Funk]

 instsetoo_native/CustomTarget_setup.mk |   48 -
 1 file changed, 35 insertions(+), 13 deletions(-)

New commits:
commit e6b7948503c276bdfe45a5ee6277ad8edbde6ebe
Author: Juergen Funk 
Date:   Fri Jun 22 08:39:28 2018 +0200

tdf#118303 - Wrong converting of the Vendor-String

Using the make-file function, in this case no converting

this problem was introduced by switching to native Win32 make:

* Makefiles don't have any metadata to specify the encoding
* all of the Cygwin tools in the build system assume
   everything is UTF-8 encoded
* Win32 make calls CreateProcessA(), which converts the
   arguments from some so-called "ANSI" codepage to UCS-2

hence in commands invoked from make, the UTF-8 string is
erroneously interpreted as latin1 and converted to UCS-2.

Change-Id: Ibf3e573b07e7e2d9119e0ff7b4972d8065d84bea
Reviewed-on: https://gerrit.libreoffice.org/56272
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 7f1f1f53206c85fb0e2290e5fb2e20dcedfa2610)
Reviewed-on: https://gerrit.libreoffice.org/56436
Tested-by: Jenkins

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 315e5c825de3..ebeb00dcd019 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -149,21 +149,43 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'UNO_SERVICES=$(if $(filter 
MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/)services.rdb 
$${URE_MORE_SERVICES}' \
) > $@
 
+
+
+
+
+define instsetoo_native_genversionini
+[Version]
+AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)
+BuildVersion=$(BUILD_VER_STRING)
+buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)
+ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update
+UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell cd $(SRCDIR) && 
bin/update/get_update_channel.py $(UPDATE_CONFIG)))
+ReferenceOOoMajorMinor=4.1
+UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US
+UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))
+UpdateUserAgent= ($${buildid}; $${_OS}; $${_ARCH}; 
)
+Vendor=$(OOO_VENDOR)
+endef
+
+
+
 .PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,version)
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,version) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-   ( \
-   echo '[Version]' \
-   && echo 'AllLanguages=$(if 
$(gb_WITH_LANG),$(gb_WITH_LANG),en-US)' \
-   && echo 'BuildVersion=$(BUILD_VER_STRING)' \
-   && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 
--format=%H)' \
-   && echo 
'ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update'
 \
-   && echo 'UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell 
cd $(SRCDIR) && bin/update/get_update_channel.py $(UPDATE_CONFIG)))' \
-   && echo 'ReferenceOOoMajorMinor=4.1' \
-   && echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \
-   && echo 'UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \
-   && echo 'UpdateUserAgent= ($${buildid}; $${_OS}; 
$${_ARCH}; )' \
-   && echo 'Vendor=$(OOO_VENDOR)' \
-   ) > $@
+ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)
+   printf '[Version]\n' > $@ && \
+   printf 'AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)\n' >> 
$@ && \
+   printf 'BuildVersion=$(BUILD_VER_STRING)\n' >> $@ && \
+   printf 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)\n' >> 
$@ && \
+   printf 
'ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update\n'
 >> $@ && \
+   printf 'UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell cd 
$(SRCDIR) && bin/update/get_update_channel.py $(UPDATE_CONFIG)))\n' >> $@ && \
+   printf 'ReferenceOOoMajorMinor=4.1\n' >> $@ && \
+   printf 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US\n' >> $@ && 
\
+   printf 'UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))\n' >> $@ && \
+   printf 'UpdateUserAgent= ($${buildid}; $${_OS}; $${_ARCH}; 
)\n' >> $@ && \
+   printf 'Vendor=$(OOO_VENDOR)\n' >> $@
+else
+   $(file > $@, $(call instsetoo_native_genversionini))
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk

[Juergen Funk]

 instsetoo_native/CustomTarget_setup.mk |   48 -
 1 file changed, 35 insertions(+), 13 deletions(-)

New commits:
commit 7f1f1f53206c85fb0e2290e5fb2e20dcedfa2610
Author: Juergen Funk 
Date:   Fri Jun 22 08:39:28 2018 +0200

tdf#118303 - Wrong converting of the Vendor-String

Using the make-file function, in this case no converting

this problem was introduced by switching to native Win32 make:

* Makefiles don't have any metadata to specify the encoding
* all of the Cygwin tools in the build system assume
   everything is UTF-8 encoded
* Win32 make calls CreateProcessA(), which converts the
   arguments from some so-called "ANSI" codepage to UCS-2

hence in commands invoked from make, the UTF-8 string is
erroneously interpreted as latin1 and converted to UCS-2.

Change-Id: Ibf3e573b07e7e2d9119e0ff7b4972d8065d84bea
Reviewed-on: https://gerrit.libreoffice.org/56272
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 315e5c825de3..ebeb00dcd019 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -149,21 +149,43 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'UNO_SERVICES=$(if $(filter 
MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/)services.rdb 
$${URE_MORE_SERVICES}' \
) > $@
 
+
+
+
+
+define instsetoo_native_genversionini
+[Version]
+AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)
+BuildVersion=$(BUILD_VER_STRING)
+buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)
+ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update
+UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell cd $(SRCDIR) && 
bin/update/get_update_channel.py $(UPDATE_CONFIG)))
+ReferenceOOoMajorMinor=4.1
+UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US
+UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))
+UpdateUserAgent= ($${buildid}; $${_OS}; $${_ARCH}; 
)
+Vendor=$(OOO_VENDOR)
+endef
+
+
+
 .PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,version)
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,version) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-   ( \
-   echo '[Version]' \
-   && echo 'AllLanguages=$(if 
$(gb_WITH_LANG),$(gb_WITH_LANG),en-US)' \
-   && echo 'BuildVersion=$(BUILD_VER_STRING)' \
-   && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 
--format=%H)' \
-   && echo 
'ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update'
 \
-   && echo 'UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell 
cd $(SRCDIR) && bin/update/get_update_channel.py $(UPDATE_CONFIG)))' \
-   && echo 'ReferenceOOoMajorMinor=4.1' \
-   && echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \
-   && echo 'UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \
-   && echo 'UpdateUserAgent= ($${buildid}; $${_OS}; 
$${_ARCH}; )' \
-   && echo 'Vendor=$(OOO_VENDOR)' \
-   ) > $@
+ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)
+   printf '[Version]\n' > $@ && \
+   printf 'AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)\n' >> 
$@ && \
+   printf 'BuildVersion=$(BUILD_VER_STRING)\n' >> $@ && \
+   printf 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)\n' >> 
$@ && \
+   printf 
'ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update\n'
 >> $@ && \
+   printf 'UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell cd 
$(SRCDIR) && bin/update/get_update_channel.py $(UPDATE_CONFIG)))\n' >> $@ && \
+   printf 'ReferenceOOoMajorMinor=4.1\n' >> $@ && \
+   printf 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US\n' >> $@ && 
\
+   printf 'UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))\n' >> $@ && \
+   printf 'UpdateUserAgent= ($${buildid}; $${_OS}; $${_ARCH}; 
)\n' >> $@ && \
+   printf 'Vendor=$(OOO_VENDOR)\n' >> $@
+else
+   $(file > $@, $(call instsetoo_native_genversionini))
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Juergen Funk]

 sfx2/source/doc/docfile.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 6c5af47fc25aecc624e68af174c7e1d9ca2392f9
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Wed Jun 21 14:41:49 2017 +0200

Improve tdf#106942: always erase empty/corrupt lockfile

also when we could not create lockfile, not only when open as readonly

Change-Id: Ied53bbfe47669f62553d97d81f0bed156ae58887
Reviewed-on: https://gerrit.libreoffice.org/39054
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
Tested-by: Katarina Behrens <katarina.behr...@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/49469
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
Tested-by: Aron Budea <aron.bu...@collabora.com>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 431f9d2e78dc..98c861358090 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1242,7 +1242,8 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool 
bNoUI )
 if (bLoading && !bNoUI)
 {
 bIoErr = true;
-bResult = 
ShowLockFileProblemDialog(MessageDlg::LockFileIgnore);
+
ShowLockFileProblemDialog(MessageDlg::LockFileIgnore);
+bResult = true;   // always delete the 
defect lock-file
 }
 }
 catch (const uno::Exception&)
@@ -1250,7 +1251,8 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool 
bNoUI )
 if (bLoading && !bNoUI)
 {
 bIoErr = true;
-bResult = 
ShowLockFileProblemDialog(MessageDlg::LockFileIgnore);
+
ShowLockFileProblemDialog(MessageDlg::LockFileIgnore);
+bResult = true;   // always delete the 
defect lock-file
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - include/sfx2 include/svl l10ntools/source offapi/com offapi/UnoApi_offapi.mk sfx2/source svl/source uui/AllLangResTarget_uui.mk uui/L

[Juergen Funk]

 include/sfx2/docfile.hxx|4 
 include/svl/documentlockfile.hxx|3 
 l10ntools/source/gRun.sh|2 
 offapi/UnoApi_offapi.mk |1 
 offapi/com/sun/star/document/LockFileCorruptRequest.idl |   43 
 sfx2/source/doc/docfile.cxx |  148 ++--
 svl/source/misc/documentlockfile.cxx|7 
 uui/AllLangResTarget_uui.mk |1 
 uui/Library_uui.mk  |1 
 uui/source/iahndl-locking.cxx   |   42 +++-
 uui/source/iahndl.cxx   |2 
 uui/source/iahndl.hxx   |2 
 uui/source/ids.hrc  |   43 ++--
 uui/source/lockcorrupt.cxx  |   44 
 uui/source/lockcorrupt.hxx  |   33 +++
 uui/source/lockcorrupt.src  |   37 
 uui/source/lockfailed.cxx   |5 
 uui/source/lockfailed.src   |6 
 18 files changed, 335 insertions(+), 89 deletions(-)

New commits:
commit e5dc12d37bfea357aeb6f71e876dd4f93833d1c9
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Wed Apr 12 11:26:10 2017 +0200

tdf#106942 Wrong message when lock file is empty or corrupt

1. Erase empty or corrupt lockfile, when reading it fails and
   skip "Locked Document Dialog" in that case
2. Show Dialog (use LockFileIgnoreRequest -> LockFailedQueryBox)
   when create lock file is not possible.
   Two Dialogs:  "lock file create error" and
 "empty lockfile is present"
   Set the document to read-only when creating lockfile is not
   possible. If lockfile is corrupt or empty, inform the user.
   They can interrupt loading the document or open it read-only,
   which also erases the corrupt lock file after closing
   the document
3. Handling for the two Dialogs
   Use LockFileIgnoreRequst for create lockfile error and
   add a new LockFileCorruptRequest, (lock file is corrupt).
   Change and generate new messages for both dialogs in english

Change-Id: I35c377f85b5113e8ffb89d83b9544b8ebc81d89f
Reviewed-on: https://gerrit.libreoffice.org/36658
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/49468
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
Tested-by: Aron Budea <aron.bu...@collabora.com>

diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 7a4e34013195..3a9c8978774f 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -164,8 +164,10 @@ public:
 boolIsStorage();
 
 enum class ShowLockResult { NoLock, Succeeded,Try };
-ShowLockResult  ShowLockedDocumentDialog( const LockFileEntry& aData, 
bool bIsLoading, bool bOwnLock );
+ShowLockResult  ShowLockedDocumentDialog( const LockFileEntry& aData, 
bool bIsLoading, bool bOwnLock, bool bHandleSysLocked);
 voidLockOrigFileOnDemand( bool bLoading, bool bNoUI );
+enum class MessageDlg{ LockFileIgnore, LockFileCorrupt };
+boolShowLockFileProblemDialog(MessageDlg nWhichDlg);
 voidDisableUnlockWebDAV( bool bDisableUnlockWebDAV = true 
);
 voidUnlockFile( bool bReleaseLockStream );
 /// Lets Transfer_Impl() not fsync the output file.
diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index 98dde757cf7b..ec94f1f22dde 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -48,7 +48,10 @@ public:
 bool CreateOwnLockFile();
 LockFileEntry GetLockData();
 bool OverwriteOwnLockFile();
+/// Delete the Lockfile, if current user is the owner
 void RemoveFile();
+/// Only delete lockfile, disregarding ownership
+void RemoveFileDirectly();
 
 static bool IsInteractionAllowed() { return m_bAllowInteraction; }
 };
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index e8a622cf9903..bf7ef98a27d7 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -490,7 +490,7 @@ ${MYCMD} --base sw/source/uibase/utlui --files attrdesc.src 
initui.src navipi.sr
 
 ${MYCMD} --files sw/source/uibase/wrtsh/wrtsh.src
 
-${MYCMD} --base uui/source --files alreadyopen.src filechanged.src ids.src 
lockfailed.src nameclashdlg.src openlocked.src passworddlg.src passworderrs.src 
trylater.src
+${MYCMD} --base uui/source --files alreadyopen.src filechanged.src ids.src 
lockfailed.src lockcorrupt.src nameclashdlg.src openlocked.src passworddlg.src 
passworderrs.src try

[Libreoffice-commits] core.git: sal/CppunitTest_sal_osl.mk sal/qa unotools/source

[Juergen Funk]

 sal/CppunitTest_sal_osl.mk |1 +
 sal/qa/osl/file/osl_old_test_file.cxx  |   25 +
 unotools/source/ucbhelper/tempfile.cxx |   15 ++-
 3 files changed, 36 insertions(+), 5 deletions(-)

New commits:
commit 26be5f21cebfe9acad088a1086f97eebdb437b7c
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Wed Dec 20 13:09:40 2017 +0100

unotools: don't go belly-up if temp dir is wrong or empty

When a wrong temp directory was set (e.g. wrong path in xcu ist set),
you get a assert in the LO-Debug Version, this patch avoid this assertion.

Change-Id: I192f682860ad9cddf907e4b239eff36b4bd6072d
Reviewed-on: https://gerrit.libreoffice.org/46846
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sal/CppunitTest_sal_osl.mk b/sal/CppunitTest_sal_osl.mk
index d96ab2d41483..787dbf96174f 100644
--- a/sal/CppunitTest_sal_osl.mk
+++ b/sal/CppunitTest_sal_osl.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl,\
sal \
+   utl \
 ))
 
 # the test uses the library created by Module_DLL
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx 
b/sal/qa/osl/file/osl_old_test_file.cxx
index f093d5fe1bb8..fbbefbb03884 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -32,6 +32,9 @@
 #include 
 #include 
 
+#include 
+
+
 namespace osl_test_file
 {
 
@@ -137,8 +140,30 @@ void oldtestfile::test_file_004()
 #endif
 }
 
+class TempFileTest : public CppUnit::TestFixture
+{
+
+public:
+TempFileTest() {}
+
+void SetTempNameBaseDirectory()
+{   // only testing: of not found the directory
+OUString path = 
utl::TempFile::SetTempNameBaseDirectory("file:///not/found/dir");
+
+CPPUNIT_ASSERT_MESSAGE("SetTempNameBaseDirectory must give a empty 
string back",
+path.isEmpty());
+}
+
+
+CPPUNIT_TEST_SUITE(TempFileTest);
+CPPUNIT_TEST(SetTempNameBaseDirectory);
+CPPUNIT_TEST_SUITE_END();
+};
+
+
 } // namespace osl_test_file
 
 CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::oldtestfile);
+CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::TempFileTest);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/ucbhelper/tempfile.cxx 
b/unotools/source/ucbhelper/tempfile.cxx
index eb099a43dca9..47afc2ed82ce 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -57,13 +57,18 @@ namespace utl
 OUString getParentName( const OUString& aFileName )
 {
 sal_Int32 lastIndex = aFileName.lastIndexOf( '/' );
-OUString aParent = aFileName.copy( 0, lastIndex );
+OUString aParent;
 
-if( aParent.endsWith(":") && aParent.getLength() == 6 )
-aParent += "/";
+if (lastIndex > -1)
+{
+aParent = aFileName.copy(0, lastIndex);
+
+if (aParent.endsWith(":") && aParent.getLength() == 6)
+aParent += "/";
 
-if( aParent.equalsIgnoreAsciiCase( "file://" ) )
-aParent = "file:///";
+if (aParent.equalsIgnoreAsciiCase("file://"))
+aParent = "file:///";
+}
 
 return aParent;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

AW: AW: AW: tdf#108580: integrate vc_redist.exe into Windows installer

[Juergen Funk Mailinglist]

Hi Mike,

exactly the same


juergen


-Ursprüngliche Nachricht-
Von: Mike Kaganski [mailto:mike.kagan...@collabora.com] 
Gesendet: Freitag, 15. Dezember 2017 11:23
An: Juergen Funk Mailinglist <juergen.funk...@cib.de>; 
libreoffice@lists.freedesktop.org
Betreff: Re: AW: AW: tdf#108580: integrate vc_redist.exe into Windows installer

On 12/15/2017 12:53 PM, Juergen Funk Mailinglist wrote:
> Hi Mike
>
>> 1. Creating a redirect at TDF side imposes additional load to our 
>> server infrastructure; 2. Users will depend on reliability of TDF 
>> servers wrt this (in terms of their state, correctness of the link, 
>> and also possible man-in-the-middle problems with modified links 
>> pointing to malware) - note that LO downloads themselves are served 
>> from multiple mirrors, but this kind of redirection can't work using 
>> mirrors
> I have mean directly from Microsoft not from TDF.

As I mentioned, there's no "Latest VS 2015 redist" static link on their side. 
Only "VS 2015 redist version X.Y.Z", which is the same as embedding this 
specific version into installer.

Also: at the time of creating the installer, we could possibly check that our 
embedded redist is ~current, so users would have reasonably low chance to get 
update request related to newly installed software (taking into account our 
rate of releases). OTOH, if a user chooses to download and install an 
out-of-date version, then it's not unexpected that, e.g., LibreOffice itself 
would warn about "newer version available"; so I don't see anything unexpected 
here on redist side as well.

--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

AW: AW: tdf#108580: integrate vc_redist.exe into Windows installer

[Juergen Funk Mailinglist]

Hi Mike

>1. Creating a redirect at TDF side imposes additional load to our server 
>infrastructure; 
>2. Users will depend on reliability of TDF servers wrt this (in terms of their 
>state, correctness of the link, and also possible man-in-the-middle problems 
>with modified links pointing to malware) - note that LO downloads themselves 
>are served from multiple mirrors, but this kind of redirection can't work 
>using mirrors

I have mean directly from Microsoft not from TDF. 

>3. Users would need internet connection at time of setup (which might not be 
>there: many download the installer, to bring it somewhere where there's no 
>Internet connection

I think that is not a big problem, the most have an Internet connection (and 
many App can't install without connection), but when not the installer gives a 
hint (only when needed), and the user should install the redist.

But any way, this is only a  suggestion, and has also weakness  (e. g. MS 
changes the link), the other case we have always up to date the vc_redist.exe.

Best 
Juergen

 

-Ursprüngliche Nachricht-
Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im Auftrag 
von Mike Kaganski
Gesendet: Freitag, 15. Dezember 2017 10:07
An: Juergen Funk Mailinglist <juergen.funk...@cib.de>; 
libreoffice@lists.freedesktop.org
Betreff: Re: AW: tdf#108580: integrate vc_redist.exe into Windows installer

Hi Juergen,

thanks for feedback!

On 12/14/2017 11:04 AM, Juergen Funk Mailinglist wrote:
> this is a good idea, but I think the better way is, when the system need the 
> vc_redist then we "download" the new  vc_redist.exe from MS and starting.
> This has 2 advantage
>   - the LO msi would not be bigger
>   - we install always the up to date redist-dll's

Well, the main problem here is that there's no "latest vc_redist.exe" 
static link on MS site. So, this approach is simply impossible without us 
creating a redirect on our side. And this would create additional
problems:

1. Creating a redirect at TDF side imposes additional load to our server 
infrastructure; 2. Users will depend on reliability of TDF servers wrt this (in 
terms of their state, correctness of the link, and also possible 
man-in-the-middle problems with modified links pointing to malware) - note that 
LO downloads themselves are served from multiple mirrors, but this kind of 
redirection can't work using mirrors; 3. Users would need internet connection 
at time of setup (which might not be there: many download the installer, to 
bring it somewhere where there's no Internet connection).

So this is just not an option - at least, this is much worse than suggestion to 
simply telling people to manually download and install the redistributable 
themselves, put on the download page.

> In the current way it is possible you install older one of the dll's, and 
> after the LO installation it pop up the Windows-Update, that I think is a 
> little bit strange.

No; this is absolutely normal - most softwares out there behave this way, so 
not different from usual. Of course, *if* your suggestion was possible to be 
implemented in a reasonable way, it would be best - but the downsides outweigh 
the benefit.

--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

AW: tdf#108580: integrate vc_redist.exe into Windows installer

[Juergen Funk Mailinglist]

Hi Mike,

this is a good idea, but I think the better way is, when the system need the 
vc_redist then we "download" the new  vc_redist.exe from MS and starting.
This has 2 advantage 
 - the LO msi would not be bigger 
 - we install always the up to date redist-dll's

In the current way it is possible you install older one of the dll's, and after 
the LO installation it pop up the Windows-Update, that I think is a little bit 
strange.

In the unattended installation, I think that is okay, the admin should only 
inform, what he need for running the LO

Best
Juergen

PS.: it is possible, that email would be block from list.freedesktop.org, all 
spam goes but mine always block, that life


-Ursprüngliche Nachricht-
Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im Auftrag 
von Mike Kaganski
Gesendet: Mittwoch, 13. Dezember 2017 14:02
An: libreoffice@lists.freedesktop.org
Betreff: tdf#108580: integrate vc_redist.exe into Windows installer

Hi!

Some time ago, we had a ESC decision [1] to use a workaround for bug
108580 [2] about problem with VCRedist, which stopped to install essential part 
of libraries on Windows Vista and above (currently affected are Win7, Win8, and 
Win8.1), which was done in 71d9a61302e65fe091cf70c13fa72b3df09b7e3a [3], and 
"for 6.0 do something clever".

Here is the proposal [4] that pretends to be clever :) The following is 
essentially a copy-paste from the patch commit message:

Since commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a, we use a workaround 
described at [5] as "App-local deployment of the Universal CRT". We just copy 
all UCRT DLLs to LibreOffice/program. This has a drawback though, that our UCRT 
is not updated by Windows Update, so users would rely on LibreOffice updates in 
case of some vulnerabilities in UCRT (and they could even not realize they have 
that problem).

MS recommends to install UCRT using EXEs they provide from their site. 
The EXEs install both VCRuntimes and UCRTs, along with required patches, for 
all Windows versions (Windows XP through Windows 10, where they only install 
VCRuntimes); the installed libraries are managed by system's update mechanism. 
But those EXEs cannot be used in MSI custom actions inside 
InstallExecuteSequence, because they use MSI themselves.

So this patch integrates the vc_redist.xXX.exe into MSI binary table, and uses 
custom action to run the EXE after ExecuteAction in InstallUISequence. This 
will show the user a VCRedist install window after the main LibreOffice 
installation finishes; no user interaction is required (except one more UAC 
request), and errors are ignored.

Since this installation takes care of both VCRuntime and UCRT, we can 
ultimately drop both the app-local workaround, and vcredist merge module (so 
VCRuntime would also be updated by system).

This has its drawback: if one wants to use unattended installation (without UI; 
one example is deployment using ActiveDirectory GPO), then InstallUISequence is 
not run, and so VCRedist isn't installed. In this case, one should install 
VCRedist separately. Supposedly this should not be huge problem, because this 
is the case for many existing applications that need separate VCRedist 
deployment in these scenarios.

Please share your opinions. Is this change viable?

The patch itself IMO needs some polish: I suppose that we should remove 
redundant workaround (and possibly even merge module bits) if we accept it. But 
it is in working state, so testing is possible.

[1]
https://lists.freedesktop.org/archives/libreoffice-qa/2017-November/010300.html
[2] https://bugs.documentfoundation.org/show_bug.cgi?id=108580
[3]
https://cgit.freedesktop.org/libreoffice/core/commit/?id=71d9a61302e65fe091cf70c13fa72b3df09b7e3a
[4] https://gerrit.libreoffice.org/46356
[5]
https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/

--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sfx2/inc

[Juergen Funk]

 sfx2/inc/preventduplicateinteraction.hxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 31441e9e0e1a20f57f45bbe5be0e0a1ae3c97ec2
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Thu Dec 14 15:19:08 2017 +0100

fix build: more incompatible exception specs

For msvc too, we need to have matching, or more narrow, exception
specs for overridden virtual methods.

Change-Id: I334ae37d7f39e2adba822b79b23369e96e44c246

diff --git a/sfx2/inc/preventduplicateinteraction.hxx 
b/sfx2/inc/preventduplicateinteraction.hxx
index 0f89169b6087..7e031d2e6d2e 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -86,7 +86,8 @@ public:
 }
 
 // XTerminateListener
-virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
throw () override
+virtual void SAL_CALL queryTermination(const css::lang::EventObject&)
+throw (css::frame::TerminationVetoException) override
 {
 closewarningdialogs();
 Application::PostUserEvent(LINK(this, WarningDialogsParent, 
TerminateDesktop));
@@ -222,7 +223,7 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
 public:
 
 virtual void SAL_CALL initialize(const 
css::uno::Sequence& rArguments)
-throw(css::uno::RuntimeException, std::exception) override;
+throw(css::uno::RuntimeException, std::exception) override;
 
 /**
 @interface  XInteractionHandler
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 9 commits - filter/source include/svx sfx2/inc sfx2/source svx/source sw/inc sw/qa sw/source

[Juergen Funk]

Rebased ref, commits from common ancestor:
commit a89aefc93fa25001a99f1cec3d5d25bab16e60b6
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Wed Dec 13 12:00:22 2017 +

fix build: incompatible exception specs

For gcc 4x and 5.2, we need to have matching, or more narrow, exception
specs for overridden virtual methods.

Change-Id: I2f2da8b8a9ac5639a3d885cd6851e1d0125651b1

diff --git a/filter/source/config/cache/typedetection.hxx 
b/filter/source/config/cache/typedetection.hxx
index f948e6522697..ae75131a0fa6 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -383,17 +383,17 @@ private:
 public:
 
 using cppu::WeakComponentImplHelperBase::disposing;
-virtual void SAL_CALL disposing(const css::lang::EventObject&) override
+virtual void SAL_CALL disposing(const css::lang::EventObject&) throw ()  
override
 {
 }
 
 // XTerminateListener
-virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
throw () override
 {
 m_pTypeDetection->cancel();
 }
 
-virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
throw () override
 {
 }
 
diff --git a/sfx2/inc/preventduplicateinteraction.hxx 
b/sfx2/inc/preventduplicateinteraction.hxx
index f9097576e480..0f89169b6087 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -81,19 +81,19 @@ private:
 public:
 
 using cppu::WeakComponentImplHelperBase::disposing;
-virtual void SAL_CALL disposing(const css::lang::EventObject&) override
+virtual void SAL_CALL disposing(const css::lang::EventObject&) throw () 
override
 {
 }
 
 // XTerminateListener
-virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
throw () override
 {
 closewarningdialogs();
 Application::PostUserEvent(LINK(this, WarningDialogsParent, 
TerminateDesktop));
 throw css::frame::TerminationVetoException();
 }
 
-virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
throw () override
 {
 }
 
@@ -221,7 +221,8 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
 // uno interface
 public:
 
-virtual void SAL_CALL initialize(const 
css::uno::Sequence& rArguments) override;
+virtual void SAL_CALL initialize(const 
css::uno::Sequence& rArguments)
+throw(css::uno::RuntimeException, std::exception) override;
 
 /**
 @interface  XInteractionHandler
diff --git a/sfx2/source/appl/preventduplicateinteraction.cxx 
b/sfx2/source/appl/preventduplicateinteraction.cxx
index 7ef25e70e82d..dd7263d51c6d 100644
--- a/sfx2/source/appl/preventduplicateinteraction.cxx
+++ b/sfx2/source/appl/preventduplicateinteraction.cxx
@@ -243,6 +243,7 @@ bool PreventDuplicateInteraction::getInteractionInfo(const 
css::uno::Type&
 }
 
 void SAL_CALL PreventDuplicateInteraction::initialize(const 
css::uno::Sequence& rArguments)
+  throw (css::uno::RuntimeException, std::exception)
 {
 // If we're re-initialized to set a specific new window as a parent then 
drop our temporary
 // dialog parent
commit 5722c826a0eecc52892df4e839aa78f0861be80f
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date:   Fri Jul 22 18:00:59 2016 +0200

Remove now unused SwTextBoxHelper functions

(Manually cherry picked from commit 
f7f5d27066b696ac4e33246d3794bde8058e8622)

Change-Id: I39500424c79040b1887ea74081fdf0ea0bc5f009
Reviewed-on: https://gerrit.libreoffice.org/46331
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 98983bad9f42..32fc2167c72a 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -73,8 +73,6 @@ public:
 static SwFrameFormat* getOtherTextBoxFormat(const SwFrameFormat* pFormat, 
sal_uInt16 nType);
 /// If we have an associated TextFrame, then return that.
 static SwFrameFormat* 
getOtherTextBoxFormat(css::uno::Reference xShape);
-static SwFrameFormat* findTextBox(const SwFrameFormat* pShape);
-static SwFrameFormat* findTextBox(const 
css::uno::Reference& xShape);
 /// Return the textbox rectangle of a draw shape (in twips).
 static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = 
true);
 
@@ -91,17 +89,6 @@ public:
 /// Is pObject a textbox of a drawinglayer shape?
 stat

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - filter/source sfx2/inc sfx2/source

[Juergen Funk]

 filter/source/config/cache/typedetection.hxx |6 +++---
 sfx2/inc/preventduplicateinteraction.hxx |9 +
 sfx2/source/appl/preventduplicateinteraction.cxx |1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 6ce5c193a1ea787453e69f38e3aaebd67aec0031
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Wed Dec 13 12:00:22 2017 +

fix build: incompatible exception specs

For gcc 4x and 5.2, we need to have matching, or more narrow, exception
specs for overridden virtual methods.

Change-Id: I2f2da8b8a9ac5639a3d885cd6851e1d0125651b1

diff --git a/filter/source/config/cache/typedetection.hxx 
b/filter/source/config/cache/typedetection.hxx
index f948e6522697..ae75131a0fa6 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -383,17 +383,17 @@ private:
 public:
 
 using cppu::WeakComponentImplHelperBase::disposing;
-virtual void SAL_CALL disposing(const css::lang::EventObject&) override
+virtual void SAL_CALL disposing(const css::lang::EventObject&) throw ()  
override
 {
 }
 
 // XTerminateListener
-virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
throw () override
 {
 m_pTypeDetection->cancel();
 }
 
-virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
throw () override
 {
 }
 
diff --git a/sfx2/inc/preventduplicateinteraction.hxx 
b/sfx2/inc/preventduplicateinteraction.hxx
index f9097576e480..0f89169b6087 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -81,19 +81,19 @@ private:
 public:
 
 using cppu::WeakComponentImplHelperBase::disposing;
-virtual void SAL_CALL disposing(const css::lang::EventObject&) override
+virtual void SAL_CALL disposing(const css::lang::EventObject&) throw () 
override
 {
 }
 
 // XTerminateListener
-virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL queryTermination(const css::lang::EventObject&) 
throw () override
 {
 closewarningdialogs();
 Application::PostUserEvent(LINK(this, WarningDialogsParent, 
TerminateDesktop));
 throw css::frame::TerminationVetoException();
 }
 
-virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
override
+virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) 
throw () override
 {
 }
 
@@ -221,7 +221,8 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
 // uno interface
 public:
 
-virtual void SAL_CALL initialize(const 
css::uno::Sequence& rArguments) override;
+virtual void SAL_CALL initialize(const 
css::uno::Sequence& rArguments)
+throw(css::uno::RuntimeException, std::exception) override;
 
 /**
 @interface  XInteractionHandler
diff --git a/sfx2/source/appl/preventduplicateinteraction.cxx 
b/sfx2/source/appl/preventduplicateinteraction.cxx
index 7ef25e70e82d..dd7263d51c6d 100644
--- a/sfx2/source/appl/preventduplicateinteraction.cxx
+++ b/sfx2/source/appl/preventduplicateinteraction.cxx
@@ -243,6 +243,7 @@ bool PreventDuplicateInteraction::getInteractionInfo(const 
css::uno::Type&
 }
 
 void SAL_CALL PreventDuplicateInteraction::initialize(const 
css::uno::Sequence& rArguments)
+  throw (css::uno::RuntimeException, std::exception)
 {
 // If we're re-initialized to set a specific new window as a parent then 
drop our temporary
 // dialog parent
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Juergen Funk]

 configure.ac |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c7091668794e080fc8c5f2cff398e644a4cb1ea4
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Mon Oct 16 13:56:51 2017 +0200

Intergate new Win-SDK 10.0.16299.0

Change-Id: Ie0387fdb7fa5850d796d825e767119b90ae85d95
Reviewed-on: https://gerrit.libreoffice.org/43422
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gan...@poczta.onet.pl>

diff --git a/configure.ac b/configure.ac
index eb47dfbc83ca..c6494b870c27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5085,6 +5085,8 @@ find_winsdk_version()
 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"
 dnl Hack needed at least by tml:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Juergen Funk]

 scp2/source/ooo/windowscustomaction_ooo.scp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a4b88947e5a56f39e80f8edf85b2b384a4f22bb3
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Thu Jun 29 09:43:20 2017 +0200

tdf#106931 - LibreOffice 5.3 installer doesn't honor UI_LANGS property

The patch 0a76a41ae7a2ebd53f80f01ea9e2bcff3026d155 disable the CustomAction
"SelectLanguage" when the MSI-Property ADDLOCAL is set,
This patch set the the CustomAction when the Property
"UI_LANGS" is set, then the CustomAction execute

Change-Id: I254a44909e32fb7969a6e9f71adf4659d376523c
Reviewed-on: https://gerrit.libreoffice.org/39379
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index dfafc1611a53..39a0d52cbd54 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -189,8 +189,8 @@ WindowsCustomAction gid_Customaction_SelectLanguage
 Source = "sellangmsi.dll";
 Target = "SelectLanguage";
 Inbinarytable = 1;
-Assignment1 = ("InstallExecuteSequence", "NOT Installed And 
ADDLOCAL=\"\"", "MigrateFeatureStates");
-Assignment2 = ("InstallUISequence", "NOT Installed And ADDLOCAL=\"\"", 
"MigrateFeatureStates");
+Assignment1 = ("InstallExecuteSequence", "NOT Installed And (ADDLOCAL=\"\" 
Or NOT UI_LANGS=\"\")", "MigrateFeatureStates");
+Assignment2 = ("InstallUISequence", "NOT Installed And (ADDLOCAL=\"\" Or 
NOT UI_LANGS=\"\")", "MigrateFeatureStates");
 End
 
 WindowsCustomAction gid_Customaction_SortTree
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Juergen Funk]

 sfx2/source/doc/docfile.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit af9bea21390800e5bbc73e07ce9828189d8dabf3
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Wed Jun 21 14:41:49 2017 +0200

Improve tdf#106942: always erase empty/corrupt lockfile

also when we could not create lockfile, not only when open as readonly

Change-Id: Ied53bbfe47669f62553d97d81f0bed156ae58887
Reviewed-on: https://gerrit.libreoffice.org/39054
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
Tested-by: Katarina Behrens <katarina.behr...@cib.de>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index ae39a016c5cf..e8fbc812e5e9 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1197,7 +1197,8 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool 
bNoUI )
 if (bLoading && !bNoUI)
 {
 bIoErr = true;
-bResult = 
ShowLockFileProblemDialog(MessageDlg::LockFileIgnore);
+
ShowLockFileProblemDialog(MessageDlg::LockFileIgnore);
+bResult = true;   // always delete the 
defect lock-file
 }
 }
 catch (const uno::Exception&)
@@ -1205,7 +1206,8 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool 
bNoUI )
 if (bLoading && !bNoUI)
 {
 bIoErr = true;
-bResult = 
ShowLockFileProblemDialog(MessageDlg::LockFileIgnore);
+
ShowLockFileProblemDialog(MessageDlg::LockFileIgnore);
+bResult = true;   // always delete the 
defect lock-file
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 include/svl l10ntools/source offapi/com offapi/UnoApi_offapi.mk sfx2/source svl/source uui/AllLangResTarget_uui.mk uui/Library_uui.mk uui/source

[Juergen Funk]

 include/sfx2/docfile.hxx|4 
 include/svl/documentlockfile.hxx|3 
 l10ntools/source/gRun.sh|2 
 offapi/UnoApi_offapi.mk |1 
 offapi/com/sun/star/document/LockFileCorruptRequest.idl |   43 
 sfx2/source/doc/docfile.cxx |  148 ++--
 svl/source/misc/documentlockfile.cxx|7 
 uui/AllLangResTarget_uui.mk |1 
 uui/Library_uui.mk  |1 
 uui/source/iahndl-locking.cxx   |   42 +++-
 uui/source/iahndl.cxx   |2 
 uui/source/iahndl.hxx   |2 
 uui/source/ids.hrc  |   41 ++--
 uui/source/lockcorrupt.cxx  |   44 
 uui/source/lockcorrupt.hxx  |   33 +++
 uui/source/lockcorrupt.src  |   37 
 uui/source/lockfailed.cxx   |5 
 uui/source/lockfailed.src   |6 
 18 files changed, 334 insertions(+), 88 deletions(-)

New commits:
commit 6ca3b3648e25ae9d4d2d29a0df83349198ec3f5e
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Wed Apr 12 11:26:10 2017 +0200

tdf#106942 Wrong message when lock file is empty or corrupt

1. Erase empty or corrupt lockfile, when reading it fails and
   skip "Locked Document Dialog" in that case
2. Show Dialog (use LockFileIgnoreRequest -> LockFailedQueryBox)
   when create lock file is not possible.
   Two Dialogs:  "lock file create error" and
 "empty lockfile is present"
   Set the document to read-only when creating lockfile is not
   possible. If lockfile is corrupt or empty, inform the user.
   They can interrupt loading the document or open it read-only,
   which also erases the corrupt lock file after closing
   the document
3. Handling for the two Dialogs
   Use LockFileIgnoreRequst for create lockfile error and
   add a new LockFileCorruptRequest, (lock file is corrupt).
   Change and generate new messages for both dialogs in english

Change-Id: I35c377f85b5113e8ffb89d83b9544b8ebc81d89f
Reviewed-on: https://gerrit.libreoffice.org/36658
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>

diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 291b6515ae79..352cbac471b1 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -163,8 +163,10 @@ public:
 boolIsStorage();
 
 enum class ShowLockResult { NoLock, Succeeded,Try };
-ShowLockResult  ShowLockedDocumentDialog( const LockFileEntry& aData, 
bool bIsLoading, bool bOwnLock );
+ShowLockResult  ShowLockedDocumentDialog( const LockFileEntry& aData, 
bool bIsLoading, bool bOwnLock, bool bHandleSysLocked);
 voidLockOrigFileOnDemand( bool bLoading, bool bNoUI );
+enum class MessageDlg{ LockFileIgnore, LockFileCorrupt };
+boolShowLockFileProblemDialog(MessageDlg nWhichDlg);
 voidDisableUnlockWebDAV( bool bDisableUnlockWebDAV = true 
);
 voidUnlockFile( bool bReleaseLockStream );
 
diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index 98dde757cf7b..ec94f1f22dde 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -48,7 +48,10 @@ public:
 bool CreateOwnLockFile();
 LockFileEntry GetLockData();
 bool OverwriteOwnLockFile();
+/// Delete the Lockfile, if current user is the owner
 void RemoveFile();
+/// Only delete lockfile, disregarding ownership
+void RemoveFileDirectly();
 
 static bool IsInteractionAllowed() { return m_bAllowInteraction; }
 };
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index eca93a4ac875..65ca9badc277 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -490,7 +490,7 @@ ${MYCMD} --base sw/source/uibase/utlui --files attrdesc.src 
initui.src navipi.sr
 
 ${MYCMD} --files sw/source/uibase/wrtsh/wrtsh.src
 
-${MYCMD} --base uui/source --files alreadyopen.src filechanged.src ids.src 
lockfailed.src nameclashdlg.src openlocked.src passworddlg.src passworderrs.src 
trylater.src
+${MYCMD} --base uui/source --files alreadyopen.src filechanged.src ids.src 
lockfailed.src lockcorrupt.src nameclashdlg.src openlocked.src passworddlg.src 
passworderrs.src trylater.src
 
 ${MYCMD} --files vcl/source/edit/textundo.src
 
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 7a9c17af6601..53fb4873b2cc 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2190,6 

AW: LO 5.3.2.2: msi silent install: UI_LANGS property seems not to work as expected

[Juergen Funk Mailinglist]

Hi Oliver,

the Parameter ADDLOCAL=ALL overwrite the other parameter and install ALL, in 
your case you should given all parameter that you need, without ADDLOCAL=ALL. 
That is the define of the MSI, but I not sure it is right the parameter 
"UI_LANGS=en_US,de".
I think you should given 
ADDLOCAL=gm_Prg,gm_Optional,gm_Langpack_r_de,gm_Langpack_r_en_US,gm_Helppack_r_de,gm_Helppack_en_US
This information is in the MSI you can see this with the program "Orca" (it is 
free). 

But I am nor really sure, and not tested.

Hope it helps
Juergen
  

> -Ursprüngliche Nachricht-
> Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im Auftrag
> von Oliver Brinzing
> Gesendet: Montag, 10. April 2017 18:56
> An: libreoffice@lists.freedesktop.org
> Betreff: LO 5.3.2.2: msi silent install: UI_LANGS property seems not to work 
> as
> expected
> 
> Hi,
> 
> i tried to do a silent msi install, selecting only a few ui languages:
> 
>  > https://wiki.documentfoundation.org/Deployment_and_Migration
>  > With LibreOffice 3.5.5 and higher, language selection works as follows.
>  > msiexec /i Lib_.msi UI_LANGS=en_US,de
> 
> msiexec /qb /passive /i LibreOffice_5.3.2_Win_x86.msi /L*V lo_install.log
> INSTALLLOCATION="C:\Program Files (x86)\LibreOffice" ALLUSERS=1
> ADDLOCAL=ALL CREATEDESKTOPLINK=0
> REGISTER_NO_MSO_TYPES=1 UI_LANGS=en_US,de
> ISCHECKFORPRODUCTUPDATES=0 REBOOTYESNO=No QUICKSTART=1
> VC_REDIST=1
> REMOVE=gm_o_Onlineupdate,gm_r_ex_Dictionary_Af,gm_r_ex_Dictionary_An,
> gm_r_ex_Dictionary_Ar,...
> 
> but it seems, UI_LANGS property is ignored - all ui languages ire installed.
> 
> any hints?
> 
> Regards
> Oliver
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Questions around hybrid file locking

[Juergen Funk Mailinglist]

Hi all 

I work on tdf#106942, the code is here sfx2/source/doc/docfile.cxx:1151

I don't understand why skip all errors with "UseDocumentSystemFileLocking" 
docfile.cxx:1175, anybody got any recollection why that is? 

But when "UseDocumentSystemFileLocking" is false (well currently it's always 
true) and the error is IOErrorCode_INVALID_PARAMETER, a message box - that says 
something like 'can't lock, b/c lockfile cannot be created'

I think this message is never appears, because the error “Invalid Parameters” 
is implausible, too.

Here's how I'd plan to solve this:: 
When the error with "no access &| no space" came, then using the above message 
(need only improve the second message-line), and set the document to read only, 
and remove the empty lock-file. 

Anybody got any better ideas?



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

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

[Juergen Funk]

 framework/source/services/sessionlistener.cxx |   12 +
 vcl/inc/unx/sm.hxx|2 
 vcl/source/app/session.cxx|3 
 vcl/unx/generic/app/sm.cxx|  178 +++---
 4 files changed, 118 insertions(+), 77 deletions(-)

New commits:
commit f57424cc4c0dd68083c7935ce8a9b795625cf84c
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Thu Dec 8 15:41:24 2016 +0100

tdf#104101 Improve the session management handling

 - Set the current time to the SessionID
 - Split the SetProperties-Data, and send
   DeleteProperties for DiscardCommand
   (above both topic is the same as kate and
plasma-desktop to do)

 - in statusChange the saveDone was not called, and
   call only once the saveDone
 - in shutdownCanceled must be send the saveDone too

Change-Id: I42855c75b88b5d651ef8091947e359dc2c3f9209
Reviewed-on: https://gerrit.libreoffice.org/33215
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/framework/source/services/sessionlistener.cxx 
b/framework/source/services/sessionlistener.cxx
index f9c5394..6a57c56 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -275,9 +275,10 @@ void SAL_CALL SessionListener::statusChanged(const 
frame::FeatureStateEvent& eve
 m_bRestored = true; // a document was restored
 
 }
-else if ( event.FeatureURL.Complete == 
"vnd.sun.star.autorecovery:/doSessionSave" )
-{
-if (event.FeatureDescriptor == "stop")
+else if ( event.FeatureURL.Complete == 
"vnd.sun.star.autorecovery:/doAutoSave" )
+{   // the "doSessionSave" was never set, look to 
framework/source/services/autorecovery.cxx
+//   it always testing but never setting (enum 
AutoRecovery::E_SESSION_SAVE)
+if (event.FeatureDescriptor == "update")
 {
 if (m_rSessionManager.is())
 m_rSessionManager->saveDone(this); // done with save
@@ -372,7 +373,7 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool 
bInteractionGranted
 m_rSessionManager->interactionDone( this );
 }
 
-if ( m_rSessionManager.is() )
+if ( m_rSessionManager.is() && m_bTerminated )
 m_rSessionManager->saveDone(this);
 }
 else
@@ -386,6 +387,9 @@ void SessionListener::shutdownCanceled()
 SAL_INFO("fwk.session", "SessionListener::shutdownCanceled");
 // set the state back
 m_bSessionStoreRequested = false; // there is no need to protect it with 
mutex
+
+if ( m_rSessionManager.is() )
+m_rSessionManager->saveDone(this);
 }
 
 void SessionListener::doQuit()
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index f754547..ab736a4 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -38,6 +38,8 @@ class SessionManagerClient
 static std::unique_ptr< ICEConnectionObserver > m_xICEConnectionObserver;
 static SmcConn m_pSmcConnection;
 static OString m_aClientID;
+static OString m_aTimeID;
+static OString m_aClientTimeID;
 static bool m_bDocSaveDone;
 
 static void SaveYourselfProc(   SmcConn connection,
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index fd8ef60..3d371dc 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -359,7 +359,8 @@ void SAL_CALL VCLSession::saveDone( const 
css::uno::Reference< XSessionManagerLi
 }
 
 SAL_INFO("vcl.se.debug", "  bSaveDone = " << (bSaveDone ? "true" : 
"false"));
-if( bSaveDone )
+
+if( bSaveDone && !m_bSaveDone )
 {
 m_bSaveDone = true;
 if (m_xSession)
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index fe88a8e..5b7d1d9 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -154,7 +154,9 @@ SalSession * SessionManagerClient::m_pSession = nullptr;
 std::unique_ptr< ICEConnectionObserver >
 SessionManagerClient::m_xICEConnectionObserver;
 SmcConn SessionManagerClient::m_pSmcConnection = nullptr;
-OString SessionManagerClient::m_aClientID;
+OString SessionManagerClient::m_aClientID = "";
+OString SessionManagerClient::m_aTimeID = "";
+OString SessionManagerClient::m_aClientTimeID = "";
 bool SessionManagerClient::m_bDocSaveDone = false; // HACK
 
 extern "C" {
@@ -172,79 +174,91 @@ static void IgnoreIceIOErrors(SAL_UNUSED_PARAMETER 
IceConn) {}
 
 static SmProp*  pSmProps = nullptr;
 static SmProp** ppSmProps = nullptr;
+static char  ** ppSmDel  = nullptr;
+
 static int  nSmProps = 0;
+static int  nSmDel   = 0;
 static unsigned char   *pSmRestartHint = nullptr;
 
+
+enum { eCloneCommand, eProgr

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

[Juergen Funk]

 framework/inc/services/desktop.hxx|   17 +++--
 framework/source/services/desktop.cxx |   10 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit d8ccf8cf7a604cb1df04f23b5b5036fff1d4afdb
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Thu Dec 8 12:25:50 2016 +0100

Stop question in context of session manager when cancel a frame

When shutdown or logout, LO make the question for all open
windows, but when you cancel a window the question for the other
windows are not necessary, this patch breaks the other questions.

 in dependency of tdf#104101

Change-Id: I7119317d392ccd808c67fb57f82b1e990062abf2
Reviewed-on: https://gerrit.libreoffice.org/33311
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/framework/inc/services/desktop.hxx 
b/framework/inc/services/desktop.hxx
index ee2d576..4b6dbc0 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -373,8 +373,21 @@ class Desktop : private cppu::BaseMutex,
 
 private:
 
-bool m_bIsTerminated;  /// check flag to protect us against dispose 
before terminate!
-/// see dispose() for further information!
+/** check flag to protect us against dispose before terminate!
+  *   see dispose() for further information!
+  */
+bool m_bIsTerminated;
+
+/** when true, the call came form session manager
+  *   the methode is Desktop::terminateQuickstarterToo()
+  *   this the only one place where set this to true
+  *   In this case,  when one frame break, not make
+  *   question for other, the break of shutdown or logout
+  *   can be only once.
+  *   In Desktop::impl_closeFrames would be test and break
+  *   the loop and reset to false
+  */
+bool m_bSession;
 
 css::uno::Reference< css::uno::XComponentContext >  
m_xContext;   /// reference to factory, which has create this 
instance
 FrameContainer  
m_aChildTaskContainer;/// array of child tasks (children of desktop are 
tasks; and tasks are also frames - But pure frames are not accepted!)
diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index e5133a7..b210434 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -158,6 +158,7 @@ Desktop::Desktop( const css::uno::Reference< 
css::uno::XComponentContext >& xCon
 ,   cppu::OPropertySetHelper( 
cppu::WeakComponentImplHelperBase::rBHelper   )
 // Init member
 ,   m_bIsTerminated ( false
 )   // see dispose() for further information!
+,   m_bSession  ( false
 )
 ,   m_xContext  ( xContext 
 )
 ,   m_aChildTaskContainer   (  
 )
 ,   m_aListenerContainer( m_aMutex )
@@ -389,6 +390,7 @@ namespace
 bool SAL_CALL Desktop::terminateQuickstarterToo()
 {
 QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
+m_bSession = true;
 return terminate();
 }
 
@@ -1702,7 +1704,10 @@ bool Desktop::impl_closeFrames(bool bAllowUI)
 if ( ! bSuspended )
 {
 ++nNonClosedFrames;
-continue;
+if(m_bSession)
+break;
+else
+continue;
 }
 }
 
@@ -1754,6 +1759,9 @@ bool Desktop::impl_closeFrames(bool bAllowUI)
 }
 }
 
+// reset the session
+m_bSession = false;
+
 return (nNonClosedFrames < 1);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Juergen Funk]

 framework/source/services/sessionlistener.cxx |   14 ++
 include/sal/log-areas.dox |6 -
 vcl/source/app/session.cxx|   60 ++-
 vcl/unx/generic/app/sm.cxx|  138 +++---
 4 files changed, 178 insertions(+), 40 deletions(-)

New commits:
commit fe9c6fa5a43177f4d77766f29d44784e17f53320
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Thu Dec 8 15:37:10 2016 +0100

Expand and improve the output log in Session-Management

in dependency of tdf#104101

Change-Id: I799f81adf4e4751fb505c84aa075363acf70f5a7
Reviewed-on: https://gerrit.libreoffice.org/33034
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/framework/source/services/sessionlistener.cxx 
b/framework/source/services/sessionlistener.cxx
index d4a9d80..8723177 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -261,6 +261,8 @@ void SAL_CALL SessionListener::initialize(const Sequence< 
Any  >& args)
 }
 }
 }
+
+SAL_INFO("fwk.session.debug", "  m_bAllowUserInteractionOnQuit = " << 
(m_bAllowUserInteractionOnQuit ? "true" : "false"));
 if (!m_rSessionManager.is())
 m_rSessionManager = css::uno::Reference< frame::XSessionManagerClient >
 (m_xContext->getServiceManager()->createInstanceWithContext(aSMgr, 
m_xContext), UNO_QUERY);
@@ -275,6 +277,9 @@ void SAL_CALL SessionListener::statusChanged(const 
frame::FeatureStateEvent& eve
 throw (css::uno::RuntimeException, std::exception)
 {
SAL_INFO("fwk.session", "SessionListener::statusChanged");
+
+   SAL_INFO("fwk.session.debug", "  ev.Feature = " << 
event.FeatureURL.Complete <<
+ ", ev.Descript = " << 
event.FeatureDescriptor);
if ( event.FeatureURL.Complete == 
"vnd.sun.star.autorecovery:/doSessionRestore" )
 {
 if (event.FeatureDescriptor == "update")
@@ -320,6 +325,9 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, 
sal_Bool /*bCancelabl
 throw (RuntimeException, std::exception)
 {
 SAL_INFO("fwk.session", "SessionListener::doSave");
+
+SAL_INFO("fwk.session.debug", "  m_bAllowUserInteractionOnQuit = " << 
(m_bAllowUserInteractionOnQuit ? "true" : "false") <<
+  ", bShutdown = " << (bShutdown ? "true" : 
"false"));
 if (bShutdown)
 {
 m_bSessionStoreRequested = true; // there is no need to protect it 
with mutex
@@ -354,12 +362,12 @@ void SAL_CALL SessionListener::approveInteraction( 
sal_Bool bInteractionGranted
 Desktop* pDesktop(dynamic_cast<Desktop*>(xDesktop.get()));
 if(pDesktop)
 {
-SAL_INFO("fwk.session", "XDesktop is a framework::Desktop -- 
good.");
+SAL_INFO("fwk.session", " XDesktop is a framework::Desktop -- 
good.");
 m_bTerminated = pDesktop->terminateQuickstarterToo();
 }
 else
 {
-SAL_WARN("fwk.session", "XDesktop is not a framework::Desktop 
-- this should never happen.");
+SAL_WARN("fwk.session", " XDesktop is not a framework::Desktop 
-- this should never happen.");
 m_bTerminated = xDesktop->terminate();
 }
 
@@ -413,6 +421,8 @@ com_sun_star_comp_frame_SessionListener_get_implementation(
 css::uno::XComponentContext *context,
 css::uno::Sequence const &)
 {
+SAL_INFO("fwk.session", 
"com_sun_star_comp_frame_SessionListener_get_implementation");
+
 return cppu::acquire(new SessionListener(context));
 }
 
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 5175459..386c52b 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -254,6 +254,7 @@ certain functionality.
 @li @c fwk.joburl
 @li @c fwk.loadenv
 @li @c fwk.session
+@li @c fwk.session.debug
 @li @c fwk.uiconfiguration
 @li @c fwk.uielement
 
@@ -449,7 +450,10 @@ certain functionality.
 @li @c vcl.schedule - scheduler / main-loop information
 @li @c vcl.screensaverinhibitor
 @li @c vcl.scrollbar - Scroll Bars
-@li @c vcl.sm - Session Manager
+@li @c vcl.se - VCL Session Manager
+@li @c vcl.se.debug
+@li @c vcl.sm - Session Manager Client
+@li @c vcl.sm.debug
 @li @c vcl.uitest - The UI testing framework code
 @li @c vcl.unity
 @li @c vcl.unx.dtrans
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 9ad31af..2dc15b1 100644
--- a/vcl/source/app/

AW: Recommended build instructions ...

[Juergen Funk Mailinglist]

The other problem with Visual Studio Project file is, some projects included 
not completely or are missing complete

With that solution
http://nabble.documentfoundation.org/Error-building-Visual-Studio-2013-project-file-for-LibreOffice-on-Windows-tp4140307p4140799.html
 
I don't now is the make wrong or the python-script

juergen

Von: LibreOffice  im Auftrag von 
slacka 
Gesendet: Montag, 12. September 2016 23:08
An: libreoffice@lists.freedesktop.org
Betreff: Re: Recommended build instructions ...

Speaking of wiki build instructions, the IDE instructions for Windows have
not worked for almost a year now.
Both the  IDE instructions

and  Windows Instructions

say to build with  build with "--enable-debug" and then "make
vs2013-ide-integration".  This results in the following error:

cd E:/core && (LC_MESSAGES=C E:/lode/opt/bin/make
cmd="E:/cygwin/home/Hearthstone/lode/opt/bin/make -npf Makefile.gbuild all"
cmd || true) | E:/core/bin/gbuild-to-ide --ide vs2013

make[1]: *** [cmd] Error 127

According this thread

, You need an old version of make.

Could someone please verify these instructions, and put them on the wiki
with a *working* download location? None of the versions of make that I was
able to find work with the script in that thread.




--
View this message in context: 
http://nabble.documentfoundation.org/Recommended-build-instructions-tp4193014p4193353.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Juergen Funk]

 offapi/com/sun/star/frame/XDispatch.idl |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 4da8378302093dd3e3dc3e201ac5e188c55f8009
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Thu Jul 21 11:00:22 2016 +0200

offapi: document SynchronMode argument

Change-Id: Ie47a7f4afbfab40f172705323520d75ef4927b0a
Reviewed-on: https://gerrit.libreoffice.org/27364
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/offapi/com/sun/star/frame/XDispatch.idl 
b/offapi/com/sun/star/frame/XDispatch.idl
index 6b4ca0a..c717565 100644
--- a/offapi/com/sun/star/frame/XDispatch.idl
+++ b/offapi/com/sun/star/frame/XDispatch.idl
@@ -53,7 +53,7 @@ module com {  module sun {  module star {  module frame {
  */
 published interface XDispatch: com::sun::star::uno::XInterface
 {
-/** dispatches (executes) an URL asynchronously.
+/** dispatches (executes) an URL
 
 
 It is only allowed to dispatch URLs for which this XDispatch
@@ -64,9 +64,22 @@ published interface XDispatch: 
com::sun::star::uno::XInterface
 fully parsed URL describing the feature which should be dispatched 
(=executed)
 
 @param Arguments
-optional arguments for this request.
+optional arguments for this request
+(see com::sun::star::document::MediaDescriptor)
 They depend on the real implementation of the dispatch object.
 
+Controlling synchronous or asynchronous mode happens via
+readonly boolean Flag SynchronMode
+
+
+By default, and absent any arguments, "SychronMode" is
+considered `FALSE` and the execution is performed
+asynchronously (i.e. dispatch() returns immediately, and
+the action is performed in the background).  But when set
+to `TRUE`, dispatch() processes the request synchronously
+- this call will block until it has finished.
+
+
 some code for a click-handler (Java)
 @code{.java}
 void myOnClick(String sURL,String sTargetFrame,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Juergen Funk]

 scp2/source/ooo/windowscustomaction_ooo.scp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0a76a41ae7a2ebd53f80f01ea9e2bcff3026d155
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Fri Jul 15 11:56:02 2016 +0200

tdf#100929 - Windows Installer: "ADDLOCAL=ALL" doesn't set all features

The CustomAction "SelectLangauge" overrides the ADDLOCAL-switch.
When ADDLOCAL is set, skip the CustomAction "SelectLanguage"

Change-Id: I716349a0645e2f8dd193103b35028e493ca8e3a1
Reviewed-on: https://gerrit.libreoffice.org/27230
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 056fba8..dfafc16 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -189,8 +189,8 @@ WindowsCustomAction gid_Customaction_SelectLanguage
 Source = "sellangmsi.dll";
 Target = "SelectLanguage";
 Inbinarytable = 1;
-Assignment1 = ("InstallExecuteSequence", "NOT Installed", 
"MigrateFeatureStates");
-Assignment2 = ("InstallUISequence", "NOT Installed", 
"MigrateFeatureStates");
+Assignment1 = ("InstallExecuteSequence", "NOT Installed And 
ADDLOCAL=\"\"", "MigrateFeatureStates");
+Assignment2 = ("InstallUISequence", "NOT Installed And ADDLOCAL=\"\"", 
"MigrateFeatureStates");
 End
 
 WindowsCustomAction gid_Customaction_SortTree
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Juergen Funk]

 framework/source/services/dispatchhelper.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6a5cb3dae1760283c2c9156de666964ea4794f0f
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Thu Jun 9 12:01:12 2016 +0200

tdf#99815 fixups after XNotifyingDispatch

- remove unused variable
- check of given parameter over constructor

Change-Id: If506ef9065c67da35f672466e1e49f82e2a5a678
Reviewed-on: https://gerrit.libreoffice.org/26093
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/framework/source/services/dispatchhelper.cxx 
b/framework/source/services/dispatchhelper.cxx
index 9cb6166..7331177 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -80,11 +80,10 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
 const css::uno::Sequence< 
css::beans::PropertyValue >&  lArguments)
 throw(css::uno::RuntimeException, std::exception)
 {
-css::uno::Reference< css::uno::XInterface > xTHIS(static_cast< 
::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
-
 // check for valid parameters
 if (
 (!xDispatchProvider.is()) ||
+(!m_xContext.is())||
 (sURL.isEmpty() )
)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/inc framework/Library_fwe.mk framework/Library_fwl.mk framework/source include/framework sfx2/source

[Juergen Funk]

 framework/Library_fwe.mk |1 
 framework/Library_fwl.mk |1 
 framework/inc/services/dispatchhelper.hxx|  104 --
 framework/source/register/registertemp.cxx   |2 
 framework/source/services/dispatchhelper.cxx |   80 ++---
 include/framework/dispatchhelper.hxx |  123 +++
 sfx2/source/control/bindings.cxx |   14 ++-
 sfx2/source/control/statcach.cxx |   30 --
 sfx2/source/control/unoctitm.cxx |9 +
 sfx2/source/inc/statcach.hxx |4 
 10 files changed, 215 insertions(+), 153 deletions(-)

New commits:
commit f9bb13419549d621ffd55d9d81e0732a89560e2e
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Fri May 13 10:42:17 2016 +0200

tdf#99815 use XNotifyingDispatch in sfx2

- move DispatchHelper somewhere public
- use it from generic dispatcher call sites in sfx2
- return result of dispatcher calls (conveyed via
  XDispatchResultListener) to calling code, instead of faking it

Change-Id: Ie8041133e99dd99e45819f98798829b96532b9e6
Reviewed-on: https://gerrit.libreoffice.org/24953
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 9b10e16..0559236 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
 framework/source/fwe/xml/toolboxconfiguration \
 framework/source/fwe/xml/toolboxdocumenthandler \
 framework/source/fwe/xml/xmlnamespaces \
+framework/source/services/dispatchhelper \
 ))
 
 # Runtime dependency for unit-tests
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index ea325e0..f3729c4 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\
 framework/source/recording/dispatchrecordersupplier \
 framework/source/register/registertemp \
 framework/source/dispatch/dispatchdisabler \
-framework/source/services/dispatchhelper \
 framework/source/services/mediatypedetectionhelper \
 framework/source/services/uriabbreviation \
 framework/source/uielement/fontmenucontroller \
diff --git a/framework/source/register/registertemp.cxx 
b/framework/source/register/registertemp.cxx
index 393c5bd..f6c28ef 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -38,7 +38,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/framework/source/services/dispatchhelper.cxx 
b/framework/source/services/dispatchhelper.cxx
index 5700e2c..9cb6166 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -17,7 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include 
+#include 
 #include 
 
 #include 
@@ -103,41 +104,58 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
 
 // search dispatcher
 css::uno::Reference< css::frame::XDispatch >  xDispatch   = 
xDispatchProvider->queryDispatch(aURL, sTargetFrameName, nSearchFlags);
-css::uno::Reference< css::frame::XNotifyingDispatch > xNotifyDispatch 
(xDispatch, css::uno::UNO_QUERY);
 
-// make sure that synchronous execution is used (if possible)
-css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments );
-sal_Int32 nLength = lArguments.getLength();
-aArguments.realloc( nLength + 1 );
-aArguments[ nLength ].Name = "SynchronMode";
-aArguments[ nLength ].Value <<= true;
+return executeDispatch(xDispatch, aURL, true, lArguments);
+}
 
-css::uno::Any aResult;
-if (xNotifyDispatch.is())
-{
-// dispatch it with guaranteed notification
-// Here we can hope for a result ... instead of the normal dispatch.
-css::uno::Reference< css::frame::XDispatchResultListener > 
xListener(xTHIS, css::uno::UNO_QUERY);
-/* SAFE { */
-osl::ClearableMutexGuard aWriteLock(m_mutex);
-m_xBroadcaster.set(xNotifyDispatch, css::uno::UNO_QUERY);
-m_aResult  = css::uno::Any();
-m_aBlock.reset();
-aWriteLock.clear();
-/* } SAFE */
-
-// dispatch it and wait for a notification
-// TODO/MBA: waiting in main thread?!
-xNotifyDispatch->dispatchWithNotification(aURL, aArguments, xListener);
-aResult = m_aResult;
-}
-else if (xDispatch.is())
+
+css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
+ const css::uno::Reference< 
css::frame::XDispatch >&  xDispatch ,
+ const  css::util::URL&

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

[Juergen Funk]

 vcl/win/app/salinst.cxx |2 ++
 vcl/win/window/salframe.cxx |3 +++
 2 files changed, 5 insertions(+)

New commits:
commit 0761614ccf5beb9051fb132c5f1990198f32967f
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Sat Mar 26 22:46:51 2016 +0100

tdf#98924  In windows, change the keyboard layout per application

reint the key maps when in windows change the language for the
application

Change-Id: I71045386b4fe4d6db5572effa07a2f01ce79e74f
Reviewed-on: https://gerrit.libreoffice.org/23556
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 1f2d22c..906129f 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -299,6 +299,8 @@ void SalData::initKeyCodeMap()
 if( nKey < 0x )\
 maVKMap[ nKey ] = b;
 
+maVKMap.clear();
+
 initKey( '+', KEY_ADD );
 initKey( '-', KEY_SUBTRACT );
 initKey( '*', KEY_MULTIPLY );
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index fd5d207..a716898 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -4917,6 +4917,9 @@ static void ImplHandleInputLangChange( HWND hWnd, WPARAM, 
LPARAM lParam )
 if( nLang != pFrame->mnInputLang )
 pFrame->CallCallback( SalEvent::InputLanguageChange, 0 );
 
+// reinit spec. keys
+GetSalData()->initKeyCodeMap();
+
 ImplSalYieldMutexRelease();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Juergen Funk]

 vcl/win/window/salframe.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 58bcea744ac4d9f73f055527369ef54cbc8f1a97
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Sat Mar 26 10:37:13 2016 +0100

tdf#87944 COLOR-PICKER stays on wrong position.

After this patch dab2582f05979cd99a5937cb95a387cfed70bb8d
under windows always open on the wrong position
(open in the middle of the application but not under the
pushbutton)

Change-Id: Ib245df6ccb2be768f7a12b638864d5c3cea1a390
Reviewed-on: https://gerrit.libreoffice.org/23557
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 63b96ca..f04d923 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1310,6 +1310,9 @@ void WinSalFrame::SetPosSize( long nX, long nY, long 
nWidth, long nHeight,
 
 nX = aPt.x;
 nY = aPt.y;
+
+// the position is set
+mbDefPos = false;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Juergen Funk]

 sc/qa/unit/data/README.cellborders  |   93 
 sc/qa/unit/data/ods/test_borders_export.ods |binary
 sc/qa/unit/subsequent_export-test.cxx   |   90 +++
 sc/source/filter/excel/xestyle.cxx  |  107 
 sc/source/filter/oox/stylesbuffer.cxx   |6 +
 5 files changed, 250 insertions(+), 46 deletions(-)

New commits:
commit 51737960911d41593ffd9792a6a85aeaa86824fd
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Wed Feb 24 13:13:23 2016 +0100

tdf#79787 Normal cell borders are showing dashed/dotted reopen in MSO

New Mapping from LO to MS, decription in
  sc/qa/unit/data/README.cellborders

Add a Unit-Test for testing the mapping

Change-Id: I5324bf85b6299dbc63ce3c8ef479f19b0b1b3f1f
Reviewed-on: https://gerrit.libreoffice.org/22665
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
Tested-by: Katarina Behrens <katarina.behr...@cib.de>

diff --git a/sc/qa/unit/data/README.cellborders 
b/sc/qa/unit/data/README.cellborders
new file mode 100644
index 000..00db85a
--- /dev/null
+++ b/sc/qa/unit/data/README.cellborders
@@ -0,0 +1,93 @@
+
+Differences in borders between Excel and LibreOffice Calc.
+
+The sources for this Document is:
+ - sc/qa/unit/data/ods/test_borders_export.ods  (new Test-Document)
+ - sc/qa/unit/subsequent_export-test.cxx
(ScExportTest::testBordersExchangeXLSX)
+
+ - sc/source/filter/excel/xestyle.cxx   (void lclGetBorderLine)
+ - sc/source/filter/oox/stylesbuffer.cxx(Border::convertBorderLine)
+
+ Bug-Ticket: tdf#79787
+
+
+In LibreOffice the lines are defined by two information: the style and the 
width of the line. There are seven different line styles available. And the 
following line width can be selected: 0.05 pt, 0.25 pt, 0.50 pt, 0.75 pt, 1.0 
pt, 1.25 pt, 1.50 pt, … until 9pt.
+In Excel you can only define the style of the line. There are 13 different 
styles available. The width cannot be entered explicitly, instead you have 
different styles for a solid line with different width (s. Screenshots below).
+The question is now: how to map the borderlines of LibreOffice to Excel and 
vice versa.
+In the overview below you can see the mapping as it is and some suggestions 
how to improve it. As the borders are defined different, it will not be 
possible to define a 1:1 mapping."
+
+The current mapping is mainly defined of the width, but i think better is the 
line-style, i think user see that first
+
+Base for the evaluation is LibreOffice master (commit  
[bbfeab3b13b48c99cfa2f94c8c34bc3efef7faa9] ) and Excel 2013
+
+   EXCEL  ||   
  LIBREOFFICE
+Excel-Line Name  Value||   
 LO-Line  Name  Value
+  KeineEXC_LINE_NONE   0  ||   
   none   table::BorderLineStyle::NONE  32767 (-1)
+1  EXC_LINE_HAIR   7  ||   
1 table::BorderLineStyle::SOLID 0
+2  EXC_LINE_DOTTED 4  ||   
2 table::BorderLineStyle::DOTTED1
+3  EXC_LINE_THIN_DASHDOTDOT11 ||   
3 table::BorderLineStyle::DASHED2
+4  EXC_LINE_THIN_DASHDOT   9  ||   
4 table::BorderLineStyle::FINE_DASHED   14
+5  EXC_LINE_DASHED 3  ||   
5 table::BorderLineStyle::DASH_DOT  16
+6  EXC_LINE_THIN   1  ||   
6 table::BorderLineStyle::DASH_DOT_DOT  17
+7  EXC_LINE_MEDIUM_DASHDOTDOT  12 ||   
7 table::BorderLineStyle::DOUBLE_THIN   15
+8  EXC_LINE_MEDIUM_SLANT_DASHDOT   13 ||
+9  EXC_LINE_MEDIUM_DASHDOT 10 ||
+10 EXC_LINE_MEDIUM_DASHED  8  ||
+11 EXC_LINE_MEDIUM 2  ||
+12 EXC_LINE_THICK  5  ||
+13 EXC_LINE_DOUBLE 6  ||
+
+In the following cases a 1:1 mapping is not possible.
+
+Excel -> LibreOffice: Create in Excel and open it in LibreOffice. ||
LibreOffice -> Excel: Create Sheet in LibreOffice and save as XLSX.
+Create in|  In Excel save as XLSX, | In Excel save as ODS,||  
Created in |Load saved xlsx-file | Load saved xlsx-file
+Excel2013|   Load in LibreOffice   |  Load in LibreOffice 
||LibreOffice with |  in LibreOffic

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

[Juergen Funk]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit b0facbbedf42a02449d9f35bb4ac8bd7ec2d8917
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Wed Feb 10 14:54:24 2016 +0100

tdf#97526 - in copy/paste ignore unwanted page break on first paragraph

In copy/paste ignore the page break attribute from the first paragraph
of the document (see also tdf#39400)

Change-Id: I838c21c14647d4692673bd30df320e6704de1455
Reviewed-on: https://gerrit.libreoffice.org/22270
Reviewed-by: Oliver Specht <oliver.spe...@cib.de>
Tested-by: Oliver Specht <oliver.spe...@cib.de>

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index a82075e..750dcbe 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4180,6 +4180,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& 
rPam, SwPosition& rPos,
 ( (pDestTextNd && !pDestTextNd->GetText().getLength()) 
||
   ( !bOneNode && !rPos.nContent.GetIndex() ) );
 bool bCopyBookmarks = true;
+bool bCopyPageSource  = false;
 bool bStartIsTextNode = nullptr != pSttTextNd;
 
 // #i104585# copy outline num rule to clipboard (for ASCII filter)
@@ -,10 +4445,24 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& 
rPam, SwPosition& rPos,
 pCopyPam->GetPoint()->nNode.GetIndex()+1 ]->GetTextNode()))
 {
 pDestTextNd->SetAttr( aBrkSet );
+bCopyPageSource = true;
 }
 }
 } while( false );
 
+
+// it is not possible to make this test when copy from the clipBoard to 
document
+//  in this case the PageNum not exist anymore
+// tdf#39400 and tdf#97526
+// when copy from document to ClipBoard, and it is from the first page
+//  and not the source has the page break
+if (pDoc->IsClipBoard() && (rPam.GetPageNum(pStt == rPam.GetPoint()) == 1) 
&& !bCopyPageSource)
+{
+pDestTextNd->ResetAttr(RES_BREAK);// remove the page-break
+pDestTextNd->ResetAttr(RES_PAGEDESC);
+}
+
+
 // Adjust position (in case it was moved / in another node)
 rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
 rPos.nContent.GetIndex() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/vcl unusedcode.easy vcl/osx vcl/unx vcl/win

[Juergen Funk]

 include/vcl/svapp.hxx |7 ---
 unusedcode.easy   |1 -
 vcl/osx/salinst.cxx   |   10 --
 vcl/unx/generic/gdi/x11windowprovider.cxx |   16 
 vcl/win/source/app/saldata.cxx|9 -
 5 files changed, 43 deletions(-)

New commits:
commit 32c6389cceda63391ff372987834fb7b0a25339a
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Sat Dec 5 01:37:13 2015 +0100

unused vcl::IsWindowSystemAvailable

Change-Id: Ie903a6fe3237319661662c0533c23528766ffd08
Reviewed-on: https://gerrit.libreoffice.org/20404
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit 6ded842ac4a0e06efcfcc312775d25063201eb68)

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index a8b813b..c5b52ca 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1649,13 +1649,6 @@ inline void Application::EndYield()
 PostUserEvent( Link<void*,void>() );
 }
 
-namespace vcl
-{
-
-VCL_DLLPUBLIC bool IsWindowSystemAvailable();
-
-}
-
 #endif // _APP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index bce941f..89f4028 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -93,7 +93,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
 sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
 std::_Rb_tree<rtl::OUString, std::pair, std::_Select1st<std::pair >, std::less, 
std::allocator<std::pair > >::_M_move_data(std::_Rb_tree<rtl::OUString, 
std::pair, 
std::_Select1st<std::pair >, std::less, 
std::allocator<std::pair > >&, std::integral_constant<bool, true>)
 std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous 
namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous 
namespace)::WorkerThread> > >::reserve(unsigned long)
-vcl::IsWindowSystemAvailable()
 vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
 vcl::Region::IsInside(Rectangle const&) const
 vcl::RenderSettings::PushAndApply(OutputDevice&)
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index b7467be..4bfe5bc 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -1097,15 +1097,5 @@ NSImage* CreateNSImage( const Image& rImage )
 return pImage;
 }
 
-namespace vcl
-{
-
-bool IsWindowSystemAvailable()
-{
-// Yes I know the parens are not needed. I like them in cases like this. 
So sue me.
-return ([NSScreen screens] != nil && [[NSScreen screens] count] > 0);
-}
-
-} // namespace vcl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/x11windowprovider.cxx 
b/vcl/unx/generic/gdi/x11windowprovider.cxx
index 4f507c3..5f7d289 100644
--- a/vcl/unx/generic/gdi/x11windowprovider.cxx
+++ b/vcl/unx/generic/gdi/x11windowprovider.cxx
@@ -68,21 +68,5 @@ Display *OpenX11Display(OString& rDisplay)
 return pDisp;
 }
 
-namespace vcl
-{
-
-bool IsWindowSystemAvailable()
-{
-Display *pDisp;
-OString aDisplay;
-
-pDisp = OpenX11Display(aDisplay);
-if (pDisp)
-XCloseDisplay(pDisp);
-
-return (pDisp != nullptr);
-}
-
-} // namespace vcl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 18256ee..2a04b33 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -74,15 +74,6 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* 
pStr2 )
 return nRet;
 }
 
-namespace vcl
-{
-
-bool IsWindowSystemAvailable()
-{
-return true; // FIXME: we want this to return false if logged in
- // to some Cygwin ssh session for instance
-}
 
-} // namespace vcl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: g

[Juergen Funk]

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

New commits:
commit 87495ce1214424dbd15aa4271a27f3dcac2ea5e2
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Thu Jan 7 17:38:15 2016 +0100

g: fix var in checkout

Change-Id: Ie414037671ca9248931a47000db2b4ed259e72da
Reviewed-on: https://gerrit.libreoffice.org/21217
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/g b/g
index 423a200..69b0812 100755
--- a/g
+++ b/g
@@ -213,7 +213,7 @@ local module
elif [ "$cmd" = "-b" ] ; then
create_branch=1
elif [ "$create_branch" = "1" ] ; then
-   branch="$arg"
+   branch="$cmd"
create_branch=0
fi
 done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unusedcode.easy unusedcode.exclude

[Juergen Funk]

 unusedcode.easy|1 -
 unusedcode.exclude |1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be0b36992969ec5b372fa6d11a00f573073d00b2
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Mon Jan 4 19:03:47 2016 +0100

unused SalGraphics::drawTransformedBitmap(

   basegfx::B2DPoint const&, basegfx::B2DPoint const&,
   basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)

it used here
  http://opengrok.libreoffice.org/xref/core/vcl/quartz/salgdicommon.cxx#669
and
  http://opengrok.libreoffice.org/xref/core/vcl/win/gdi/gdiimpl.cxx#2305

Change-Id: Ia177e27fe1dcec0ca441547db0240fb3f62650a7
Reviewed-on: https://gerrit.libreoffice.org/21085
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/unusedcode.easy b/unusedcode.easy
index f71ba6d..d77024d7 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -5,7 +5,6 @@ OpenGLContext::requestSingleBufferedRendering()
 OpenGLContext::requestVirtualDevice()
 OpenGLRender::CreateTextTexture(rtl::OUString const&, vcl::Font, long, 
com::sun::star::awt::Point, com::sun::star::awt::Size, long)
 OpenGLTexture::Draw()
-SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint 
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
 ScCellValue::set(ScRefCellValue const&)
 ScImportExport::ImportData(rtl::OUString const&, com::sun::star::uno::Any 
const&)
 ScImportExport::ScImportExport(ScDocument*, rtl::OUString const&)
diff --git a/unusedcode.exclude b/unusedcode.exclude
index d8a8054..716e6a5 100644
--- a/unusedcode.exclude
+++ b/unusedcode.exclude
@@ -30,4 +30,5 @@ 
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::share
 FontCharMap::GetDefaultMap(bool)
 OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, 
MapMode const&)
 SvpSalFrame::enableDamageTracker(bool)
+SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint 
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unusedcode.easy unusedcode.exclude

[Juergen Funk]

 unusedcode.easy|1 -
 unusedcode.exclude |1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27450bc72d88b8490d17cb506f85fb4d838df0ea
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Wed Dec 23 00:09:50 2015 +0100

unused code SvpSalFrame::enableDamageTracker(bool)

used here 
http://opengrok.libreoffice.org/xref/core/vcl/android/androidinst.cxx#127

Change-Id: If1b0ff8ef4c585e4b36c4735d7928361fb41b238
Reviewed-on: https://gerrit.libreoffice.org/20885
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/unusedcode.easy b/unusedcode.easy
index 988b371..f71ba6d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -25,7 +25,6 @@ StyleSettings::SetSpinSize(long)
 StyleSettings::SetTitleHeight(long)
 StyleSettings::SetUseFlatBorders(bool)
 StyleSettings::SetUseFlatMenus(bool)
-SvpSalFrame::enableDamageTracker(bool)
 SvpSalInstance::PostedEventsInQueue()
 SvtAccessibilityOptions::IsModified() const
 SvtListener::IsListening(SvtBroadcaster&) const
diff --git a/unusedcode.exclude b/unusedcode.exclude
index 42f2776..d8a8054 100644
--- a/unusedcode.exclude
+++ b/unusedcode.exclude
@@ -29,4 +29,5 @@ 
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUStrin
 
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr
 const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
 FontCharMap::GetDefaultMap(bool)
 OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, 
MapMode const&)
+SvpSalFrame::enableDamageTracker(bool)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unusedcode.easy

[Juergen Funk]

 unusedcode.easy |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 060e74704ae4d32b3730c9b2a87ecfd0e330d854
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Tue Dec 22 00:08:09 2015 +0100

unused code

ScDocument::GetLastDataPos(short) const
ScDocument::EndAllListeners(ScRange const&)

   removed here 90e8ad7ab779740c7381d26ffe7d08acc3a9ff96

Change-Id: I994e6078e2d3c823356598d9d6ed032ce9570bfb
Reviewed-on: https://gerrit.libreoffice.org/20855
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/unusedcode.easy b/unusedcode.easy
index 87bfa16..988b371 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -7,9 +7,6 @@ OpenGLRender::CreateTextTexture(rtl::OUString const&, 
vcl::Font, long, com::sun:
 OpenGLTexture::Draw()
 SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint 
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
 ScCellValue::set(ScRefCellValue const&)
-ScDocument::CreateFormatTable() const
-ScDocument::EndAllListeners(ScRange const&)
-ScDocument::GetLastDataPos(short) const
 ScImportExport::ImportData(rtl::OUString const&, com::sun::star::uno::Any 
const&)
 ScImportExport::ScImportExport(ScDocument*, rtl::OUString const&)
 ScPrivatSplit::GetDeltaX()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl sw/CppunitTest_sw_globalfilter.mk sw/CppunitTest_sw_odfexport.mk sw/CppunitTest_sw_odfimport.mk sw/CppunitTest_sw_ooxmlfieldexport.mk sw/CppunitTest_sw_ooxm

[Juergen Funk]

 include/vcl/print.hxx |2 
 sw/CppunitTest_sw_globalfilter.mk |1 
 sw/CppunitTest_sw_odfexport.mk|1 
 sw/CppunitTest_sw_odfimport.mk|1 
 sw/CppunitTest_sw_ooxmlfieldexport.mk |1 
 sw/CppunitTest_sw_ooxmlimport.mk  |1 
 sw/CppunitTest_sw_ooxmlw14export.mk   |1 
 sw/CppunitTest_sw_rtfexport.mk|1 
 sw/CppunitTest_sw_rtfimport.mk|1 
 sw/CppunitTest_sw_ww8import.mk|1 
 sw/inc/dbmgr.hxx  |   99 +++
 sw/ooxmlexport_setup.mk   |1 
 sw/qa/extras/inc/swmodeltestbase.hxx  |2 
 sw/source/uibase/dbui/dbmgr.cxx   |  995 +++---
 14 files changed, 685 insertions(+), 423 deletions(-)

New commits:
commit d8ff907197037045fd0cb173e341f515968b65b1
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Thu Dec 3 16:04:15 2015 +0100

tdf93236 N-UP printing in combination with mailmerge broken file-print 1/4

Refactory the methode "MergeMailFiles"

Change-Id: I65441ade522c06335b0da23cb2fed9afc5bcb72e
Reviewed-on: https://gerrit.libreoffice.org/20714
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
Tested-by: Katarina Behrens <katarina.behr...@cib.de>

diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index b8f32ff..bb30f8e 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -574,7 +574,7 @@ public:
 VCL_PLUGIN_PUBLIC void  createProgressDialog();
 VCL_PLUGIN_PUBLIC bool  isProgressCanceled() const;
 SAL_DLLPRIVATEvoid  setMultipage( const MultiPageSetup& );
-SAL_DLLPRIVATEconst MultiPageSetup&
+VCL_PLUGIN_PUBLIC const MultiPageSetup&
 getMultipage() const;
 VCL_PLUGIN_PUBLIC void  setLastPage( bool i_bLastPage );
 SAL_DLLPRIVATEvoid  setReversePrint( bool i_bReverse );
diff --git a/sw/CppunitTest_sw_globalfilter.mk 
b/sw/CppunitTest_sw_globalfilter.mk
index 6650266..a74cb66 100644
--- a/sw/CppunitTest_sw_globalfilter.mk
+++ b/sw/CppunitTest_sw_globalfilter.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_globalfilter,\
 -I$(SRCDIR)/sw/inc \
 -I$(SRCDIR)/sw/source/core/inc \
 -I$(SRCDIR)/sw/qa/extras/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
 $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index c6434ac..aa5a40a 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_odfexport,\
 -I$(SRCDIR)/sw/inc \
 -I$(SRCDIR)/sw/source/core/inc \
 -I$(SRCDIR)/sw/qa/extras/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
 $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index eaa3542..c5937d3 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_odfimport,\
 -I$(SRCDIR)/sw/source/core/inc \
 -I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
 $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk 
b/sw/CppunitTest_sw_ooxmlfieldexport.mk
index ae67c20..086e53e 100644
--- a/sw/CppunitTest_sw_ooxmlfieldexport.mk
+++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlfieldexport,\
 -I$(SRCDIR)/sw/inc \
 -I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
 $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 4074255..1a275bf 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlimport,\
 -I$(SRCDIR)/sw/inc \
 -I$(SRCDIR)/sw/source/core/inc \
 -I$(SRCDIR)/sw/qa/extras/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
 $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk 
b/sw/CppunitTest_sw_ooxmlw14export.mk
index 5958019..d6bcd07 100644
--- a/sw/CppunitTest_sw_ooxmlw14export.mk
+++ b/sw/CppunitTest_sw_ooxmlw14export.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlw14export,\
 -I$(SRCDIR)/sw/inc \
 -I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
 $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index b47c906..0228ee0 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport,\
 -I$(SRCDIR)/sw/inc \
 -I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
+-I$(SRCDIR

[Libreoffice-commits] core.git: unusedcode.easy

[Juergen Funk]

 unusedcode.easy |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 4dc0ba63b226833f58ed3a11441ddfbcf3f2f0e2
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Sun Dec 20 22:40:17 2015 +0100

unused code ww8::WW8TableNodeInfo::isEndOfLine() const

here removed b975aceec3c5f101916b525c10c44408b3e9da9d

Change-Id: I93d39d700277884903971c58a5dfdd3704e452f8
Reviewed-on: https://gerrit.libreoffice.org/20843
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/unusedcode.easy b/unusedcode.easy
index 38e742d..87bfa16 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -89,4 +89,3 @@ 
vclcanvas::CanvasBitmapHelper::setPixel(com::sun::star::uno::Sequence 
const&, com::sun::star::rendering::IntegerBitmapLayout const&, 
com::sun::star::geometry::IntegerRectangle2D const&)
 vclcanvas::CanvasHelper::setPixel(com::sun::star::uno::Sequence 
const&, com::sun::star::rendering::IntegerBitmapLayout const&, 
com::sun::star::geometry::IntegerPoint2D const&)
-ww8::WW8TableNodeInfo::isEndOfLine() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/test test/source unusedcode.easy unusedcode.exclude

[Juergen Funk]

 include/test/primitive2dxmldump.hxx |3 ---
 test/source/primitive2dxmldump.cxx  |9 -
 unusedcode.easy |3 ---
 unusedcode.exclude  |1 +
 4 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 5bd5cd1622608ded4a47c588e4f674a4c5b505be
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Thu Dec 17 21:43:27 2015 +0100

unused code

   Primitive2dXmlDump::filterActionType(unsigned short, bool)
   Primitive2dXmlDump::filterAllActionTypes()

used code

   OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode 
const&, MapMode const&)
at
   
http://opengrok.libreoffice.org/xref/core/vcl/source/gdi/pdfwriter_impl.cxx#1388

tested under windows with enable-dbgutil

Change-Id: Ife200e5851323dfcfe138f5c978d028513213295
Reviewed-on: https://gerrit.libreoffice.org/20781
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/include/test/primitive2dxmldump.hxx 
b/include/test/primitive2dxmldump.hxx
index 176f6dd..b885234 100644
--- a/include/test/primitive2dxmldump.hxx
+++ b/include/test/primitive2dxmldump.hxx
@@ -29,9 +29,6 @@ public:
 Primitive2dXmlDump();
 virtual ~Primitive2dXmlDump();
 
-void filterActionType(const sal_uInt16 nActionType, bool bShouldFilter);
-void filterAllActionTypes();
-
 /** The actual result that will be used for testing.
 
 This function normally uses a SvMemoryStream for its operation; but
diff --git a/test/source/primitive2dxmldump.cxx 
b/test/source/primitive2dxmldump.cxx
index c00f6e2..4a99677 100644
--- a/test/source/primitive2dxmldump.cxx
+++ b/test/source/primitive2dxmldump.cxx
@@ -49,15 +49,6 @@ Primitive2dXmlDump::Primitive2dXmlDump() :
 Primitive2dXmlDump::~Primitive2dXmlDump()
 {}
 
-void Primitive2dXmlDump::filterActionType(const sal_uInt16 nActionType, bool 
bShouldFilter)
-{
-maFilter[nActionType] = bShouldFilter;
-}
-
-void Primitive2dXmlDump::filterAllActionTypes()
-{
-maFilter.assign(constMaxActionType, true);
-}
 
 xmlDocPtr Primitive2dXmlDump::dumpAndParse(
 const drawinglayer::primitive2d::Primitive2DContainer& 
rPrimitive2DSequence,
diff --git a/unusedcode.easy b/unusedcode.easy
index 082b4cf..38e742d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -5,9 +5,6 @@ OpenGLContext::requestSingleBufferedRendering()
 OpenGLContext::requestVirtualDevice()
 OpenGLRender::CreateTextTexture(rtl::OUString const&, vcl::Font, long, 
com::sun::star::awt::Point, com::sun::star::awt::Size, long)
 OpenGLTexture::Draw()
-OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, 
MapMode const&)
-Primitive2dXmlDump::filterActionType(unsigned short, bool)
-Primitive2dXmlDump::filterAllActionTypes()
 SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint 
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
 ScCellValue::set(ScRefCellValue const&)
 ScDocument::CreateFormatTable() const
diff --git a/unusedcode.exclude b/unusedcode.exclude
index 0862690..42f2776 100644
--- a/unusedcode.exclude
+++ b/unusedcode.exclude
@@ -28,4 +28,5 @@ 
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr
 const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
 FontCharMap::GetDefaultMap(bool)
+OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, 
MapMode const&)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unusedcode.easy

[Juergen Funk]

 unusedcode.easy |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 8a342e9f6ad701bd46ecca1c3d270ef2d9670d44
Author: Juergen Funk <juergen.funk...@cib.de>
Date:   Tue Dec 15 23:24:18 2015 +0100

unusedcode removed in this commits

001e694ecd21095b6fcfb5632ace63d8e0c2b7f8
 OutputDevice::LogicHeightToDeviceCoordinate(long) const

449d272daf5e99f039cdfdd25f020bd798fb9e1d
 OutputDevice::GetCanvas() const
 OutputDevice::HasAlpha()
 OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const
 OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) 
const
 OutputDevice::LogicToPixel(vcl::Region const&, MapMode const&) const
 OutputDevice::PixelToLogic(vcl::Region const&, MapMode const&) const

Change-Id: I284a89ccf9c3bc0dffd47789e0fe8afe83606e0f
Reviewed-on: https://gerrit.libreoffice.org/20732
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/unusedcode.easy b/unusedcode.easy
index b8fb12f..082b4cf 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -5,14 +5,7 @@ OpenGLContext::requestSingleBufferedRendering()
 OpenGLContext::requestVirtualDevice()
 OpenGLRender::CreateTextTexture(rtl::OUString const&, vcl::Font, long, 
com::sun::star::awt::Point, com::sun::star::awt::Size, long)
 OpenGLTexture::Draw()
-OutputDevice::GetCanvas() const
-OutputDevice::HasAlpha()
-OutputDevice::LogicHeightToDeviceCoordinate(long) const
 OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, 
MapMode const&)
-OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const
-OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const
-OutputDevice::LogicToPixel(vcl::Region const&, MapMode const&) const
-OutputDevice::PixelToLogic(vcl::Region const&, MapMode const&) const
 Primitive2dXmlDump::filterActionType(unsigned short, bool)
 Primitive2dXmlDump::filterAllActionTypes()
 SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint 
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits