[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/qa sw/source
sw/qa/extras/ooxmlimport/data/tdf124600.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport2.cxx| 11 +++ sw/source/core/doc/textboxhelper.cxx | 13 + 3 files changed, 24 insertions(+) New commits: commit 858ba31da42b8c9c0367bf20ebbeded74fe0165b Author: Miklos Vajna AuthorDate: Tue Sep 17 17:08:02 2019 +0200 Commit: Mike Kaganski CommitDate: Tue Oct 1 12:47:35 2019 +0200 Related: tdf#124600 sw textbox: sync left/right margin of shape to textbox Writer TextFrames have a default left/right margin; sync from shape to textbox is needed to have correct layout when a DOCX shape has 0 left or right margin. The left margin of the shape was already correct. (The shape in the docx file was extended to have text.) (cherry picked from commit ff5f02b9282e19a2a8a68604c588e9487021b0b5) Change-Id: I832f1bc460f2553bd7f08252d3e21000b4906538 Reviewed-on: https://gerrit.libreoffice.org/79910 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sw/qa/extras/ooxmlimport/data/tdf124600.docx b/sw/qa/extras/ooxmlimport/data/tdf124600.docx index d5dfa313665e..16c4ceb2be5d 100644 Binary files a/sw/qa/extras/ooxmlimport/data/tdf124600.docx and b/sw/qa/extras/ooxmlimport/data/tdf124600.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index 5af1a4021242..99c6d5aaca51 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -110,6 +110,17 @@ DECLARE_OOXMLIMPORT_TEST(testTdf124600, "tdf124600.docx") // i.e. the shape had an unexpected left margin, but not in Word. CPPUNIT_ASSERT_EQUAL(static_cast(0), getProperty(xShape, "HoriOrientPosition")); + +// Make sure that "Shape 1 text" (anchored in the header) has the same left margin as the body +// text. +OUString aShapeTextLeft = parseDump("/root/page/header/txt/anchored/fly/infos/bounds", "left"); +OUString aBodyTextLeft = parseDump("/root/page/body/txt/infos/bounds", "left"); +// Without the accompanying fix in place, this test would have failed with: +// - Expected: 1701 +// - Actual : 1815 +// i.e. there was a >0 left margin on the text of the shape, resulting in incorrect horizontal +// position. +CPPUNIT_ASSERT_EQUAL(aBodyTextLeft, aShapeTextLeft); } DECLARE_OOXMLIMPORT_TEST(testTdf120548, "tdf120548.docx") diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index 532f1ea9f00f..d840a66645c1 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -472,6 +472,19 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_u break; } break; +case RES_LR_SPACE: +{ +switch (nMemberID) +{ +case MID_L_MARGIN: +aPropertyName = UNO_NAME_LEFT_MARGIN; +break; +case MID_R_MARGIN: +aPropertyName = UNO_NAME_RIGHT_MARGIN; +break; +} +break; +} case RES_VERT_ORIENT: switch (nMemberID) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93362] Copy and paste as RTF doesnt retain cell styles
https://bugs.documentfoundation.org/show_bug.cgi?id=93362 Roman Kuznetsov <79045_79...@mail.ru> changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=11 ||6685 CC||79045_79...@mail.ru --- Comment #3 from Roman Kuznetsov <79045_79...@mail.ru> --- still repro in Версия: 6.4.0.0.alpha0+ (x86) ID сборки: c45d477b0a0038d9c25176cf7cff299e5ddf3a7a Потоков ЦП: 4; ОС:Windows 6.1; Отрисовка ИП: по умолчанию; VCL: win; TinderBox: Win-x86@42, Branch:master, Time: 2019-09-30_05:06:55 Локаль: ru-RU (ru_RU); Язык интерфейса: ru-RU Calc: threaded and now after fixing og bug 116685 it's big problem! -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 116685] Copy-pasting a range of cells from Calc to Writer should produce a table by default
https://bugs.documentfoundation.org/show_bug.cgi?id=116685 Roman Kuznetsov <79045_79...@mail.ru> changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=93 ||362 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src
loleaflet/src/control/Control.Menubar.js |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a165c2053dd47c0fbe1cbb86202e281072df7710 Author: Tor Lillqvist AuthorDate: Tue Oct 1 12:07:08 2019 +0300 Commit: Tor Lillqvist CommitDate: Tue Oct 1 12:41:11 2019 +0200 Revert "tdf#126972: The "file icon" button in the menubar is useless..." This reverts commit c5d6c7dd402da6987cd01f3c0759b28b3503d85c. We do want the logo to be there. Change-Id: I2378271e54cbe0763ad41c56b23c1b97a6d2a8ae Reviewed-on: https://gerrit.libreoffice.org/79950 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index e3af7e8fa..e205d794c 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -568,7 +568,7 @@ L.Control.Menubar = L.Control.extend({ }); $('#main-menu').attr('tabindex', 0); - if (!window.ThisIsTheiOSApp && this._map._permission !== 'readonly') { + if (this._map._permission !== 'readonly') { this._createFileIcon(); } }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src
loleaflet/src/control/Control.Menubar.js |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit a0c669d2ab3680c872552d890868dd74499ac92e Author: Tor Lillqvist AuthorDate: Tue Oct 1 13:33:02 2019 +0300 Commit: Tor Lillqvist CommitDate: Tue Oct 1 12:41:32 2019 +0200 Show the logo also before the 'make-editable' button is clicked in the iOS app Change-Id: I69e3a8bfa467de295a23816aa2d0c43ec2aaf61a Reviewed-on: https://gerrit.libreoffice.org/79951 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index e205d794c..984585dde 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -568,7 +568,9 @@ L.Control.Menubar = L.Control.extend({ }); $('#main-menu').attr('tabindex', 0); - if (this._map._permission !== 'readonly') { + // The _createFileIcon function shows the Collabora logo in the iOS app case, no + // need to delay that until the document has been made editable. + if (window.ThisIsTheiOSApp || this._map._permission !== 'readonly') { this._createFileIcon(); } }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 75057] [META] OOXML Chart object issues
https://bugs.documentfoundation.org/show_bug.cgi?id=75057 Bug 75057 depends on bug 12, which changed state. Bug 12 Summary: FILESAVE No support for exporting Axis position setting https://bugs.documentfoundation.org/show_bug.cgi?id=12 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127619] [macOS][Sierra/High Sierra]LibreOffice crash within 40s after opening app when automatic update option activated.
https://bugs.documentfoundation.org/show_bug.cgi?id=127619 pjakru...@yahoo.com changed: What|Removed |Added Version|6.2.0.1 rc |6.1.0.1 rc -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127619] [macOS][Sierra/High Sierra]LibreOffice crash within 40s after opening app when automatic update option activated.
https://bugs.documentfoundation.org/show_bug.cgi?id=127619 pjakru...@yahoo.com changed: What|Removed |Added Summary|[macOS][High Sierra |[macOS][Sierra/High |10.13.6]LibreOffice crash |Sierra]LibreOffice crash |within 40s after opening|within 40s after opening |app when automatic update |app when automatic update |option activated. |option activated. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124462] Crash if I open the File dialog and click the 'Save' tab
https://bugs.documentfoundation.org/show_bug.cgi?id=124462 --- Comment #12 from Stacy Watson --- Excellent information you have shared, thanks for taking the time to share with us such a great article. I really appreciate your work. http://comsoffice.com/ -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127629] UI: Question to open links when opening a master document in English but different UI language
https://bugs.documentfoundation.org/show_bug.cgi?id=127629 --- Comment #9 from sophie --- We are slowly migrating to Weblate (weblate.documentfoundation.org) and master is on Weblate currently. I was able to find the string in master: https://vm137.documentfoundation.org/translate/libo_ui-master/sfx2messages/fr/?checksum=e0e8fca6381bdb3 As you can see in French it's not translated, maybe the dialog has been changed or the string moved or modified and translation is not yet integrated. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: solenv/gbuild vcl/opengl
solenv/gbuild/uitest-failed-default.sh |2 +- vcl/opengl/README.opengl |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit f88160d640b3efe4ffdf8126795a56d25d83944d Author: Caolán McNamara AuthorDate: Mon Sep 30 20:34:27 2019 +0100 Commit: Caolán McNamara CommitDate: Tue Oct 1 12:12:28 2019 +0200 don't suggest gtk SAL_USE_VCLPLUGIN env variable Change-Id: I069fc594c32d2f1ea7fe4cc04be00a9a574054f8 Reviewed-on: https://gerrit.libreoffice.org/79898 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/solenv/gbuild/uitest-failed-default.sh b/solenv/gbuild/uitest-failed-default.sh index 4189f306a9ab..e3d2d239fdb5 100755 --- a/solenv/gbuild/uitest-failed-default.sh +++ b/solenv/gbuild/uitest-failed-default.sh @@ -21,7 +21,7 @@ where Class - is the name in the "class Class" declaration Or to do interactive debugging, run two shells with: -SAL_USE_VCLPLUGIN=gtk make debugrun +SAL_USE_VCLPLUGIN=gen make debugrun make gb_UITest_DEBUGRUN=T UITest_$2 The SAL_USE_VCLPLUGIN part is unnecessary if you are running on a kde desktop. diff --git a/vcl/opengl/README.opengl b/vcl/opengl/README.opengl index f420262a9fb3..231abbf36500 100644 --- a/vcl/opengl/README.opengl +++ b/vcl/opengl/README.opengl @@ -1,6 +1,6 @@ Run LO with OpenGL enabled -- -SAL_USE_VCLPLUGIN=gtk SAL_FORCEGL=1 ./soffice +SAL_USE_VCLPLUGIN=gen SAL_FORCEGL=1 ./soffice Environment variables used: @@ -23,4 +23,4 @@ APItrace. The path is the default used in Fedora 21+. Run VCLDemo --- -SAL_USE_VCLPLUGIN=gtk SAL_FORCEGL=1 ./bin/run vcldemo +SAL_USE_VCLPLUGIN=gen SAL_FORCEGL=1 ./bin/run vcldemo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 127900] New: Frame language set in master ignored in slides created from that master
https://bugs.documentfoundation.org/show_bug.cgi?id=127900 Bug ID: 127900 Summary: Frame language set in master ignored in slides created from that master Product: LibreOffice Version: 6.3.0.2 rc Hardware: All OS: All Status: UNCONFIRMED Keywords: bibisected, bisected, regression Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: mikekagan...@hotmail.com CC: gulsah.k...@collabora.com Starting from https://git.libreoffice.org/core/+/40bb9ac690d979ef544d5aa759bd734a176912a0, setting a language to a frame in slide master, and creating a new slide based on that master, gives a frame with initial language. 1. Create a new blank presentation 2. Open Master Slides sidebar; right-click on the only one master displayed in "Used in This Presentation" (Default), and choose "Edit Master..." 3. In the opened master, right-click at the border of the main frame (where a sample outline is displayed), and choose "Character..." 4. In Character dialog, open Font tab, and choose Language to anything different (if Arabic/Asian scripts are enabled, it's enough to only change Western script language) -> OK 5. Menu View->Normal 6. Menu Slide->New Slide (Ctrl+M) 7. Check the language of the frame of the newly created slide (using procedure from steps 3-4) Expected: the language should be same as set at step 4 Actual: the language is same as before step 4 Tested with Version: 6.3.2.2 (x64) Build ID: 98b30e735bda24bc04ab42594c85f7fd8be07b9c CPU threads: 12; OS: Windows 10.0; UI render: GL; VCL: win; Locale: ru-RU (ru_RU); UI-Language: en-US Calc: threaded and current master toward 6.4 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127858] Assertion when trying to edit a form (Linux gen rendering)
https://bugs.documentfoundation.org/show_bug.cgi?id=127858 Julien Nabet changed: What|Removed |Added OS|Linux (All) |All -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127858] Assertion when trying to edit a form (Linux gen rendering)
https://bugs.documentfoundation.org/show_bug.cgi?id=127858 --- Comment #4 from Julien Nabet --- Created attachment 154675 --> https://bugs.documentfoundation.org/attachment.cgi?id=154675=edit bt Windows (windbg) On Win10 with master sources updated today, I could reproduce this. Quite weirdly, the bt is completely different. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127888] recovery on webdav files does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=127888 Julien Nabet changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEEDINFO CC||serval2...@yahoo.fr --- Comment #1 from Julien Nabet --- 6.0 and 6.1 branches are EOL. Could you give a try to 6.2.7 or brand new 6.3.2? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127619] [macOS][High Sierra 10.13.6]LibreOffice crash within 40s after opening app when automatic update option activated.
https://bugs.documentfoundation.org/show_bug.cgi?id=127619 --- Comment #23 from tiago.mon...@gmail.com --- Alex Thurgood, Thanks for the quick follow-up. May I humbly suggest: 1. Removing the [High Sierra 10.13.6] text from the summary. It is misleading, given that I'm observing it in macOS Sierra 10.12.6. 2. Changing the earliest affected version to 6.1.0.1. Still shows this behaviour on my system, 6.0.7.3 being the most recent version that does not seem to fail. Post-Scriptum - I did quick search for "severity = major", "priority = high", "os = macOS" and came up with a list of 20 bugs, including this one. I respectfully argue that, in comparing this bug with others on that list, I would be inclined to raise the "severity", at least: if a systematic crash that prevents the tool from being used isn't "critical", I'm not sure what would be, other than "data corruption/destruction" (I tried finding the definitions for different severity/priority levels, but couldn't, so I might be missing something here!). Again thanks! -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127846] Crash when right click on a form control and select "Position and Size"
https://bugs.documentfoundation.org/show_bug.cgi?id=127846 Julien Nabet changed: What|Removed |Added Resolution|--- |WORKSFORME Status|NEW |RESOLVED --- Comment #12 from Julien Nabet --- Ok let's do this then. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127846] Crash when right click on a form control and select "Position and Size"
https://bugs.documentfoundation.org/show_bug.cgi?id=127846 --- Comment #11 from Xisco Faulí --- (In reply to Julien Nabet from comment #9) > With master sources updated today, I gave a new try, I don't reproduce this > anymore. > > Olivier: could you give a new try with a build from today? (at least > 9366fc18143194909a158a8252c25d8c3ff6e87a) I would suggest to close it as RESOLVED WORKSFORME since you can no longer reproduce it... -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127846] Crash when right click on a form control and select "Position and Size"
https://bugs.documentfoundation.org/show_bug.cgi?id=127846 Julien Nabet changed: What|Removed |Added Severity|critical|normal Priority|high|medium --- Comment #10 from Julien Nabet --- Meanwhile, let's decrease priority of this one since it seems it may be a WFM. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/SidebarChildWindow.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e0a415b13e1555f06db854875d812f71f72ec380 Author: Jan Holesovsky AuthorDate: Mon Sep 30 12:10:17 2019 +0200 Commit: Andras Timar CommitDate: Tue Oct 1 11:38:21 2019 +0200 lok: Enable sidebar also in Impress. Change-Id: I6c5c7c82a3ad81e590a891f1a8cc76a873823acf Reviewed-on: https://gerrit.libreoffice.org/79856 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar (cherry picked from commit 4ff28e09412d2c0ef73008d3d85dae9b506e4978) Reviewed-on: https://gerrit.libreoffice.org/79900 Tested-by: Jenkins diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index 058d5fd1516b..0690061a634b 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -33,7 +33,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR); SidebarChildWindow::SidebarChildWindow(vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow(pParentWindow, nId) -, mbSidebarVisibleInLOK(pInfo && (pInfo->aModule == "scalc" || pInfo->aModule == "swriter")) +, mbSidebarVisibleInLOK(pInfo && (pInfo->aModule == "scalc" || pInfo->aModule == "simpress" || pInfo->aModule == "swriter")) { auto pDockWin = VclPtr::Create( pBindings, *this, pParentWindow, WB_STDDOCKWIN | WB_OWNERDRAWDECORATION | WB_CLIPCHILDREN ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 127899] New: SWriter: let me change the view from normal to webview in read only mode
https://bugs.documentfoundation.org/show_bug.cgi?id=127899 Bug ID: 127899 Summary: SWriter: let me change the view from normal to webview in read only mode Product: LibreOffice Version: 5.4.7.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: lhp...@outlook.de Description: hi, could you please not gray out/disable/block the switches Normal view and Web View from the view menu if i have opened a document in read only mode. Thanks end of translated text hi, könntet ihr bitte die schalter normal und Webvorschau im Ansicht-Menü nicht ausgrauen/ deaktivieren wenn ein dokument schreibgeschützt geöffnet wird. Danke Steps to Reproduce: 1. open an .wri document from within a zip file 2. its opened read only 3. try to switch to webview to see the log file uninterupdated by pagebrake 4. fail Actual Results: not possible Expected Results: possible Reproducible: Always User Profile Reset: No Additional Info: [Information automatically included from LibreOffice] Locale: de Module: TextDocument [Information guessed from browser] OS: Windows (All) OS is 64bit: no -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 32485] Settings on the image frame style lost when caption is applied
https://bugs.documentfoundation.org/show_bug.cgi?id=32485 --- Comment #14 from RGB --- Problem still present in LibreOffice 6.3.2 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig
cui/uiconfig/ui/bulletandposition.ui |2 -- 1 file changed, 2 deletions(-) New commits: commit 259ea5539e54bedc7786763841f2bee44dc32e7e Author: Caolán McNamara AuthorDate: Mon Sep 30 16:55:11 2019 +0100 Commit: Michael Stahl CommitDate: Tue Oct 1 11:30:58 2019 +0200 Resolves: tdf#127450 max_content_[width|height] isn't available in gtk 3.18 so this crashes Change-Id: Ie9b2607e4c4290f9745b8bc5f36b80d8970018b1 Reviewed-on: https://gerrit.libreoffice.org/79876 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/cui/uiconfig/ui/bulletandposition.ui b/cui/uiconfig/ui/bulletandposition.ui index c62f1acb8da5..0ec6c67061c2 100644 --- a/cui/uiconfig/ui/bulletandposition.ui +++ b/cui/uiconfig/ui/bulletandposition.ui @@ -994,8 +994,6 @@ True True in -150 -300 True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/config/modcfg.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 32e781d268e59397016f7243fc92d5408577d593 Author: Gabor Kelemen AuthorDate: Sun Sep 29 00:28:20 2019 +0200 Commit: László Németh CommitDate: Tue Oct 1 11:30:27 2019 +0200 tdf#92845 Save Writer - Comparison settings properly Options - Writer - Comparison -> 'Compare Documents' and 'Ignore pieces of lenght ' were not retained between runs of Writer. The type of these settings are defined in officecfg/registry/schema/org/openoffice/Office/Writer.xcs as follows: Casting the setting values to sal_Int32 did not work, because sal_Int16 maps to short. This makes the following warning (2 instances displayed when closing the Options window) go away in my local debug build and the values retained: warn:unotools.config:30387:30387:unotools/source/config/configitem.cxx:483: Exception from PutProperties com.sun.star.lang.IllegalArgumentException message: configmgr inappropriate property value context: configmgr::ChildAccess ArgumentPosition: -1 Change-Id: I59fea65378a5dfb2b6f25b9c9eaf08817862587d Reviewed-on: https://gerrit.libreoffice.org/79807 Tested-by: Jenkins Reviewed-by: László Németh Tested-by: László Németh diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 3a5c34ab8515..006ad51069a2 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -1291,10 +1291,10 @@ void SwCompareConfig::ImplCommit() Sequence aValues(aNames.getLength()); Any* pValues = aValues.getArray(); -pValues[0] <<= static_cast(m_eCmpMode); +pValues[0] <<= static_cast(m_eCmpMode); pValues[1] <<= m_bUseRsid; pValues[2] <<= m_bIgnorePieces; -pValues[3] <<= static_cast(m_nPieceLen); +pValues[3] <<= static_cast(m_nPieceLen); pValues[4] <<= m_bStoreRsid; PutProperties(aNames, aValues); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 59800] FILEOPEN docx: Images in smartart open enlarged
https://bugs.documentfoundation.org/show_bug.cgi?id=59800 Timur changed: What|Removed |Added Summary|FILEOPEN: docx: Smartart|FILEOPEN docx: Images in |problems|smartart open enlarged -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59800] FILEOPEN: docx: Smartart problems
https://bugs.documentfoundation.org/show_bug.cgi?id=59800 Timur changed: What|Removed |Added Attachment #124552|0 |1 is obsolete|| --- Comment #12 from Timur --- Created attachment 154673 --> https://bugs.documentfoundation.org/attachment.cgi?id=154673=edit The file compared in MSO2016, LO5.2 and LO6.4+ (In reply to Xisco Faulí from comment #8) > Created attachment 124552 [details] > how it looks in Libo 5.2 (left) and Ms Office ( right) Similar now in LO 6.4+. I don't see mirrored font, but image size is not correct. If the file is resaved in MSO, LO opens similarly, so not an issue with SmartArt version. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: chart2/qa include/oox oox/source
chart2/qa/extras/chart2export.cxx| 11 + chart2/qa/extras/data/xlsx/tdf12.xlsx|binary include/oox/export/chartexport.hxx |1 oox/source/drawingml/chart/axisconverter.cxx |2 oox/source/export/chartexport.cxx| 56 +++ 5 files changed, 63 insertions(+), 7 deletions(-) New commits: commit 6027ec08fd5df2e09e34ff61b3777ad2cc8304b3 Author: Balazs Varga AuthorDate: Fri Sep 27 14:29:49 2019 +0200 Commit: László Németh CommitDate: Tue Oct 1 11:19:18 2019 +0200 tdf#12 OOXML chart export: fix X axis position setting "CrossBetween" Export ShiftedCategoryPosition value into the CrossBetween OOXML tag. Change-Id: I3d8b298ed47c5326ee4faf0e8663c8c79d5a1d86 Reviewed-on: https://gerrit.libreoffice.org/79502 Tested-by: Jenkins Reviewed-by: László Németh diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index e1c7a4403afe..2589428831bc 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -120,6 +120,7 @@ public: void testSetSeriesToSecondaryAxisXLSX(); void testCombinedChartSecondaryAxisXLSX(); void testCombinedChartSecondaryAxisODS(); +void testCrossBetweenXLSX(); void testAxisTitleRotationXLSX(); void testAxisCrossBetweenXSLX(); void testPieChartDataPointExplosionXLSX(); @@ -223,6 +224,7 @@ public: CPPUNIT_TEST(testSetSeriesToSecondaryAxisXLSX); CPPUNIT_TEST(testCombinedChartSecondaryAxisXLSX); CPPUNIT_TEST(testCombinedChartSecondaryAxisODS); +CPPUNIT_TEST(testCrossBetweenXLSX); CPPUNIT_TEST(testAxisTitleRotationXLSX); CPPUNIT_TEST(testAxisCrossBetweenXSLX); CPPUNIT_TEST(testPieChartDataPointExplosionXLSX); @@ -1901,6 +1903,15 @@ void Chart2ExportTest::testCombinedChartSecondaryAxisODS() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:crosses", 0); } +void Chart2ExportTest::testCrossBetweenXLSX() +{ +// Original file was created with MS Office +load("/chart2/qa/extras/data/xlsx/", "tdf12.xlsx"); +xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); +CPPUNIT_ASSERT(pXmlDoc); +assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between"); +} + void Chart2ExportTest::testAxisTitleRotationXLSX() { load("/chart2/qa/extras/data/xlsx/", "axis_title_rotation.xlsx"); diff --git a/chart2/qa/extras/data/xlsx/tdf12.xlsx b/chart2/qa/extras/data/xlsx/tdf12.xlsx new file mode 100644 index ..c04de30fc8e2 Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf12.xlsx differ diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index e7474d75ac15..304bd620d1af 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -106,6 +106,7 @@ private: // members filled by InitRangeSegmentationProperties (retrieved from DataProvider) bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false +bool mbIsCategoryPositionShifted; //if the value axis crosses the category axis between tickmarks this will be true //css::uno::Reference< css::drawing::XShapes > mxAdditionalShapes; css::uno::Reference< css::chart2::data::XDataSequence > mxCategoriesValues; diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 9f2cc0f715dc..0f6973b02ec4 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -224,6 +224,8 @@ void AxisConverter::convertFromModel( case API_Y_AXIS: OSL_ENSURE( mrModel.mnTypeId == C_TOKEN( valAx ), "AxisConverter::convertFromModel - unexpected axis model type (must: c:valAx)" ); aScaleData.AxisType = isPercent(rTypeGroups) ? cssc2::AxisType::PERCENT : cssc2::AxisType::REALNUMBER; +if( mrModel.mnCrossBetween != -1 ) +aScaleData.ShiftedCategoryPosition = mrModel.mnCrossBetween == XML_between; break; case API_Z_AXIS: OSL_ENSURE( mrModel.mnTypeId == C_TOKEN( serAx ), "AxisConverter::convertFromModel - unexpected axis model type (must: c:serAx)" ); diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index c282b0d9263f..5e23e68cb631 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -227,6 +227,48 @@ static bool lcl_hasCategoryLabels( const Reference< chart2::XChartDocument >& xC return xCategories.is(); } +static bool lcl_isCategoryAxisShifted(const Reference< chart2::XChartDocument >& xChartDoc) +{ +Reference< chart2::XDiagram > xDiagram(xChartDoc->getFirstDiagram()); +bool isCategoryPositionShifted = false; + +try +{ +Reference<
[Libreoffice-bugs] [Bug 106547] [META] OOXML SmartArt bug tracker
https://bugs.documentfoundation.org/show_bug.cgi?id=106547 Bug 106547 depends on bug 95303, which changed state. Bug 95303 Summary: FILEOPEN PPTX Incorrect rendering of SmartArt from older MS Office (OK if resaved in MSO 2016) https://bugs.documentfoundation.org/show_bug.cgi?id=95303 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 95303] FILEOPEN PPTX Incorrect rendering of SmartArt from older MS Office (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=95303 Timur changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #11 from Timur --- which all makes it a good candidate for a duplicate. Moral: good triage decreased a number of bugs :) *** This bug has been marked as a duplicate of bug 48948 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108226] [META] PPTX (OOXML) bug tracker
https://bugs.documentfoundation.org/show_bug.cgi?id=108226 Bug 108226 depends on bug 95303, which changed state. Bug 95303 Summary: FILEOPEN PPTX Incorrect rendering of SmartArt from older MS Office (OK if resaved in MSO 2016) https://bugs.documentfoundation.org/show_bug.cgi?id=95303 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48948] FILEOPEN: PPTX - SmartArt from MSO 2007 and 2013 not rendered (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=48948 Timur changed: What|Removed |Added CC||beld...@gmail.com --- Comment #23 from Timur --- *** Bug 95303 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48948] FILEOPEN: PPTX - SmartArt from MSO 2007 and 2013 not rendered (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=48948 --- Comment #22 from Timur --- Created attachment 154672 --> https://bugs.documentfoundation.org/attachment.cgi?id=154672=edit sample.pptx compared MSO LO Original sample.pptx compared in MSO and LO shows that there was some improvement but still not OK in LO 6.4+. Bug is still valid. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48948] FILEOPEN: PPTX - SmartArt from MSO 2007 and 2013 not rendered (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=48948 --- Comment #21 from Timur --- Created attachment 154671 --> https://bugs.documentfoundation.org/attachment.cgi?id=154671=edit Sample pages 3-5 PPTX compared MSO LO PPTX from MSO 2016 opens fine. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48948] FILEOPEN: PPTX - SmartArt from MSO 2007 and 2013 not rendered (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=48948 --- Comment #20 from Timur --- Created attachment 154670 --> https://bugs.documentfoundation.org/attachment.cgi?id=154670=edit Sample pages 3-5 PPTX saved in MSO 2016 If PPTX resaved in MSO 2016, LO opens it fine. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48948] FILEOPEN: PPTX - SmartArt from MSO 2007 and 2013 not rendered (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=48948 Timur changed: What|Removed |Added Summary|FILEOPEN: PPTX - SmartArt |FILEOPEN: PPTX - SmartArt |from MSO 2007 and 2013 not |from MSO 2007 and 2013 not |rendered|rendered (OK if resaved in ||MSO 2016) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source
sw/source/ui/dbui/mmresultdialogs.cxx | 33 + 1 file changed, 33 insertions(+) New commits: commit 06831200607932a787430d6ea2c6860b26e4f3e1 Author: Michael Weghorn AuthorDate: Mon Sep 30 11:02:05 2019 + Commit: Caolán McNamara CommitDate: Tue Oct 1 11:00:04 2019 +0200 tdf#116234 Apply email settings just set Email configuration that is entered in the SwMailConfigDlg dialog is written to the (global) configuration, while the existing SwMailMergeConfig item 'xConfigItem' was not updated, so the newly entered values for the email server connection weren't applied for the current mail merge previously. In order to have them take effect, take over the new settings to 'xConfigItem' from the global config where those were just set. Change-Id: If0dae3ce26af797ffa728dca96f08dce3197557c Reviewed-on: https://gerrit.libreoffice.org/79847 Tested-by: Jenkins Reviewed-by: Michael Weghorn (cherry picked from commit a1573b2e2fda77b7b7d605fe36f5a28f86a3e91b) Reviewed-on: https://gerrit.libreoffice.org/79907 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index e02bdbfa7f71..8afecdea4e05 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -123,6 +123,35 @@ static OUString lcl_GetColumnValueOf(const OUString& rColumn, Reference < contai return sRet; } +/** + * Replace email server settings in rConfigItem with those set in Writer's global + * mail merge config settings. + */ +static void lcl_UpdateEmailSettingsFromGlobalConfig(SwMailMergeConfigItem& rConfigItem) +{ +// newly created SwMailMergeConfigItem is initialized with values from (global) config +SwMailMergeConfigItem aConfigItem; + +// take over email-related settings +rConfigItem.SetMailDisplayName(aConfigItem.GetMailDisplayName()); +rConfigItem.SetMailAddress(aConfigItem.GetMailAddress()); +rConfigItem.SetMailReplyTo(aConfigItem.GetMailReplyTo()); +rConfigItem.SetMailReplyTo(aConfigItem.IsMailReplyTo()); +rConfigItem.SetMailServer(aConfigItem.GetMailServer()); +rConfigItem.SetMailPort(aConfigItem.GetMailPort()); +rConfigItem.SetSecureConnection(aConfigItem.IsSecureConnection()); +// authentication settings +rConfigItem.SetAuthentication(aConfigItem.IsAuthentication()); +rConfigItem.SetSMTPAfterPOP(aConfigItem.IsSMTPAfterPOP()); +rConfigItem.SetMailUserName(aConfigItem.GetMailUserName()); +rConfigItem.SetMailPassword(aConfigItem.GetMailPassword()); +rConfigItem.SetInServerName(aConfigItem.GetInServerName()); +rConfigItem.SetInServerPort(aConfigItem.GetInServerPort()); +rConfigItem.SetInServerPOP(aConfigItem.IsInServerPOP()); +rConfigItem.SetInServerUserName(aConfigItem.GetInServerUserName()); +rConfigItem.SetInServerPassword(aConfigItem.GetInServerPassword()); +} + class SwSaveWarningBox_Impl : public SwMessageAndEditDialog { DECL_LINK( ModifyHdl, weld::Entry&, void); @@ -856,6 +885,10 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi if(nRet != RET_OK && nRet != RET_YES) return; // back to the dialog + +// SwMailConfigDlg writes mail merge email settings only to (global) config, +// so copy them to the existing config item +lcl_UpdateEmailSettingsFromGlobalConfig(*xConfigItem.get()); } //add the documents sal_uInt32 nBegin = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/tipoftheday.hrc | 80 +- cui/source/dialogs/tipofthedaydlg.cxx | 16 +- 2 files changed, 54 insertions(+), 42 deletions(-) New commits: commit 78c6b79f2a05eb92f41037fd20c6579a0a644c47 Author: Heiko Tietze AuthorDate: Wed Sep 25 17:31:00 2019 +0200 Commit: Heiko Tietze CommitDate: Tue Oct 1 10:56:36 2019 +0200 Resolves tdf#127756 - Tip of the day not localized Introduced %LANGUAGENAME token being replaced with BCP47 for pt, en, zh or ISO otherwise Change-Id: Iaa7168731e0f6a8e0dd1e906ff0ef646534d9f4b Reviewed-on: https://gerrit.libreoffice.org/79564 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc index 8977f718f945..b0e8b11f23a2 100644 --- a/cui/inc/tipoftheday.hrc +++ b/cui/inc/tipoftheday.hrc @@ -43,48 +43,48 @@ const std::tuple TIPOFTHEDAY_STRINGARRAY[] = { - { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can open and save files stored on remote servers per CMIS."), "fps/ui/remotefilesdialog/RemoteFilesDialog", ""}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/guide/cmis-remote-files.html - { NC_("RID_CUI_TIPOFTHEDAY", "Tools > AutoCorrect > AutoCorrect Options… > Replace provides a list of common substitutions. Take a look and complete with your own replacements."), "cui/ui/acoroptionspage/AutocorrectOptionsPage", "tipoftheday_w.png"}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/06040100.html - { NC_("RID_CUI_TIPOFTHEDAY", "Writer can handle styles conditionally: paragraph styles that have different properties depending on the context."), "modules/swriter/ui/conditionpage/ConditionPage", "tipoftheday_w.png"}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/05130100.html - { NC_("RID_CUI_TIPOFTHEDAY", "With File > Versions you can store multiple versions of the document in the same file. You can also open, delete, and compare previous versions."), "sfx/ui/versionsofdialog/VersionsOfDialog", ""}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/0119.html - { NC_("RID_CUI_TIPOFTHEDAY", "You can create an illustration index from object names, not only from captions."), "cui/ui/objectnamedialog/ObjectNameDialog", "tipoftheday_w.png"}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/0519.html - { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily start with a fresh user profile, or to restore a non-working %PRODUCTNAME instance, go to Help > Restart in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/profile_safe_mode.html - { NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined template or current document per Tools > Options > %PRODUCTNAME Writer > Basic Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage", "tipoftheday_w.png"}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/optionen/01040300.html - { NC_("RID_CUI_TIPOFTHEDAY", "Define texts that you often use as AutoText. You will be able to insert them by their name, shortcut or toolbar in any Writer document."), "modules/swriter/ui/autotext/AutoTextDialog", "tipoftheday_w.png"}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/guide/autotext.html - { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can automatically add a numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME Writer > AutoCaption."), "modules/swriter/ui/optcaptionpage/OptCaptionPage", "tipoftheday_w.png"}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/optionen/01041100.html - { NC_("RID_CUI_TIPOFTHEDAY", "You can sort paragraphs or table rows alphabetically or numerically per Tools > Sort."), "modules/swriter/ui/sortdialog/SortDialog", "tipoftheday_w.png"}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/0610.html - { NC_("RID_CUI_TIPOFTHEDAY", "Use Sections in %PRODUCTNAME Writer to protect part of a text, show/hide text, reuse parts from other documents, use different column layout."), "modules/swriter/ui/sectionpage/SectionPage", "tipoftheday_w.png"}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/04020100.html - { NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet > Fill Cells > Random Number to generate a random series based on various distributions."), "modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog", "tipoftheday_c.png"}, //https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/scalc/01/02140700.html - { NC_("RID_CUI_TIPOFTHEDAY", "Use Format > Conditional Formatting > Manage in Calc to find out which cells have been defined with conditional formatting."), "modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog", "tipoftheday_c.png"},
[Libreoffice-bugs] [Bug 125257] [META] Tip of the day
https://bugs.documentfoundation.org/show_bug.cgi?id=125257 Bug 125257 depends on bug 127756, which changed state. Bug 127756 Summary: Tip of the day: hyperlink to online help page ignores current localisation https://bugs.documentfoundation.org/show_bug.cgi?id=127756 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83671] Fileopen XLSX: SmartArt is not displayed
https://bugs.documentfoundation.org/show_bug.cgi?id=83671 Timur changed: What|Removed |Added Summary|SmartArt is not displayed |Fileopen XLSX: SmartArt is ||not displayed Hardware|x86-64 (AMD64) |All -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: 2 commits - canvas/source connectivity/source dtrans/source extensions/source package/qa package/source registry/source reportdesign/source sal/osl sal/qa sax/source sh
canvas/source/directx/dx_canvashelper.cxx |2 connectivity/source/drivers/ado/ADriver.cxx |2 dtrans/source/win32/dtobj/FmtFilter.cxx |8 +- extensions/source/ole/unoconversionutilities.hxx |2 package/qa/cppunit/test_package.cxx |6 - package/source/manifest/ManifestImport.cxx|3 package/source/xstor/owriteablestream.cxx |7 -- package/source/xstor/xstorage.cxx |6 - registry/source/keyimpl.cxx | 27 ++-- registry/source/regimpl.cxx |6 - reportdesign/source/filter/xml/xmlExport.cxx | 10 --- reportdesign/source/ui/inspection/GeometryHandler.cxx |3 reportdesign/source/ui/misc/UITools.cxx |6 - reportdesign/source/ui/report/propbrw.cxx |4 - sal/osl/all/log.cxx |2 sal/osl/w32/procimpl.cxx |2 sal/qa/osl/file/osl_File.cxx | 56 -- sal/qa/osl/file/test_cpy_wrt_file.cxx |6 - sax/source/expatwrap/sax_expat.cxx| 14 ++-- shell/source/win32/shlxthandler/infotips/infotips.cxx |2 vcl/win/gdi/winlayout.cxx |2 winaccessibility/source/service/msaaservice_impl.cxx |3 22 files changed, 74 insertions(+), 105 deletions(-) New commits: commit 404a3c806ffdf094c2f4a95a722765fea132fad5 Author: Stephan Bergmann AuthorDate: Tue Oct 1 09:17:15 2019 +0200 Commit: Stephan Bergmann CommitDate: Tue Oct 1 10:51:48 2019 +0200 loplugin:simplifyconstruct (clang-cl) Change-Id: I08da288a88c2bce1d4250ec77f17bd483e6bc09c Reviewed-on: https://gerrit.libreoffice.org/79911 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx index 0db0f187d595..d606aab9a621 100644 --- a/canvas/source/directx/dx_canvashelper.cxx +++ b/canvas/source/directx/dx_canvashelper.cxx @@ -147,7 +147,7 @@ namespace dxcanvas if( needOutput() ) { GraphicsSharedPtr pGraphics( mpGraphicsProvider->getGraphics() ); -Gdiplus::Color aClearColor = Gdiplus::Color(Gdiplus::ARGB(Gdiplus::Color::White)); +Gdiplus::Color aClearColor{Gdiplus::ARGB(Gdiplus::Color::White)}; ENSURE_OR_THROW( Gdiplus::Ok == pGraphics->SetCompositingMode( diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index eae5ee686996..c19df1794285 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -260,7 +260,7 @@ void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& aException = SQLException(aErr.GetDescription(),_xInterface,aErr.GetSQLState(),aErr.GetNumber(),Any()); else { -SQLException aTemp = SQLException(aErr.GetDescription(), +SQLException aTemp(aErr.GetDescription(), _xInterface,aErr.GetSQLState(),aErr.GetNumber(),makeAny(aException)); aTemp.NextException <<= aException; aException = aTemp; diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index 007d04ac08c5..2130c42ba578 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -227,13 +227,13 @@ static std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t // the case of these tags has to match what we output in our filters // both tags don't allow parameters -const std::string TAG_HTML = std::string(""); -const std::string TAG_END_HTML = std::string(""); +const std::string TAG_HTML(""); +const std::string TAG_END_HTML(""); // The body tag may have parameters so we need to search for the // closing '>' manually e.g. #92840# -const std::string TAG_BODY = std::string(" TextHtmlToHTMLFormat(Sequence const & aTextHtml) { diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 5e4a96a2ef0d..0fffbaacb695 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -1661,7 +1661,7 @@ Any UnoConversionUtilities::createOleObjectWrapper(VARIANT* pVar, const Type& spDispatch2.QueryInterface( & spUnknown.p); } -static Type VOID_TYPE= Type(); +static Type VOID_TYPE; Any ret; //If no Type is provided and pVar contains IUnknown then we return a XInterface. //If pVar contains an IDispatch then we return a XInvocation. diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index 94aef6b17d24..5a6ffdff9110 100644 ---
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source
sw/source/ui/fldui/flddok.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e8b54b172947c30df014fd7cbbfdc6c81f4b0f7 Author: Laurent BP AuthorDate: Sat Sep 28 12:49:35 2019 +0200 Commit: Caolán McNamara CommitDate: Tue Oct 1 10:51:10 2019 +0200 tdf#127840 Remove limit to Days offset Since 6.3 branch, offset in days is rectricted to 1 month, which could be too restricted. In previous versions, this limit was not effective. Change-Id: Iaddf6fe3ae5e8cd937127302917108d6f465ab81 Reviewed-on: https://gerrit.libreoffice.org/79788 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit eeac5b7a424c3a3be48b1c3583171ad97d1b19cd) Reviewed-on: https://gerrit.libreoffice.org/79896 Reviewed-by: Laurent BP diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 7cee887a6687..5868b1e58e83 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -305,7 +305,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, weld::TreeView&, void) m_xDateFT->show(); -m_xDateOffsetED->set_range(-31, 31);// one month +m_xDateOffsetED->set_range(INT_MIN, INT_MAX);// no limit if (IsFieldEdit()) m_xDateOffsetED->set_value( static_cast(GetCurField())->GetOffset() / 24 / 60); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 83671] SmartArt is not displayed
https://bugs.documentfoundation.org/show_bug.cgi?id=83671 --- Comment #9 from Timur --- Created attachment 154669 --> https://bugs.documentfoundation.org/attachment.cgi?id=154669=edit Demo compared MSO LO Not seen in LO even if resaved in MSO, so not an issue with SmartArt version. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sfx2/source sot/source starmath/source svl/qa svl/source
sfx2/source/appl/sfxhelp.cxx | 26 +++--- sfx2/source/bastyp/helper.cxx| 11 +-- sfx2/source/control/minfitem.cxx | 10 +- sfx2/source/control/msg.cxx |4 +--- sfx2/source/dialog/dinfdlg.cxx | 15 +-- sfx2/source/dialog/filedlghelper.cxx |4 ++-- sfx2/source/doc/objstor.cxx | 12 sfx2/source/doc/templatedlg.cxx |4 +--- sfx2/source/statbar/stbitem.cxx |3 +-- sot/source/sdstor/ucbstorage.cxx | 23 ++- starmath/source/cfgitem.cxx | 12 ++-- starmath/source/symbol.cxx |3 +-- svl/qa/unit/svl.cxx | 10 +- svl/source/crypto/cryptosign.cxx |4 +--- svl/source/misc/inettype.cxx |3 +-- 15 files changed, 55 insertions(+), 89 deletions(-) New commits: commit 46c2a3688c9ee7f558f75cbe856c26c4b8849b7e Author: Noel Grandin AuthorDate: Mon Sep 30 15:12:52 2019 +0200 Commit: Noel Grandin CommitDate: Tue Oct 1 10:46:15 2019 +0200 loplugin:stringadd n sfx2..svl Change-Id: Iaf1bbe37449d4e0cfa817909d56d4bffe1e5a184 Reviewed-on: https://gerrit.libreoffice.org/79893 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 73d2d2cc3619..48147b9245c5 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -621,14 +621,12 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* p // add some debug information? if ( bIsDebug ) { -sHelpText += "\n-\n"; -sHelpText += sModuleName; -sHelpText += ": "; -sHelpText += aCommandURL; +sHelpText += "\n-\n" + +sModuleName + ": " + aCommandURL; if ( !aNewHelpId.isEmpty() ) { -sHelpText += " - "; -sHelpText += OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8); +sHelpText += " - " + +OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8); } } @@ -664,14 +662,12 @@ OUString SfxHelp::GetHelpText(const OUString& aCommandURL, const weld::Widget* p // add some debug information? if ( bIsDebug ) { -sHelpText += "\n-\n"; -sHelpText += sModuleName; -sHelpText += ": "; -sHelpText += aCommandURL; +sHelpText += "\n-\n" + +sModuleName + ": " + aCommandURL; if ( !aNewHelpId.isEmpty() ) { -sHelpText += " - "; -sHelpText += OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8); +sHelpText += " - " + +OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8); } } @@ -956,9 +952,9 @@ static bool impl_showOfflineHelp( const OUString& rURL ) SvStream* pStream = aTempFile.GetStream(StreamMode::WRITE); pStream->SetStreamCharSet(RTL_TEXTENCODING_UTF8); -OUString aTempStr(SHTML1 SHTML2); -aTempStr += aHelpLink + SHTML3; -aTempStr += aHelpLink + SHTML4; +OUString aTempStr = SHTML1 SHTML2 + +aHelpLink + SHTML3 + +aHelpLink + SHTML4; pStream->WriteUnicodeOrByteText(aTempStr); diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 0976c8f80f28..fec0cd321c8b 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -93,10 +93,10 @@ std::vector SfxContentHelper::GetResultSet( const OUString& rURL ) { OUString aTitle( xRow->getString(1) ); OUString aType( xRow->getString(2) ); -OUString aRow = aTitle; -aRow += "\t"; -aRow += aType; -aRow += "\t"; +OUString aRow = aTitle + +"\t" + +aType + +"\t"; aRow += xContentAccess->queryContentIdentifierString(); aList.push_back( aRow ); } @@ -156,8 +156,7 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin { OUString aTitle( xRow->getString(1) ); bool bFolder = xRow->getBoolean(2); -OUString aRow = aTitle; -aRow += "\t"; +OUString aRow = aTitle + "\t"; aRow += xContentAccess->queryContentIdentifierString(); aRow += "\t"; aRow += bFolder ? OUString("1") : OUString("0"); diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index 179e78668b60..080723380525 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -61,11 +61,11 @@ SfxPoolItem *SfxMacroInfoItem::Clone( SfxItemPool *) const
[Libreoffice-bugs] [Bug 95303] FILEOPEN PPTX Incorrect rendering of SmartArt from older MS Office (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=95303 --- Comment #10 from Timur --- Created attachment 154668 --> https://bugs.documentfoundation.org/attachment.cgi?id=154668=edit PPTX file page 16 compared MSO LO As can be seen, file with SmartArt resaved in newer MSO opens fine in LO. So this bug is just for older SmartArt versions. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: 2 commits - loleaflet/src
loleaflet/src/control/Control.Menubar.js |5 +++-- loleaflet/src/control/Control.Toolbar.js | 31 +++ 2 files changed, 22 insertions(+), 14 deletions(-) New commits: commit 8c15584b4aff126bcde01733f469ac42cf0ce3e8 Author: Szymon Kłos AuthorDate: Thu Jul 25 13:52:50 2019 +0200 Commit: Szymon Kłos CommitDate: Tue Oct 1 10:43:48 2019 +0200 Don't show join notification for only user Change-Id: Ibc3998cb9b760a4050ddecff602b494bf515cdf8 Reviewed-on: https://gerrit.libreoffice.org/79938 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js index 207702ba5..f840eabe1 100644 --- a/loleaflet/src/control/Control.Toolbar.js +++ b/loleaflet/src/control/Control.Toolbar.js @@ -2245,19 +2245,27 @@ function escapeHtml(input) { } function onAddView(e) { + var userlistItem = w2ui['actionbar'].get('userlist'); var username = escapeHtml(e.username); - $('#tb_actionbar_item_userlist') - .w2overlay({ - class: 'loleaflet-font', - html: userJoinedPopupMessage.replace('%user', username), - style: 'padding: 5px' - }); - clearTimeout(userPopupTimeout); - userPopupTimeout = setTimeout(function() { - $('#tb_actionbar_item_userlist').w2overlay(''); + var showPopup = false; + + if (userlistItem !== null) + showPopup = $(userlistItem.html).find('#userlist_table tbody tr').length > 0; + + if (showPopup) { + $('#tb_actionbar_item_userlist') + .w2overlay({ + class: 'loleaflet-font', + html: userJoinedPopupMessage.replace('%user', username), + style: 'padding: 5px' + }); clearTimeout(userPopupTimeout); - userPopupTimeout = null; - }, 3000); + userPopupTimeout = setTimeout(function() { + $('#tb_actionbar_item_userlist').w2overlay(''); + clearTimeout(userPopupTimeout); + userPopupTimeout = null; + }, 3000); + } var color = L.LOUtil.rgbToHex(map.getViewColor(e.viewId)); if (e.viewId === map._docLayer._viewId) { @@ -2270,7 +2278,6 @@ function onAddView(e) { username += ' (' + _('Readonly') + ')'; } - var userlistItem = w2ui['actionbar'].get('userlist'); if (userlistItem !== null) { var newhtml = $(userlistItem.html).find('#userlist_table tbody').append(getUserItem(e.viewId, username, e.extraInfo, color)).parent().parent()[0].outerHTML; userlistItem.html = newhtml; commit 8ddb191d5d778962575702ff326b543f187c4ca1 Author: Szymon Kłos AuthorDate: Wed Jul 24 13:37:22 2019 +0200 Commit: Szymon Kłos CommitDate: Tue Oct 1 10:43:44 2019 +0200 Fix language selection in menubar Change-Id: I990105361decf47f0794853a5588e9f3f66e9e6e Reviewed-on: https://gerrit.libreoffice.org/79937 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 84808c65e..fc0f44f1d 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -680,7 +680,7 @@ L.Control.Menubar = L.Control.extend({ var constChecked = 'lo-menu-item-checked'; if (self._map._permission === 'edit') { if (type === 'unocommand') { // enable all depending on stored commandStates - var data, lang; + var data, lang, languageAndCode; var constUno = 'uno'; var constState = 'stateChangeHandler'; var constLanguage = '.uno:LanguageStatus'; @@ -699,7 +699,8 @@ L.Control.Menubar = L.Control.extend({ } if (unoCommand.startsWith(constLanguage)) { unoCommand = constLanguage; - lang = self._map[constState].getItemValue(unoCommand); + languageAndCode = self._map[constState].getItemValue(unoCommand); + lang = languageAndCode.split(';')[0]; data = decodeURIComponent($(aItem).data(constUno)); if (data.indexOf(lang) !== -1) {
[Libreoffice-bugs] [Bug 95303] FILEOPEN PPTX Incorrect rendering of SmartArt from older MS Office (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=95303 Timur changed: What|Removed |Added Attachment #154667|Buggy file page 16 saved in |PPTX file page 16 saved in description|MSO |MSO -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 719da31c4c73679adabaf9b3fb09e07466817bd1 Author: Szymon Kłos AuthorDate: Mon Jul 22 07:55:23 2019 +0200 Commit: Szymon Kłos CommitDate: Tue Oct 1 10:43:12 2019 +0200 Read language ISO code Change-Id: I4814dab6b87d3fac266bac85a3217aed4e24d1fd Reviewed-on: https://gerrit.libreoffice.org/79936 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 714dd177e..84808c65e 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -517,7 +517,12 @@ L.Control.Menubar = L.Control.extend({ var languages = []; e.commandValues.forEach(function(language) { - languages.push({translated: _(language), neutral: language}); + var split = language.split(';'); + language = split[0]; + var isoCode = ''; + if (split.length > 1) + isoCode = split[1]; + languages.push({translated: _(language), neutral: language, iso: isoCode}); }); languages.sort(function(a, b) { return a.translated < b.translated ? -1 : a.translated > b.translated ? 1 : 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 95303] FILEOPEN PPTX Incorrect rendering of SmartArt from older MS Office (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=95303 --- Comment #9 from Timur --- Created attachment 154667 --> https://bugs.documentfoundation.org/attachment.cgi?id=154667=edit Buggy file page 16 saved in MSO This is minimized sample, just page 16, resaved in MSO without compatibility option. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 95303] FILEOPEN PPTX Incorrect rendering of SmartArt from older MS Office (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=95303 Timur changed: What|Removed |Added Attachment #150407|0 |1 is obsolete|| --- Comment #8 from Timur --- Created attachment 154666 --> https://bugs.documentfoundation.org/attachment.cgi?id=154666=edit Buggy file compared MSO LO As can be seen in screenshot, this wasn't resolved. Regardless that some content appeared, file is still not opened correctly. So I set back to New. But, as will be shown in the next attachment, it's only because of this older SmartArt version. LO gives proper warning "Could not load all SmartArts. Saving in MS Office 2010 or later would avoid this issue." This file was saved in MS Office 14, but maybe with compatibility option. I set this bug as minor. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127635] TRACK CHANGES: Replacement problem - spaces separated from other characters when replacing a single word by several words
https://bugs.documentfoundation.org/show_bug.cgi?id=127635 Lars Jødal changed: What|Removed |Added Version|unspecified |6.2.0.1 rc --- Comment #8 from Lars Jødal --- I have done a mini-bibisection. I can reproduce the bug in the RC1 version of 6.2 (and later versions, including current and master): Version: 6.2.0.1 (x64) Build ID: 0412ee99e862f384c1106d0841a950c4cfaa9df1 CPU tråde: 4; Styresystem: Windows 10.0; Gengiver af brugergrænseflade: GL; VCL: win; Lokalisering: da-DK (da_DK); Sprog for brugergrænseflade: da-DK Calc: threaded But NOT in the beta release 6.2.0.0.beta1 (or earlier versions): Version: 6.2.0.0.beta1 (x64) Build ID: d1b41307be3f8c19fe6f1938cf056e7ff1eb1d18 CPU tråde: 4; Styresystem: Windows 10.0; Gengiver af brugergrænseflade: GL; VCL: win; Lokalisering: da-DK (da_DK); Sprog for brugergrænseflade: da-DK Calc: threaded If I understand things correctly, that should narrow it down to this list of 198 bug fixes, of which 7 contains the word "track" in their description: https://wiki.documentfoundation.org/Releases/6.2.0/RC1 Regarding reproduction of the bug, here is a repetition of the main points: - Text written without change-tracking. - Record track changes ON, show track changes OFF (both the opposite of default). - Mark one word without space and begin writing more than one word, i.e. something including a space. Is it reproducible now? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 36117] EDITING Page formatting doesn't support vertical alignment (top/center/bottom) of content (without frame/table workarounds)
https://bugs.documentfoundation.org/show_bug.cgi?id=36117 NISZ LibreOffice Team changed: What|Removed |Added CC||tele...@surfxs.nl --- Comment #54 from NISZ LibreOffice Team --- *** Bug 104466 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 104444] [META] DOCX (OOXML) table-related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=10 Bug 10 depends on bug 104466, which changed state. Bug 104466 Summary: FILEOPEN DOCX: Wrong table position (after section ending) https://bugs.documentfoundation.org/show_bug.cgi?id=104466 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 104466] FILEOPEN DOCX: Wrong table position (after section ending)
https://bugs.documentfoundation.org/show_bug.cgi?id=104466 NISZ LibreOffice Team changed: What|Removed |Added Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #3 from NISZ LibreOffice Team --- Table is at the bottom of the last page because the page format has vertical alignment set to Bottom, a feature we do not support. *** This bug has been marked as a duplicate of bug 36117 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 95303] FILEOPEN PPTX Incorrect rendering of SmartArt from older MS Office (OK if resaved in MSO 2016)
https://bugs.documentfoundation.org/show_bug.cgi?id=95303 Timur changed: What|Removed |Added Priority|medium |low Hardware|Other |All Version|Inherited From OOo |4.1.0.4 release Status|RESOLVED|NEW Summary|FILEOPEN PPTX Incorrect |FILEOPEN PPTX Incorrect |rendering of SmartArt (see |rendering of SmartArt from |comment 6) |older MS Office (OK if ||resaved in MSO 2016) Severity|normal |minor Resolution|WORKSFORME |--- -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106547] [META] OOXML SmartArt bug tracker
https://bugs.documentfoundation.org/show_bug.cgi?id=106547 Bug 106547 depends on bug 95303, which changed state. Bug 95303 Summary: FILEOPEN PPTX Incorrect rendering of SmartArt from older MS Office (OK if resaved in MSO 2016) https://bugs.documentfoundation.org/show_bug.cgi?id=95303 What|Removed |Added Status|RESOLVED|NEW Resolution|WORKSFORME |--- -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108226] [META] PPTX (OOXML) bug tracker
https://bugs.documentfoundation.org/show_bug.cgi?id=108226 Bug 108226 depends on bug 95303, which changed state. Bug 95303 Summary: FILEOPEN PPTX Incorrect rendering of SmartArt from older MS Office (OK if resaved in MSO 2016) https://bugs.documentfoundation.org/show_bug.cgi?id=95303 What|Removed |Added Status|RESOLVED|NEW Resolution|WORKSFORME |--- -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: desktop/source
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-bugs] [Bug 39722] DOCX with SmartArt Fails To Open content
https://bugs.documentfoundation.org/show_bug.cgi?id=39722 --- Comment #8 from Timur --- Created attachment 154665 --> https://bugs.documentfoundation.org/attachment.cgi?id=154665=edit Document compared MSO LO -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: desktop/source framework/source include/desktop vcl/opengl vcl/source vcl/win
desktop/source/app/app.cxx|2 +- desktop/source/app/crashreport.cxx|2 +- framework/source/services/desktop.cxx |2 +- include/desktop/crashreport.hxx |4 ++-- vcl/opengl/win/WinDeviceInfo.cxx |6 +++--- vcl/opengl/x11/X11DeviceInfo.cxx |4 ++-- vcl/source/app/salplug.cxx|2 +- vcl/source/opengl/OpenGLHelper.cxx|2 +- vcl/source/window/builder.cxx |2 +- vcl/win/app/salinst.cxx |2 +- 10 files changed, 14 insertions(+), 14 deletions(-) New commits: commit b5adb2433de4f376c253a813a632e982c7ac90c5 Author: Juergen Funk AuthorDate: Wed Sep 25 11:21:17 2019 +0200 Commit: Juergen Funk (CIB) CommitDate: Tue Oct 1 10:34:20 2019 +0200 crashreport: change addKeyValue to lower-case camel Change-Id: Ife5775d3a570da1fc2e4dd627456523705b64e1d Reviewed-on: https://gerrit.libreoffice.org/79601 Reviewed-by: Juergen Funk (CIB) Tested-by: Juergen Funk (CIB) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c38958c05dd9..13fece37a5b1 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2086,7 +2086,7 @@ void Desktop::OpenClients() #if HAVE_FEATURE_BREAKPAD CrashReporter::writeCommonInfo(); // write this information here to avoid depending on vcl in the crash reporter lib -CrashReporter::AddKeyValue("Language", Application::GetSettings().GetLanguageTag().getBcp47()); +CrashReporter::addKeyValue("Language", Application::GetSettings().GetLanguageTag().getBcp47()); #endif RequestHandler::EnableRequests(); diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx index 4a702f4420bd..23868fe70c58 100644 --- a/desktop/source/app/crashreport.cxx +++ b/desktop/source/app/crashreport.cxx @@ -52,7 +52,7 @@ void writeToStream(std::ofstream& strm, const OUString& rKey, const OUString& rV } -void CrashReporter::AddKeyValue(const OUString& rKey, const OUString& rValue) +void CrashReporter::addKeyValue(const OUString& rKey, const OUString& rValue) { osl::MutexGuard aGuard(maMutex); if (mbInit) diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 7e0052bf57a6..26895afe78dc 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -320,7 +320,7 @@ sal_Bool SAL_CALL Desktop::terminate() // see dispose() for further information. /* SAFE AREA --- */ SolarMutexClearableGuard aWriteLock; -CrashReporter::AddKeyValue("ShutDown", OUString::boolean(true)); +CrashReporter::addKeyValue("ShutDown", OUString::boolean(true)); m_bIsTerminated = true; aWriteLock.clear(); /* UNSAFE AREA - */ diff --git a/include/desktop/crashreport.hxx b/include/desktop/crashreport.hxx index 6056adbe1d28..e3486bbf0863 100644 --- a/include/desktop/crashreport.hxx +++ b/include/desktop/crashreport.hxx @@ -41,7 +41,7 @@ CRASHREPORT_DLLPUBLIC /*class*/ CrashReporter { public: -static void AddKeyValue(const OUString& rKey, const OUString& rValue); +static void addKeyValue(const OUString& rKey, const OUString& rValue); static std::string getIniFileName(); @@ -69,7 +69,7 @@ private: // everywhere we want to log something to the crash report system. #if HAVE_FEATURE_BREAKPAD #else -inline void CrashReporter::AddKeyValue(SAL_UNUSED_PARAMETER const OUString& /*rKey*/, SAL_UNUSED_PARAMETER const OUString& /*rValue*/) +inline void CrashReporter::addKeyValue(SAL_UNUSED_PARAMETER const OUString& /*rKey*/, SAL_UNUSED_PARAMETER const OUString& /*rValue*/) { } #endif diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx index 5c86d9aca22f..53801f4ed859 100644 --- a/vcl/opengl/win/WinDeviceInfo.cxx +++ b/vcl/opengl/win/WinDeviceInfo.cxx @@ -531,9 +531,9 @@ void writeToLog(SvStream& rStrm, const char* pKey, const OUString & rVal) bool WinOpenGLDeviceInfo::isDeviceBlocked() { -CrashReporter::AddKeyValue("OpenGLVendor", maAdapterVendorID); -CrashReporter::AddKeyValue("OpenGLDevice", maAdapterDeviceID); -CrashReporter::AddKeyValue("OpenGLDriver", maDriverVersion); +CrashReporter::addKeyValue("OpenGLVendor", maAdapterVendorID); +CrashReporter::addKeyValue("OpenGLDevice", maAdapterDeviceID); +CrashReporter::addKeyValue("OpenGLDriver", maDriverVersion); SAL_INFO("vcl.opengl", maDriverVersion); SAL_INFO("vcl.opengl", maDriverDate); diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx index ace010d8ed31..68d6c204a17f 100644 --- a/vcl/opengl/x11/X11DeviceInfo.cxx +++ b/vcl/opengl/x11/X11DeviceInfo.cxx @@ -283,8 +283,8 @@ bool X11OpenGLDeviceInfo::isDeviceBlocked() if (mnGLMajorVersion
[Libreoffice-bugs] [Bug 39722] DOCX with SmartArt Fails To Open content
https://bugs.documentfoundation.org/show_bug.cgi?id=39722 Timur changed: What|Removed |Added Summary|DOCX Document Fails To Open |DOCX with SmartArt Fails To ||Open content Resolution|DUPLICATE |WORKSFORME --- Comment #7 from Timur --- This is not a duplicate. It didn't work and started working, somehow in 4.1 and fine in 5.3. Also OK now in 6.4+. So it's WFM. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127898] New: "Ignore system input languages" status is ignored in Impress
https://bugs.documentfoundation.org/show_bug.cgi?id=127898 Bug ID: 127898 Summary: "Ignore system input languages" status is ignored in Impress Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: mikekagan...@hotmail.com With "Ignore system input languages" (under Options->Language Settings->Languages) unchecked, when user switches keyboard layout (e.g. between English and Russian), in Writer the language of entered text changes accordingly (e.g., on Windows; there's a known problem on Linux - bug 108151, which is unrelated). On the other hand, the change doesn't happen in Impress, and the language is kept as it was defined to the text (originating from default language for the document, or from font settings of character properties). This triggers misdetections or unoperational spelling check. Having en-US set as document default language (and having both en-US and ru-RU dictionaries installed), and typing some English word like "English ", then changing the layout to Russian and typing "русский" would produce spelling error on the latter word, considered to be English. Tested with Version: 6.3.2.2 (x64) Build ID: 98b30e735bda24bc04ab42594c85f7fd8be07b9c CPU threads: 12; OS: Windows 10.0; UI render: GL; VCL: win; Locale: ru-RU (ru_RU); UI-Language: en-US Calc: threaded (but is definitely an old problem inherited from OOo). -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127897] Missing "Language->For Selection/Paragraph" under Tools
https://bugs.documentfoundation.org/show_bug.cgi?id=127897 Mike Kaganski changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=12 ||7898 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/button.hxx|2 ++ include/vcl/layout.hxx|1 + vcl/source/control/button.cxx |7 +++ vcl/source/window/layout.cxx | 11 +++ vcl/source/window/window.cxx |4 +++- 5 files changed, 24 insertions(+), 1 deletion(-) New commits: commit 7388db1b63fb19224f80cd7930268ec924f2c93f Author: Szymon Kłos AuthorDate: Sun Sep 22 17:06:38 2019 +0200 Commit: Szymon Kłos CommitDate: Tue Oct 1 10:22:44 2019 +0200 jsdialogs: export more properties Change-Id: Iaabe560867025c30c1478d4b33357231e67b0b57 Reviewed-on: https://gerrit.libreoffice.org/79799 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index bff3c8af3de9..eaa074332cba 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -91,6 +91,8 @@ public: virtual FactoryFunction GetUITestFactory() const override; +virtual boost::property_tree::ptree DumpAsPropertyTree() override; + protected: /// Handler for click, in case we want the button to handle uno commands (.uno:Something). diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index fa8765277488..6a2d38d77a49 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -321,6 +321,7 @@ private: Size calculateRequisitionForSpacings(sal_Int32 nRowSpacing, sal_Int32 nColSpacing) const; virtual Size calculateRequisition() const override; virtual void setAllocation(const Size ) override; +virtual boost::property_tree::ptree DumpAsPropertyTree() override; public: VclGrid(vcl::Window *pParent) : VclContainer(pParent) diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index b130686d82ee..5fbf156417b9 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -578,6 +578,13 @@ FactoryFunction Button::GetUITestFactory() const return ButtonUIObject::create; } +boost::property_tree::ptree Button::DumpAsPropertyTree() +{ +boost::property_tree::ptree aTree(Control::DumpAsPropertyTree()); +aTree.put("text", GetText()); +return aTree; +} + IMPL_STATIC_LINK( Button, dispatchCommandHandler, Button*, pButton, void ) { if (pButton == nullptr) diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 49fecb7476fc..f558e6118da2 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1431,6 +1431,17 @@ void VclGrid::setAllocation(const Size& rAllocation) } } +boost::property_tree::ptree VclGrid::DumpAsPropertyTree() +{ +boost::property_tree::ptree aTree(VclContainer::DumpAsPropertyTree()); +array_type A = assembleGrid(*this); +sal_Int32 nMaxX = A.shape()[0]; +sal_Int32 nMaxY = A.shape()[1]; +aTree.put("cols", nMaxX); +aTree.put("rows", nMaxY); +return aTree; +} + bool toBool(const OUString ) { return (!rValue.isEmpty() && (rValue[0] == 't' || rValue[0] == 'T' || rValue[0] == '1')); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 4121cb565c30..7339e881b4db 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3350,13 +3350,15 @@ boost::property_tree::ptree Window::DumpAsPropertyTree() aTree.put("id", get_id()); // TODO could be missing - sort out aTree.put("type", windowTypeName(GetType())); aTree.put("text", GetText()); +aTree.put("enabled", IsEnabled()); boost::property_tree::ptree aChildren; if (vcl::Window* pChild = mpWindowImpl->mpFirstChild) { while (pChild) { -aChildren.push_back(std::make_pair("", pChild->DumpAsPropertyTree())); +if (pChild->IsVisible()) +aChildren.push_back(std::make_pair("", pChild->DumpAsPropertyTree())); pChild = pChild->mpWindowImpl->mpNext; } aTree.add_child("children", aChildren); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/lstbox.hxx |2 ++ vcl/source/control/listbox.cxx | 17 + 2 files changed, 19 insertions(+) New commits: commit 7362568a87256c367f79fd17de68cb447e79f265 Author: Szymon Kłos AuthorDate: Wed Sep 25 10:19:10 2019 +0200 Commit: Szymon Kłos CommitDate: Tue Oct 1 10:21:26 2019 +0200 jsdialogs: send listbox entries Change-Id: I00b2260e2ceaffbfbe415633ef5a35c7d147b44a Reviewed-on: https://gerrit.libreoffice.org/79804 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 4e6130a7dd18..9ecf470b7c6e 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -282,6 +282,8 @@ public: static sal_Int32 NaturalSortCompare(const OUString , const OUString ); virtual FactoryFunction GetUITestFactory() const override; + +virtual boost::property_tree::ptree DumpAsPropertyTree() override; }; class VCL_DLLPUBLIC MultiListBox : public ListBox diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 323c6c88af44..e5bc3d53c429 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -1437,6 +1437,23 @@ FactoryFunction ListBox::GetUITestFactory() const return ListBoxUIObject::create; } +boost::property_tree::ptree ListBox::DumpAsPropertyTree() +{ +boost::property_tree::ptree aTree(Control::DumpAsPropertyTree()); +boost::property_tree::ptree aEntries; + +for (int i = 0; i < GetEntryCount(); ++i) +{ +boost::property_tree::ptree aEntry; +aEntry.put("", GetEntry(i)); +aEntries.push_back(std::make_pair("", aEntry)); +} + +aTree.add_child("entries", aEntries); + +return aTree; +} + MultiListBox::MultiListBox( vcl::Window* pParent, WinBits nStyle ) : ListBox( WindowType::MULTILISTBOX ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source include/vcl vcl/source
canvas/source/opengl/ogl_canvashelper.cxx | 16 ++-- include/vcl/window.hxx|5 + vcl/source/window/window.cxx | 114 ++ 3 files changed, 127 insertions(+), 8 deletions(-) New commits: commit 75b8db7fa7344a679d3c5dbdc8c5bd4228cdbc7c Author: Jan Holesovsky AuthorDate: Sat Sep 14 21:26:21 2019 +0200 Commit: Szymon Kłos CommitDate: Tue Oct 1 10:21:08 2019 +0200 lok jsdialogs: Introduce dumping of widgets hierarchy to vcl::Window. Change-Id: Ie3267e1f888df371d281e81ead437a150aa8dc1c Reviewed-on: https://gerrit.libreoffice.org/79796 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index cbbd639741f6..e5966e3e9ebe 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -395,7 +395,7 @@ namespace oglcanvas setupGraphicsState( rAct, viewState, renderState ); rAct.maFunction = std::bind(_drawLine, - _1, _2, _3, _4, _5, + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, aStartPoint, aEndPoint); } } @@ -415,7 +415,7 @@ namespace oglcanvas // TODO(F2): subdivide whole curve rAct.maFunction = std::bind(_drawLine, -_1,_2,_3,_4,_5, +std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, geometry::RealPoint2D( aBezierSegment.Px, aBezierSegment.Py), @@ -568,10 +568,10 @@ namespace oglcanvas pGradient->getValues() ); rAct.maFunction = std::bind(_fillGradientPolyPolygon, -_1,_2,_3,_4, +std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, rValues, textures[0], -_6); +std::placeholders::_6); } else { @@ -611,14 +611,14 @@ namespace oglcanvas canvas::tools::getStdColorSpace())); rAct.maFunction = std::bind(_fillTexturedPolyPolygon, -_1,_2,_3,_4, +std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, textures[0], aSize, aARGBBytes, rtl_crc32(0, aARGBBytes.getConstArray(), aARGBBytes.getLength()), -_6); +std::placeholders::_6); } // TODO(F1): handle non-integer case } @@ -791,7 +791,7 @@ namespace oglcanvas setupGraphicsState( rAct, viewState, renderState ); rAct.maFunction = std::bind(_drawOwnBitmap, -_1,_2,_3,_4,_5, +std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, *pOwnBitmap); } else @@ -820,7 +820,7 @@ namespace oglcanvas setupGraphicsState( rAct, viewState, renderState ); rAct.maFunction = std::bind(_drawGenericBitmap, -_1,_2,_3,_4,_5, +std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, aSize, aARGBBytes, rtl_crc32(0, aARGBBytes.getConstArray(), diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
[Libreoffice-ux-advise] [Bug 127807] Make Border dialog HIG conform
https://bugs.documentfoundation.org/show_bug.cgi?id=127807 --- Comment #3 from Heiko Tietze --- (In reply to andreas_k from comment #2) > Created attachment 154664 [details] Presets and User-defined content has too much indentation. And it looks like padding is related to the shadow. -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 127807] Make Border dialog HIG conform
https://bugs.documentfoundation.org/show_bug.cgi?id=127807 --- Comment #3 from Heiko Tietze --- (In reply to andreas_k from comment #2) > Created attachment 154664 [details] Presets and User-defined content has too much indentation. And it looks like padding is related to the shadow. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127319] AutoCheck/Spellcheck treats superscripted portion as part of the non-superscripted word (but MS Word doesn't)
https://bugs.documentfoundation.org/show_bug.cgi?id=127319 --- Comment #15 from Justin L --- (In reply to Justin L from comment #10) > I imagine that treating superscripting separately would be > tricky and CPU intensive. Perhaps not super CPU intensive, since it seems like there already is a loop looking for hints. For a mildly similar search adjustment, see fixed bug 101936 sw: ignore comment anchors during search -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 127319] AutoCheck/Spellcheck treats superscripted portion as part of the non-superscripted word (but MS Word doesn't)
https://bugs.documentfoundation.org/show_bug.cgi?id=127319 --- Comment #15 from Justin L --- (In reply to Justin L from comment #10) > I imagine that treating superscripting separately would be > tricky and CPU intensive. Perhaps not super CPU intensive, since it seems like there already is a loop looking for hints. For a mildly similar search adjustment, see fixed bug 101936 sw: ignore comment anchors during search -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 61912] SPELL: System Input Language Completely Ignored
https://bugs.documentfoundation.org/show_bug.cgi?id=61912 Mike Kaganski changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||8151 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108151] System input language is always ignored on Linux
https://bugs.documentfoundation.org/show_bug.cgi?id=108151 Mike Kaganski changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=61 ||912 --- Comment #6 from Mike Kaganski --- Closing bug 61912 like that was, of course, not a correct thing (although the problem could have no solution as mentioned in comment 3). The interesting thing is that the person closing that bug is familiar with multiple keyboard layouts. I guess that what could be useful here is if users who know of an open-source programs correctly detecting input language to post examples here. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127856] Pushing More... in language selection in Calc Status bar leads to Language settings instead of cell properties
https://bugs.documentfoundation.org/show_bug.cgi?id=127856 Heiko Tietze changed: What|Removed |Added CC||er...@redhat.com --- Comment #2 from Heiko Tietze --- Looks like cell language is not the same as text language since I can set both independently. Eike, could you please add some wisdom here? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 127856] Pushing More... in language selection in Calc Status bar leads to Language settings instead of cell properties
https://bugs.documentfoundation.org/show_bug.cgi?id=127856 Heiko Tietze changed: What|Removed |Added CC||er...@redhat.com --- Comment #2 from Heiko Tietze --- Looks like cell language is not the same as text language since I can set both independently. Eike, could you please add some wisdom here? -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-commits] online.git: 2 commits - loleaflet/html loleaflet/src wsd/ClientSession.cpp
loleaflet/html/loleaflet.html.m4 |7 + loleaflet/src/core/Socket.js | 185 ++ loleaflet/src/layer/tile/GridLayer.js |6 - loleaflet/src/main.js |2 wsd/ClientSession.cpp | 21 ++- 5 files changed, 150 insertions(+), 71 deletions(-) New commits: commit 518eaf866eee8192ce56af3a0d2dff6223fb80cf Author: Szymon Kłos AuthorDate: Wed Jul 17 13:19:32 2019 +0200 Commit: Szymon Kłos CommitDate: Tue Oct 1 10:13:21 2019 +0200 Delay fit-to-screen on start for impress We need to wait to have valid size of the map. Bug was visible in NC app but not a browser. Change-Id: Ifb79ea84636de61dd92e4a9ae34c6f6caf5693c2 Reviewed-on: https://gerrit.libreoffice.org/79921 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js index 2095a9759..1ea305adb 100644 --- a/loleaflet/src/core/Socket.js +++ b/loleaflet/src/core/Socket.js @@ -799,11 +799,27 @@ L.Socket = L.Class.extend({ } }, + _delayedFitToScreen: function(height) { + if (this._map.getSize().y > 0) { + // If we have a presentation document and the zoom level has not been set + // in the options, resize the document so that it fits the viewing area + var verticalTiles = this._map.getSize().y / 256; + this._map._docLayer._tileWidthTwips = Math.round(height / verticalTiles); + this._map._docLayer._tileHeightTwips = Math.round(height / verticalTiles); + this._map._docLayer._updateTileTwips(); + } else { + var that = this; + setTimeout(function() { + that._delayedFitToScreen(height); + }, 100); + } + }, + _onStatusMsg: function(textMsg, command) { + var that = this; if (!this._isReady()) { // Retry in a bit. - var that = this; setTimeout(function() { that._onStatusMsg(textMsg, command); }, 100); @@ -843,12 +859,18 @@ L.Socket = L.Class.extend({ else { if (command.type === 'presentation' && this._map.options.defaultZoom === this._map.options.zoom) { - // If we have a presentation document and the zoom level has not been set - // in the options, resize the document so that it fits the viewing area. - // FIXME: Should this 256 be window.tileSize? Unclear to me. - var verticalTiles = this._map.getSize().y / 256; - tileWidthTwips = Math.round(command.height / verticalTiles); - tileHeightTwips = Math.round(command.height / verticalTiles); + if (this._map.getSize().y > 0) { + // If we have a presentation document and the zoom level has not been set + // in the options, resize the document so that it fits the viewing area. + // FIXME: Should this 256 be window.tileSize? Unclear to me. + var verticalTiles = this._map.getSize().y / 256; + tileWidthTwips = Math.round(command.height / verticalTiles); + tileHeightTwips = Math.round(command.height / verticalTiles); + } else { + setTimeout(function() { + that._delayedFitToScreen(command.height); + }, 100); + } } docLayer = new L.ImpressTileLayer('', { permission: this._map.options.permission, commit a93d8f1e1cadd6a80248f8e6cb9a8eae80f0b657 Author: Ashod Nakashian AuthorDate: Wed Jul 3 00:29:43 2019 -0400 Commit: Szymon Kłos CommitDate: Tue Oct 1 10:13:05 2019 +0200 leaflet: check that we are ready to render On some mobile devices we can start rendering when we don't fully have all our variables initialized. The result is that we send to WSD 'NaN' and 'Infinity' coordinates and other values. To avoid this, we try to check that we have downloaded and
[Libreoffice-bugs] [Bug 127807] Make Border dialog HIG conform
https://bugs.documentfoundation.org/show_bug.cgi?id=127807 --- Comment #2 from andreas_k --- Created attachment 154664 --> https://bugs.documentfoundation.org/attachment.cgi?id=154664=edit border dialog 02 thanks for the feedback heiko. what do you think? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127856] Pushing More... in language selection in Calc Status bar leads to Language settings instead of cell properties
https://bugs.documentfoundation.org/show_bug.cgi?id=127856 Heiko Tietze changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEW -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 127807] Make Border dialog HIG conform
https://bugs.documentfoundation.org/show_bug.cgi?id=127807 --- Comment #2 from andreas_k --- Created attachment 154664 --> https://bugs.documentfoundation.org/attachment.cgi?id=154664=edit border dialog 02 thanks for the feedback heiko. what do you think? -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-ux-advise] [Bug 127856] Pushing More... in language selection in Calc Status bar leads to Language settings instead of cell properties
https://bugs.documentfoundation.org/show_bug.cgi?id=127856 Heiko Tietze changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEW -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 127896] "Exchange database" leads to crash (non-gtk3)
https://bugs.documentfoundation.org/show_bug.cgi?id=127896 Caolán McNamara changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Ever confirmed|0 |1 Assignee|libreoffice-b...@lists.free |caol...@redhat.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 47896] Sort languages by relevance
https://bugs.documentfoundation.org/show_bug.cgi?id=47896 Heiko Tietze changed: What|Removed |Added CC|libreoffice-ux-advise@lists |heiko.tietze@documentfounda |.freedesktop.org|tion.org Summary|Too many languages in |Sort languages by relevance |Format/Language | Keywords|needsUXEval | --- Comment #20 from Heiko Tietze --- Elaborating on comment 6: Yes, to move _favorites_ on top of the list (we should do this for all lengthy lists). But it must not look like a complex algorithm. So while the installed localization is obvious we should focus first on the "most relevant languages" and sneak some more into this list if the document or dictionary is something else. The top 10 access to libreoffice.org this year by browser language are: English, Portuguese, German, French, Spanish, Italian, Russian, Polish, Japanese, Chinese, which covers >95% (followed by Dutch, Czech, Turkish, Korean, Swedish, Finnish, Hungarian, Greek, Thai, Danish, Indonesian). Not to forget, the currently selected language should also be on top. -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 47896] Sort languages by relevance
https://bugs.documentfoundation.org/show_bug.cgi?id=47896 Heiko Tietze changed: What|Removed |Added CC|libreoffice-ux-advise@lists |heiko.tietze@documentfounda |.freedesktop.org|tion.org Summary|Too many languages in |Sort languages by relevance |Format/Language | Keywords|needsUXEval | --- Comment #20 from Heiko Tietze --- Elaborating on comment 6: Yes, to move _favorites_ on top of the list (we should do this for all lengthy lists). But it must not look like a complex algorithm. So while the installed localization is obvious we should focus first on the "most relevant languages" and sneak some more into this list if the document or dictionary is something else. The top 10 access to libreoffice.org this year by browser language are: English, Portuguese, German, French, Spanish, Italian, Russian, Polish, Japanese, Chinese, which covers >95% (followed by Dutch, Czech, Turkish, Korean, Swedish, Finnish, Hungarian, Greek, Thai, Danish, Indonesian). Not to forget, the currently selected language should also be on top. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: desktop/qa desktop/source include/LibreOfficeKit include/sfx2 sfx2/source
desktop/qa/desktop_lib/test_desktop_lib.cxx |3 + desktop/source/lib/init.cxx | 44 include/LibreOfficeKit/LibreOfficeKit.h |6 +++ include/LibreOfficeKit/LibreOfficeKit.hxx | 13 include/sfx2/lokhelper.hxx |2 - sfx2/source/view/lokhelper.cxx |4 +- 6 files changed, 68 insertions(+), 4 deletions(-) New commits: commit 9590e8d0a2194b36d5a025a21dc2e71f37f4f54b Author: Marco Cecchetti AuthorDate: Wed Jul 10 10:32:07 2019 +0200 Commit: Michael Meeks CommitDate: Tue Oct 1 10:01:57 2019 +0200 lok: handling a single msg for deleting multiple characters also includes: lok: fixing testABI failure Change-Id: I4df662a0df49a864c4b307efdd963b857bb77792 lok: missing removeTextContext implementation for Document class Change-Id: I884ad07f330afc19dfe759c08c8a17bdb4f9dcf3 Change-Id: I045d89f9fa478f37fc2917e159e044eee7e1ab31 Reviewed-on: https://gerrit.libreoffice.org/79879 Tested-by: Jenkins Reviewed-by: Michael Meeks diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 93e81b595f65..eb3c713560ee 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2782,10 +2782,11 @@ void DesktopLOKTest::testABI() CPPUNIT_ASSERT_EQUAL(documentClassOffset(52), offsetof(struct _LibreOfficeKitDocumentClass, getClipboard)); CPPUNIT_ASSERT_EQUAL(documentClassOffset(53), offsetof(struct _LibreOfficeKitDocumentClass, setClipboard)); CPPUNIT_ASSERT_EQUAL(documentClassOffset(54), offsetof(struct _LibreOfficeKitDocumentClass, getSelectionType)); +CPPUNIT_ASSERT_EQUAL(documentClassOffset(55), offsetof(struct _LibreOfficeKitDocumentClass, removeTextContext)); // Extending is fine, update this, and add new assert for the offsetof the // new method -CPPUNIT_ASSERT_EQUAL(documentClassOffset(55), sizeof(struct _LibreOfficeKitDocumentClass)); +CPPUNIT_ASSERT_EQUAL(documentClassOffset(56), sizeof(struct _LibreOfficeKitDocumentClass)); } CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 2af356e0bb7b..3b8e7eb128c7 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -764,6 +764,11 @@ static void doc_postWindowExtTextInputEvent(LibreOfficeKitDocument* pThis, unsigned nWindowId, int nType, const char* pText); +static void doc_removeTextContext(LibreOfficeKitDocument* pThis, + unsigned nLOKWindowId, + int nCharBefore, + int nCharAfter); + static void doc_postWindowKeyEvent(LibreOfficeKitDocument* pThis, unsigned nLOKWindowId, int nType, @@ -933,6 +938,7 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference registerCallback = doc_registerCallback; m_pDocumentClass->postKeyEvent = doc_postKeyEvent; m_pDocumentClass->postWindowExtTextInputEvent = doc_postWindowExtTextInputEvent; +m_pDocumentClass->removeTextContext = doc_removeTextContext; m_pDocumentClass->postWindowKeyEvent = doc_postWindowKeyEvent; m_pDocumentClass->postMouseEvent = doc_postMouseEvent; m_pDocumentClass->postWindowMouseEvent = doc_postWindowMouseEvent; @@ -3053,6 +3059,44 @@ static void doc_postWindowExtTextInputEvent(LibreOfficeKitDocument* pThis, unsig } } +static void doc_removeTextContext(LibreOfficeKitDocument* pThis, unsigned nLOKWindowId, int nCharBefore, int nCharAfter) +{ +SolarMutexGuard aGuard; +VclPtr pWindow; +if (nLOKWindowId == 0) +{ +ITiledRenderable* pDoc = getTiledRenderable(pThis); +if (!pDoc) +{ +gImpl->maLastExceptionMsg = "Document doesn't support tiled rendering"; +return; +} +pWindow = pDoc->getDocWindow(); +} +else +{ +pWindow = vcl::Window::FindLOKWindow(nLOKWindowId); +} + +if (!pWindow) +{ +gImpl->maLastExceptionMsg = "No window found for window id: " + OUString::number(nLOKWindowId); +return; +} + +if (nCharBefore > 0) +{ +// backspace +SfxLokHelper::postKeyEventAsync(pWindow, LOK_EXT_TEXTINPUT, 8, 1283, nCharBefore - 1); +} + +if (nCharAfter > 0) +{ +// delete (forward) +SfxLokHelper::postKeyEventAsync(pWindow, LOK_EXT_TEXTINPUT, 46, 1286, nCharAfter - 1); +} +} + static void doc_postWindowKeyEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nLOKWindowId, int nType, int nCharCode, int nKeyCode) { comphelper::ProfileZone
[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - include/oox offapi/com offapi/UnoApi_offapi.mk oox/source oox/util
include/oox/crypto/AgileEngine.hxx | 28 ++-- include/oox/crypto/CryptoEngine.hxx | 68 -- include/oox/crypto/DocumentDecryption.hxx |5 include/oox/crypto/DocumentEncryption.hxx |4 include/oox/crypto/IRMEngine.hxx| 42 ++ include/oox/crypto/Standard2007Engine.hxx | 30 ++-- offapi/UnoApi_offapi.mk |1 offapi/com/sun/star/packages/XPackageEncryption.idl | 84 oox/source/crypto/AgileEngine.cxx | 63 ++--- oox/source/crypto/DocumentDecryption.cxx| 72 +- oox/source/crypto/DocumentEncryption.cxx| 53 --- oox/source/crypto/IRMEngine.cxx | 133 oox/source/crypto/Standard2007Engine.cxx| 61 ++--- oox/util/oox.component | 16 ++ 14 files changed, 391 insertions(+), 269 deletions(-) New commits: commit 4d0e087cb05e145146b73f6691caa4c8e4c8bb7b Author: Vasily Melenchuk AuthorDate: Fri Sep 27 11:56:00 2019 +0300 Commit: Vasily Melenchuk CommitDate: Tue Oct 1 10:56:14 2019 +0300 msdoc crypto: move crypto engines to service New interface XPackageEncryption was created. All existing crypto engines are refactored to be implmentations of this interface. Change-Id: Id063aca1474f76a926a2e47eecd4c12ebe79650f diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx index 60d19fed11db..3a8b49e21de8 100644 --- a/include/oox/crypto/AgileEngine.hxx +++ b/include/oox/crypto/AgileEngine.hxx @@ -15,9 +15,9 @@ #include #include -#include #include #include +#include namespace oox { class BinaryXInputStream; @@ -74,7 +74,7 @@ enum class AgileEncryptionPreset AES_256_SHA512, }; -class OOX_DLLPUBLIC AgileEngine : public CryptoEngine +class OOX_DLLPUBLIC AgileEngine : public cppu::WeakImplHelper { private: std::vector mKey; @@ -82,7 +82,7 @@ private: AgileEncryptionPreset meEncryptionPreset; css::uno::Reference< css::uno::XComponentContext > mxContext; -css::uno::Reference getStream(css::uno::Sequence & rStreams, const OUString sStreamName); +css::uno::Reference getStream(const css::uno::Sequence & rStreams, const OUString sStreamName); void calculateHashFinal(const OUString& rPassword, std::vector& aHashFinal); @@ -131,24 +131,24 @@ public: // Decryption -bool generateEncryptionKey(OUString const & rPassword) override; -bool readEncryptionInfo(css::uno::Sequence aStreams) override; -bool decrypt(BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream) override; +sal_Bool generateEncryptionKey(const OUString & rPassword) override; +sal_Bool readEncryptionInfo(const css::uno::Sequence& aStreams) override; +sal_Bool decrypt(const css::uno::Reference& rxInputStream, + css::uno::Reference& rxOutputStream) override; -bool checkDataIntegrity() override; + +sal_Bool checkDataIntegrity() override; // Encryption -void writeEncryptionInfo(oox::ole::OleStorage& rOleStorage) override; +css::uno::Sequence writeEncryptionInfo() override; -void encrypt(css::uno::Reference& rxInputStream, - css::uno::Reference& rxOutputStream, - sal_uInt32 nSize) override; +void encrypt(const css::uno::Reference& rxInputStream, + css::uno::Reference& rxOutputStream) override; -bool setupEncryption(css::uno::Sequence& rMediaEncData) override; +sal_Bool setupEncryption(const css::uno::Sequence& rMediaEncData) override; -virtual void createEncryptionData(comphelper::SequenceAsHashMap & aEncryptionData, const OUString rPassword) override; +css::uno::Sequence createEncryptionData(const OUString& rPassword) override; }; } // namespace core diff --git a/include/oox/crypto/CryptoEngine.hxx b/include/oox/crypto/CryptoEngine.hxx deleted file mode 100644 index f985f2d7fb45.. --- a/include/oox/crypto/CryptoEngine.hxx +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - */ - -#ifndef INCLUDED_OOX_CRYPTO_CRYPTOENGINE_HXX -#define INCLUDED_OOX_CRYPTO_CRYPTOENGINE_HXX - -#include - -#include -#include - -#include -#include -#include - -namespace oox { -class BinaryXInputStream; -class BinaryXOutputStream; -} - -namespace oox { -namespace core { - -class CryptoEngine -{ -public: -CryptoEngine() -{} - -virtual ~CryptoEngine() -{} - -// Decryption -virtual bool
[Libreoffice-bugs] [Bug 96840] FILEOPEN: not open file in format .DOC with images (.DOCX page counting)
https://bugs.documentfoundation.org/show_bug.cgi?id=96840 --- Comment #10 from Timur --- Created attachment 154663 --> https://bugs.documentfoundation.org/attachment.cgi?id=154663=edit File DOCX minimized in MSO Let me also add DOCX pages 5-7 that has page counting on fileopen. There are other bugs for that so no need to open separately, let's wait for this one and watch others. I added one of them to See Also. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sc/source
sc/source/ui/condformat/condformatdlgentry.cxx | 28 + 1 file changed, 28 insertions(+) New commits: commit 0ff8140676877f7a37ceb14d9ba797d6e2a18cf6 Author: Caolán McNamara AuthorDate: Mon Sep 30 16:27:24 2019 +0100 Commit: Caolán McNamara CommitDate: Tue Oct 1 09:55:16 2019 +0200 Resolves: tdf#126781 force comboboxes to take 1/3 avail space and not their natural size as this dialog is fixed width so we need to make do. This brings the right border of the entry inside the scrolled window area as expected Change-Id: I60d6078436cbfacbbfda55838e4b0584da4bab1e Reviewed-on: https://gerrit.libreoffice.org/79872 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 229b4a05e931..f14bcd066784 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -41,6 +41,10 @@ #include +// set the widget width to something to override their auto-width calc and +// force them to take a 1/3 of the available space +#define CommonWidgetWidth 10 + ScCondFrmtEntry::ScCondFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos) : mpParent(pParent) , mxBuilder(Application::CreateBuilder(pParent->GetContainer(), (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())?OUString("modules/scalc/ui/conditionalentrymobile.ui"):OUString("modules/scalc/ui/conditionalentry.ui" @@ -54,6 +58,7 @@ ScCondFrmtEntry::ScCondFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, co , mpDoc(pDoc) , maPos(rPos) { +mxLbType->set_size_request(CommonWidgetWidth, -1); mxLbType->connect_changed(LINK(pParent, ScCondFormatList, TypeListHdl)); mxGrid->connect_mouse_press(LINK(this, ScCondFrmtEntry, EntrySelectHdl)); maClickHdl = LINK( pParent, ScCondFormatList, EntrySelectHdl ); @@ -154,6 +159,8 @@ ScConditionFrmtEntry::ScConditionFrmtEntry(ScCondFormatList* pParent, ScDocument , mxWdPreview(new weld::CustomWeld(*mxBuilder, "preview", maWdPreview)) , mbIsInStyleCreate(false) { +mxLbCondType->set_size_request(CommonWidgetWidth, -1); +mxLbType->set_size_request(CommonWidgetWidth, -1); mxWdPreview->set_size_request(-1, mxLbStyle->get_preferred_size().Height()); mxLbType->set_active(1); @@ -493,6 +500,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry(ScCondFormatList* pParent, ScDocument* pD , mxWdPreview(new weld::CustomWeld(*mxBuilder, "preview", maWdPreview)) , mxEdFormula(new formula::RefEdit(mxBuilder->weld_entry("formula"))) { +mxLbType->set_size_request(CommonWidgetWidth, -1); mxWdPreview->set_size_request(-1, mxLbStyle->get_preferred_size().Height()); Init(pDialogParent); @@ -722,6 +730,10 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry(ScCondFormatList* pParent, ScDocu , mxFtMin(mxBuilder->weld_label("Label_minimum")) , mxFtMax(mxBuilder->weld_label("Label_maximum")) { +mxLbColorFormat->set_size_request(CommonWidgetWidth, -1); +mxLbEntryTypeMin->set_size_request(CommonWidgetWidth, -1); +mxLbEntryTypeMax->set_size_request(CommonWidgetWidth, -1); + mxFtMin->show(); mxFtMax->show(); @@ -854,6 +866,10 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry(ScCondFormatList* pParent, ScDocu , mxFtMin(mxBuilder->weld_label("Label_minimum")) , mxFtMax(mxBuilder->weld_label("Label_maximum")) { +mxLbColorFormat->set_size_request(CommonWidgetWidth, -1); +mxLbEntryTypeMin->set_size_request(CommonWidgetWidth, -1); +mxLbEntryTypeMiddle->set_size_request(CommonWidgetWidth, -1); +mxLbEntryTypeMax->set_size_request(CommonWidgetWidth, -1); mxFtMin->show(); mxFtMax->show(); @@ -1056,6 +1072,10 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry(ScCondFormatList* pParent, ScDocument* pD , mxFtMin(mxBuilder->weld_label("Label_minimum")) , mxFtMax(mxBuilder->weld_label("Label_maximum")) { +mxLbColorFormat->set_size_request(CommonWidgetWidth, -1); +mxLbDataBarMinType->set_size_request(CommonWidgetWidth, -1); +mxLbDataBarMaxType->set_size_request(CommonWidgetWidth, -1); + // "min" selector doesn't need "max" entry, and vice versa removeType(*mxLbDataBarMinType, COLORSCALE_MAX); removeType(*mxLbDataBarMaxType, COLORSCALE_MIN); @@ -1190,6 +1210,9 @@ ScDateFrmtEntry::ScDateFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, co , mxWdPreview(new weld::CustomWeld(*mxBuilder, "preview", maWdPreview)) , mbIsInStyleCreate(false) { +mxLbDateEntry->set_size_request(CommonWidgetWidth, -1); +mxLbStyle->set_size_request(CommonWidgetWidth, -1); + mxWdPreview->set_size_request(mxLbStyle->get_preferred_size().Height(), -1); Init(); @@ -1309,6 +1332,8 @@ ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry(weld::Container* pParent, ScIconS ,
[Libreoffice-commits] core.git: 2 commits - basctl/uiconfig cui/uiconfig dbaccess/uiconfig sc/uiconfig sd/uiconfig sfx2/uiconfig starmath/uiconfig svx/source svx/uiconfig sw/uiconfig vcl/qa vcl/uiconf
basctl/uiconfig/basicide/ui/basicmacrodialog.ui|1 basctl/uiconfig/basicide/ui/defaultlanguage.ui |1 cui/uiconfig/ui/blackorwhitelistentrydialog.ui |6 cui/uiconfig/ui/colorpickerdialog.ui | 19 + cui/uiconfig/ui/editdictionarydialog.ui|2 cui/uiconfig/ui/hangulhanjaadddialog.ui|9 cui/uiconfig/ui/hangulhanjaconversiondialog.ui | 19 - cui/uiconfig/ui/hangulhanjaeditdictdialog.ui |5 cui/uiconfig/ui/insertfloatingframe.ui | 12 cui/uiconfig/ui/insertoleobject.ui |9 cui/uiconfig/ui/javastartparametersdialog.ui |1 cui/uiconfig/ui/specialcharacters.ui | 24 - dbaccess/uiconfig/ui/collectionviewdialog.ui |6 sc/uiconfig/scalc/ui/conditionalformatdialog.ui|1 sc/uiconfig/scalc/ui/dapiservicedialog.ui |4 sc/uiconfig/scalc/ui/externaldata.ui | 10 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui | 19 - sc/uiconfig/scalc/ui/selectdatasource.ui |9 sc/uiconfig/scalc/ui/textimportcsv.ui |6 sc/uiconfig/scalc/ui/xmlsourcedialog.ui|1 sd/uiconfig/simpress/ui/definecustomslideshow.ui |9 sd/uiconfig/simpress/ui/dlgfield.ui|1 sfx2/uiconfig/ui/bookmarkdialog.ui |9 sfx2/uiconfig/ui/linkeditdialog.ui |3 sfx2/uiconfig/ui/templatecategorydlg.ui|6 starmath/uiconfig/smath/ui/symdefinedialog.ui | 12 svx/source/dialog/SafeModeDialog.cxx | 304 - svx/source/dialog/SafeModeDialog.hxx | 81 ++--- svx/source/dialog/SafeModeUI.cxx |6 svx/uiconfig/ui/asianphoneticguidedialog.ui| 10 svx/uiconfig/ui/chinesedictionary.ui | 64 ++-- svx/uiconfig/ui/classificationdialog.ui| 22 - svx/uiconfig/ui/docrecoverybrokendialog.ui |1 svx/uiconfig/ui/safemodedialog.ui | 11 sw/uiconfig/swriter/ui/addressblockdialog.ui |1 sw/uiconfig/swriter/ui/autotext.ui |2 sw/uiconfig/swriter/ui/captionoptions.ui |9 sw/uiconfig/swriter/ui/ccdialog.ui | 10 sw/uiconfig/swriter/ui/converttexttable.ui | 14 sw/uiconfig/swriter/ui/createaddresslist.ui|2 sw/uiconfig/swriter/ui/dropdownformfielddialog.ui |7 sw/uiconfig/swriter/ui/editcategories.ui |1 sw/uiconfig/swriter/ui/mmmailbody.ui |2 sw/uiconfig/swriter/ui/mmresultemaildialog.ui |4 sw/uiconfig/swriter/ui/renameobjectdialog.ui |9 sw/uiconfig/swriter/ui/savelabeldialog.ui | 10 sw/uiconfig/swriter/ui/selectblockdialog.ui|1 vcl/qa/cppunit/builder/demo.ui | 236 +--- vcl/uiconfig/ui/printdialog.ui |6 xmlsecurity/uiconfig/ui/selectcertificatedialog.ui | 12 50 files changed, 503 insertions(+), 526 deletions(-) New commits: commit eac301701e4f24a407c2b9df69e925e3d9cb4733 Author: Caolán McNamara AuthorDate: Mon Sep 30 13:26:41 2019 +0100 Commit: Caolán McNamara CommitDate: Tue Oct 1 09:53:50 2019 +0200 add activates_default to GtkEntries in dialogs activates-default of True means pressing return activates the default button of the action area, which is typically what vcl Edit did by default. Change-Id: I60bc1634b04a486af86526d887d0ada961b08076 Reviewed-on: https://gerrit.libreoffice.org/79860 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui index b01d88ff8b9e..e806ad30eeaa 100644 --- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui +++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui @@ -301,6 +301,7 @@ True True True +True diff --git a/basctl/uiconfig/basicide/ui/defaultlanguage.ui b/basctl/uiconfig/basicide/ui/defaultlanguage.ui index 9d6f90420613..3904d8afc59e 100644 --- a/basctl/uiconfig/basicide/ui/defaultlanguage.ui +++ b/basctl/uiconfig/basicide/ui/defaultlanguage.ui @@ -233,6 +233,7 @@ False +True diff --git a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui index 3336f28a835f..bcb663daeb27 100644 --- a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui +++ b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui @@ -1,5 +1,5 @@ - + @@ -137,6 +137,7 @@
[Libreoffice-bugs] [Bug 96840] FILEOPEN: not open file in format .DOC with images (.DOCX page counting)
https://bugs.documentfoundation.org/show_bug.cgi?id=96840 --- Comment #9 from Timur --- Created attachment 154662 --> https://bugs.documentfoundation.org/attachment.cgi?id=154662=edit File DOC minimized in MSO Original DOC has 30 pages. It's always better to have minimized sample. Here is DOC created in MSO, just pages 5-7 with images, without footer, still no open. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/tabpages/autocdlg.cxx |8 cui/uiconfig/ui/acorreplacepage.ui | 11 ++- 2 files changed, 10 insertions(+), 9 deletions(-) New commits: commit f6a2b24ce17293043f7ddbed0bc218264be6487d Author: Caolán McNamara AuthorDate: Mon Sep 30 14:18:29 2019 +0100 Commit: Caolán McNamara CommitDate: Tue Oct 1 09:53:15 2019 +0200 autocorrect dialog width grows on change of new to replace the sizegroup isn't working as I'd expect, so just make the replace button visible, get the preferred width of the buttonbox, lock that down then hide the place button and the container will stay at the max width that will be wanted Change-Id: Idfe632aa5af404abb92fc8f7267f0dda5cdbe295 Reviewed-on: https://gerrit.libreoffice.org/79862 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index b9a74380d294..d95471f14b0f 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -669,9 +669,17 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage(weld::Container* pPage, weld::Dia , m_xNewReplacePB(m_xBuilder->weld_button("new")) , m_xReplacePB(m_xBuilder->weld_button("replace")) , m_xDeleteReplacePB(m_xBuilder->weld_button("delete")) +, m_xButtonBox(m_xBuilder->weld_container("buttonbox")) { sNew = m_xNewReplacePB->get_label(); sModify = m_xReplacePB->get_label(); + +// lock down the width of the button box to its max +// desired width +auto nMaxWidth = m_xButtonBox->get_preferred_size().Width(); +m_xButtonBox->set_size_request(nMaxWidth, -1); +m_xReplacePB->hide(); + // tdf#125348 set some small but fixed initial width size, final width will // depend on the size of the entry boxes m_xReplaceTLB->set_size_request(42, m_xReplaceTLB->get_height_rows(10)); diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui index 36808eb4ec4d..b099bf079991 100644 --- a/cui/uiconfig/ui/acorreplacepage.ui +++ b/cui/uiconfig/ui/acorreplacepage.ui @@ -21,12 +21,11 @@ 6 12 - + True False vertical 12 -start gtk-new @@ -45,6 +44,7 @@ _Replace +True True True True @@ -233,11 +233,4 @@ - - - - - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 96840] FILEOPEN: not open file in format .DOC with images (.DOCX page counting)
https://bugs.documentfoundation.org/show_bug.cgi?id=96840 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=38 ||575 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 38575] 2-page DOC or DOCX with image anchored to header yields page counting and block Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=38575 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=96 ||840 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 96840] FILEOPEN: not open file in format .DOC with images (.DOCX page counting)
https://bugs.documentfoundation.org/show_bug.cgi?id=96840 Timur changed: What|Removed |Added Priority|medium |high Summary|FILEOPEN: not open file in |FILEOPEN: not open file in |fomat .doc |format .DOC with images ||(.DOCX page counting) Severity|normal |major OS|Windows (All) |All -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp
wsd/DocumentBroker.cpp |6 ++ wsd/LOOLWSD.cpp|2 +- 2 files changed, 3 insertions(+), 5 deletions(-) New commits: commit 14fe58adb48865be947c78c04df4b3c4a163f08e Author: Tor Lillqvist AuthorDate: Mon Sep 30 23:59:53 2019 +0300 Commit: Tor Lillqvist CommitDate: Tue Oct 1 09:50:51 2019 +0200 tdf#125575: Don't be so eager to clean up too early in the MOBILEAPP case It's not needed in an app, and causes misbehaviour when the lifecycle of DocumentBroker objects gets screwed up. Many of the desperate attempts to "clean up" here and there in the code are likely relevant only in web-based Online to catch weird error situations. In an app our objects hopefully have a much simpler lifecycle. Change-Id: I788171cd1ca114ecaca276a7f24185ff67b984c7 Reviewed-on: https://gerrit.libreoffice.org/79902 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 1b09c2f07..8b0011fcd 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -340,11 +340,9 @@ void DocumentBroker::pollThread() last30SecCheckTime = std::chrono::steady_clock::now(); } -if (false) -; #if !MOBILEAPP // Remove idle documents after 1 hour. -else if ((isLoaded() && getIdleTimeSecs() >= IdleDocTimeoutSecs)) +if ((isLoaded() && getIdleTimeSecs() >= IdleDocTimeoutSecs)) { // Stop if there is nothing to save. LOG_INF("Autosaving idle DocumentBroker for docKey [" << getDocKey() << "] to kill."); @@ -354,13 +352,13 @@ void DocumentBroker::pollThread() stop("idle"); } } -#endif else if (_sessions.empty() && (isLoaded() || _markToDestroy)) { // If all sessions have been removed, no reason to linger. LOG_INF("Terminating dead DocumentBroker for docKey [" << getDocKey() << "]."); stop("dead"); } +#endif } LOG_INF("Finished polling doc [" << _docKey << "]. stop: " << _stop << ", continuePolling: " << diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 14eabf0ac..2c47170c4 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1567,10 +1567,10 @@ void PrisonerPoll::wakeupHook() #endif } } -#endif std::unique_lock docBrokersLock(DocBrokersMutex, std::defer_lock); if (docBrokersLock.try_lock()) cleanupDocBrokers(); +#endif } #if !MOBILEAPP ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/sidebar/SidebarController.hxx |2 + sfx2/source/sidebar/SidebarController.cxx | 41 + 2 files changed, 33 insertions(+), 10 deletions(-) New commits: commit e6e14b2cafd24179f8675350749878da77a31443 Author: Samuel Mehrbrodt AuthorDate: Mon Sep 30 16:02:02 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Tue Oct 1 09:47:34 2019 +0200 tdf#127306 Fix crash when closing LO after deleting a chart This crash was introduced with b58aa94f1f365c746135470bceb97cc182c289bc This patch basically reverts that patch and implements a different fix. Change-Id: I394a2f6490d3ee0769c0f78bb8a3980167719893 Reviewed-on: https://gerrit.libreoffice.org/79865 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index fa051bf549be..596382a36888 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -167,6 +167,8 @@ public: sal_Int32 getMaximumWidth() const { return mnMaximumSidebarWidth; } void setMaximumWidth(sal_Int32 nMaximumWidth) { mnMaximumSidebarWidth = nMaximumWidth; } +void saveDeckState(); + private: SidebarController(SidebarDockingWindow* pParentWindow, const SfxViewFrame* pViewFrame); diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index ffefcf1d5f8a..f04278a25852 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -221,6 +221,9 @@ void SidebarController::registerSidebarForFrame(SidebarController* pController, void SidebarController::unregisterSidebarForFrame(SidebarController* pController, const css::uno::Reference& xController) { +pController->saveDeckState(); +pController->disposeDecks(); + css::uno::Reference xMultiplexer ( css::ui::ContextChangeEventMultiplexer::get( ::comphelper::getProcessComponentContext())); @@ -258,19 +261,25 @@ void SAL_CALL SidebarController::disposing() maFocusManager.Clear(); mpTabBar.disposeAndClear(); -// save decks settings -// Impress shutdown : context (frame) is disposed before sidebar disposing -// calc writer : context (frame) is disposed after sidebar disposing -// so need to test if GetCurrentContext is still valid regarding msApplication +saveDeckState(); -if (GetCurrentContext().msApplication != "none") +// clear decks +ResourceManager::DeckContextDescriptorContainer aDecks; + +mpResourceManager->GetMatchingDecks ( +aDecks, +GetCurrentContext(), +IsDocumentReadOnly(), +mxFrame->getController()); + +for (const auto& rDeck : aDecks) { -mpResourceManager->SaveDecksSettings(GetCurrentContext()); -mpResourceManager->SaveLastActiveDeck(GetCurrentContext(), msCurrentDeckId); -} +std::shared_ptr deckDesc = mpResourceManager->GetDeckDescriptor(rDeck.msId); -// clear decks -disposeDecks(); +VclPtr aDeck = deckDesc->mpDeck; +if (aDeck) +aDeck.disposeAndClear(); +} uno::Reference xController = mxFrame->getController(); if (!xController.is()) @@ -1563,6 +1572,18 @@ void SidebarController::frameAction(const css::frame::FrameActionEvent& rEvent) } } +void SidebarController::saveDeckState() +{ +// Impress shutdown : context (frame) is disposed before sidebar disposing +// calc writer : context (frame) is disposed after sidebar disposing +// so need to test if GetCurrentContext is still valid regarding msApplication +if (GetCurrentContext().msApplication != "none") +{ +mpResourceManager->SaveDecksSettings(GetCurrentContext()); +mpResourceManager->SaveLastActiveDeck(GetCurrentContext(), msCurrentDeckId); +} +} + } } // end of namespace sfx2::sidebar /* 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-bugs] [Bug 127823] Start with Template Selection off by default
https://bugs.documentfoundation.org/show_bug.cgi?id=127823 --- Comment #2 from andreas_k --- second option (which I prefer) is to better integrate the templates into the Start Center. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 127823] Start with Template Selection off by default
https://bugs.documentfoundation.org/show_bug.cgi?id=127823 --- Comment #2 from andreas_k --- second option (which I prefer) is to better integrate the templates into the Start Center. -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 112701] [META] DOC (binary) image-related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=112701 Bug 112701 depends on bug 127446, which changed state. Bug 127446 Summary: FILEOPEN DOC: Image ratio changes https://bugs.documentfoundation.org/show_bug.cgi?id=127446 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 127823] Start with Template Selection off by default
https://bugs.documentfoundation.org/show_bug.cgi?id=127823 Heiko Tietze changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEW --- Comment #1 from Heiko Tietze --- Sounds like a personal preference. Not that I do not share it but the majority may like this dialog. So better we provide better templates, or trust users to have own. Other opinions? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 127823] Start with Template Selection off by default
https://bugs.documentfoundation.org/show_bug.cgi?id=127823 Heiko Tietze changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEW --- Comment #1 from Heiko Tietze --- Sounds like a personal preference. Not that I do not share it but the majority may like this dialog. So better we provide better templates, or trust users to have own. Other opinions? -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 127862] FILESAVE: DOC: Background colour lost on save in a writer file
https://bugs.documentfoundation.org/show_bug.cgi?id=127862 Justin L changed: What|Removed |Added Keywords||bisected Assignee|libreoffice-b...@lists.free |jl...@mail.com |desktop.org | Status|NEW |ASSIGNED --- Comment #4 from Justin L --- (In reply to Michael Stahl (CIB) from comment #3) > most likely commit cc899c6967238877f0094bcf00627145e484ffec Confirmed. Proposed fix at https://gerrit.libreoffice.org/79912 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: basctl/source basic/source codemaker/source comphelper/source connectivity/source cppu/source cui/source
basctl/source/basicide/baside3.cxx |3 basic/source/runtime/methods.cxx|3 codemaker/source/cppumaker/cppuoptions.cxx | 38 +- codemaker/source/javamaker/javaoptions.cxx | 28 +++ comphelper/source/misc/backupfilehelper.cxx | 21 + connectivity/source/drivers/mysql_jdbc/YDriver.cxx |4 - connectivity/source/drivers/mysql_jdbc/YTable.cxx |3 connectivity/source/drivers/mysql_jdbc/YUsers.cxx |4 - connectivity/source/drivers/odbc/OConnection.cxx|3 connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx |3 connectivity/source/parse/sqlnode.cxx |3 cppu/source/uno/EnvStack.cxx|7 - cppu/source/uno/cascade_mapping.cxx | 14 +-- cppu/source/uno/lbenv.cxx |6 - cui/source/customize/SvxConfigPageHelper.cxx|3 cui/source/dialogs/hldoctp.cxx |3 cui/source/tabpages/grfpage.cxx |3 cui/source/tabpages/tpgradnt.cxx|3 cui/source/tabpages/tphatch.cxx |3 cui/source/tabpages/tppattern.cxx |3 20 files changed, 61 insertions(+), 97 deletions(-) New commits: commit 727200b81da0de810dfe623bf52575540f40adbe Author: Noel Grandin AuthorDate: Mon Sep 30 15:09:07 2019 +0200 Commit: Noel Grandin CommitDate: Tue Oct 1 09:22:23 2019 +0200 loplugin:stringadd in basctl..cui Change-Id: I2fdeb7eb3ead3512ad6d3fe793305038ab3aa7ae Reviewed-on: https://gerrit.libreoffice.org/79886 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 00b0d0db0056..f495e362a371 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -694,8 +694,7 @@ void DialogWindow::SaveDialog() { Sequence< OUString > aContentSeq = xSFI->getFolderContents( aURL, false ); -OUString aDialogName_( aDialogName ); -aDialogName_ += "_" ; +OUString aDialogName_ = aDialogName + "_" ; sal_Int32 nCount = aContentSeq.getLength(); const OUString* pFiles = aContentSeq.getConstArray(); for( int i = 0 ; i < nCount ; i++ ) diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index f7d3f25f7185..8cb2b33436d1 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3518,8 +3518,7 @@ void SbRtl_Shell(StarBASIC *, SbxArray & rPar, bool) OUString tmp = rPar.Get(3)->GetOUString().trim(); if (!tmp.isEmpty()) { -aCmdLine += " "; -aCmdLine += tmp; +aCmdLine += " " + tmp; } } else if( aCmdLine.isEmpty() ) diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index 054e810ca084..0e25ae2f5da7 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -293,25 +293,25 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile) OString CppuOptions::prepareHelp() { -OString help("\nusing: "); -help += m_program + " [-options] file_1 ... file_n\nOptions:\n" -"-O = path describes the root directory for the generated output.\n" -" The output directory tree is generated under this directory.\n" -"-T = name specifies a type or a list of types. The output for this\n" -" [t1;...] type is generated. If no '-T' option is specified,\n" -" then output for all types is generated.\n" -" Example: 'com.sun.star.uno.XInterface' is a valid type.\n" -"-L = UNO type functions are generated lightweight, that means only\n" -" the name and typeclass are given and everything else is retrieved\n" -" from the type library dynamically. The default is that UNO type\n" -" functions provides enough type information for bootstrapping C++.\n" -" '-L' should be the default for external components.\n" -"-C = UNO type functions are generated comprehensive that means all\n" -" necessary information is available for bridging the type in UNO.\n" -"-nD= no dependent types are generated.\n"